diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 048218a6d49b..1d3d51cda713 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -79,11 +79,11 @@
/pkgs/development/tools/poetry2nix @adisbladis
# Haskell
-/pkgs/development/compilers/ghc @cdepillabout
-/pkgs/development/haskell-modules @cdepillabout
-/pkgs/development/haskell-modules/default.nix @cdepillabout
-/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout
-/pkgs/development/haskell-modules/hoogle.nix @cdepillabout
+/pkgs/development/compilers/ghc @cdepillabout @sternenseemann
+/pkgs/development/haskell-modules @cdepillabout @sternenseemann
+/pkgs/development/haskell-modules/default.nix @cdepillabout @sternenseemann
+/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout @sternenseemann
+/pkgs/development/haskell-modules/hoogle.nix @cdepillabout @sternenseemann
# Perl
/pkgs/development/interpreters/perl @volth @stigtsp
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000000..0db6fd7832bc
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,146 @@
+"6.topic: agda":
+ - doc/languages-frameworks/agda.section.md
+ - nixos/tests/agda.nix
+ - pkgs/build-support/agda/**/*
+ - pkgs/development/libraries/agda/**/*
+ - pkgs/top-level/agda-packages.nix
+
+"6.topic: cinnamon":
+ - pkgs/desktops/cinnamon/**/*
+
+"6.topic: emacs":
+ - nixos/modules/services/editors/emacs.nix
+ - nixos/modules/services/editors/emacs.xml
+ - nixos/tests/emacs-daemon.nix
+ - pkgs/applications/editors/emacs-modes/**/*
+ - pkgs/applications/editors/emacs/**/*
+ - pkgs/build-support/emacs/**/*
+ - pkgs/top-level/emacs-packages.nix
+
+"6.topic: erlang":
+ - doc/languages-frameworks/beam.section.md
+ - pkgs/development/beam-modules/**/*
+ - pkgs/development/interpreters/elixir/**/*
+ - pkgs/development/interpreters/erlang/**/*
+ - pkgs/development/tools/build-managers/rebar/**/*
+ - pkgs/development/tools/build-managers/rebar3/**/*
+ - pkgs/development/tools/erlang/**/*
+ - pkgs/top-level/beam-packages.nix
+
+"6.topic: fetch":
+ - pkgs/build-support/fetch*/**/*
+
+"6.topic: GNOME":
+ - doc/languages-frameworks/gnome.section.md
+ - nixos/modules/services/desktops/gnome3/**/*
+ - nixos/modules/services/x11/desktop-managers/gnome3.nix
+ - nixos/tests/gnome3-xorg.nix
+ - nixos/tests/gnome3.nix
+ - pkgs/desktops/gnome-3/**/*
+
+"6.topic: golang":
+ - doc/languages-frameworks/go.section.md
+ - pkgs/development/compilers/go/**/*
+ - pkgs/development/go-modules/**/*
+ - pkgs/development/go-packages/**/*
+
+"6.topic: haskell":
+ - doc/languages-frameworks/haskell.section.md
+ - pkgs/development/compilers/ghc/**/*
+ - pkgs/development/haskell-modules/**/*
+ - pkgs/development/tools/haskell/**/*
+ - pkgs/top-level/haskell-packages.nix
+
+"6.topic: kernel":
+ - pkgs/build-support/kernel/**/*
+
+"6.topic: lua":
+ - pkgs/development/interpreters/lua-5/**/*
+ - pkgs/development/interpreters/luajit/**/*
+ - pkgs/development/lua-modules/**/*
+ - pkgs/top-level/lua-packages.nix
+
+"6.topic: nixos":
+ - nixos/**/*
+
+"6.topic: ocaml":
+ - doc/languages-frameworks/ocaml.section.md
+ - pkgs/development/compilers/ocaml/**/*
+ - pkgs/development/compilers/reason/**/*
+ - pkgs/development/ocaml-modules/**/*
+ - pkgs/development/tools/ocaml/**/*
+ - pkgs/top-level/ocaml-packages.nix
+
+"6.topic: pantheon":
+ - nixos/modules/services/desktops/pantheon/**/*
+ - nixos/modules/services/x11/desktop-managers/pantheon.nix
+ - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+ - nixos/tests/pantheon.nix
+ - pkgs/desktops/pantheon/**/*
+
+"6.topic: policy discussion":
+ - .github/**/*
+
+"6.topic: printing":
+ - nixos/modules/services/printing/cupsd.nix
+ - pkgs/misc/cups/**/*
+
+"6.topic: python":
+ - doc/languages-frameworks/python.section.md
+ - pkgs/development/interpreters/python/**/*
+ - pkgs/development/python-modules/**/*
+ - pkgs/top-level/python-packages.nix
+
+"6.topic: qt/kde":
+ - doc/languages-frameworks/qt.section.md
+ - nixos/modules/services/x11/desktop-managers/plasma5.nix
+ - nixos/tests/plasma5.nix
+ - pkgs/applications/kde/**/*
+ - pkgs/desktops/plasma-5/**/*
+ - pkgs/development/libraries/kde-frameworks/**/*
+ - pkgs/development/libraries/qt-5/**/*
+
+"6.topic: ruby":
+ - doc/languages-frameworks/ruby.section.md
+ - pkgs/development/interpreters/ruby/**/*
+ - pkgs/development/ruby-modules/**/*
+
+"6.topic: rust":
+ - doc/languages-frameworks/rust.section.md
+ - pkgs/build-support/rust/**/*
+ - pkgs/development/compilers/rust/**/*
+
+"6.topic: stdenv":
+ - pkgs/stdenv/**/*
+
+"6.topic: steam":
+ - pkgs/games/steam/**/*
+
+"6.topic: systemd":
+ - pkgs/os-specific/linux/systemd/**/*
+ - nixos/modules/system/boot/systemd*/**/*
+
+"6.topic: TeX":
+ - doc/languages-frameworks/texlive.section.md
+ - pkgs/tools/typesetting/tex/**/*
+
+"6.topic: vim":
+ - doc/languages-frameworks/vim.section.md
+ - pkgs/applications/editors/vim/**/*
+ - pkgs/misc/vim-plugins/**/*
+
+"6.topic: xfce":
+ - nixos/doc/manual/configuration/xfce.xml
+ - nixos/modules/services/x11/desktop-managers/xfce.nix
+ - nixos/tests/xfce.nix
+ - pkgs/desktops/xfce/**/*
+
+"8.has: changelog":
+ - nixos/doc/manual/release-notes/**/*
+
+"8.has: documentation":
+ - doc/**/*
+ - nixos/doc/**/*
+
+"8.has: module (update)":
+ - nixos/modules/**/*
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
new file mode 100644
index 000000000000..1139807753db
--- /dev/null
+++ b/.github/workflows/labels.yml
@@ -0,0 +1,14 @@
+name: "Label PR"
+
+on:
+ pull_request_target:
+
+jobs:
+ labels:
+ runs-on: ubuntu-latest
+ if: github.repository_owner == 'NixOS'
+ steps:
+ - uses: actions/labeler@v3
+ with:
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+ sync-labels: true
diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md
index 317c9430cd00..c70e3020bbfa 100644
--- a/doc/builders/fetchers.chapter.md
+++ b/doc/builders/fetchers.chapter.md
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.
-`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
+`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`.
diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md
index 40d4dba1b85e..23662f9bbfe4 100644
--- a/doc/builders/images/dockertools.section.md
+++ b/doc/builders/images/dockertools.section.md
@@ -111,6 +111,12 @@ Create a Docker image with many of the store paths being on their own layer to i
*Default:* the output path's hash
+`fromImage` _optional_
+
+: The repository tarball containing the base image. It must be a valid Docker image, such as one exported by `docker save`.
+
+ *Default:* `null`, which can be seen as equivalent to `FROM scratch` of a `Dockerfile`.
+
`contents` _optional_
: Top level paths in the container. Either a single derivation, or a list of derivations.
diff --git a/doc/builders/images/snaptools.xml b/doc/builders/images/snaptools.xml
index 422fcfa37d88..bbe2e3f5e14c 100644
--- a/doc/builders/images/snaptools.xml
+++ b/doc/builders/images/snaptools.xml
@@ -16,7 +16,7 @@
- The base should not be be specified, as makeSnap will force set it.
+ The base should not be specified, as makeSnap will force set it.
diff --git a/doc/builders/packages/fuse.section.md b/doc/builders/packages/fuse.section.md
new file mode 100644
index 000000000000..5603481115e7
--- /dev/null
+++ b/doc/builders/packages/fuse.section.md
@@ -0,0 +1,19 @@
+# FUSE {#sec-fuse}
+
+Some packages rely on
+[FUSE](https://www.kernel.org/doc/html/latest/filesystems/fuse.html) to provide
+support for additional filesystems not supported by the kernel.
+
+In general, FUSE software are primarily developed for Linux but many of them can
+also run on macOS. Nixpkgs supports FUSE packages on macOS, but it requires
+[macFUSE](https://osxfuse.github.io) to be installed outside of Nix. macFUSE
+currently isn't packaged in Nixpkgs mainly because it includes a kernel
+extension, which isn't supported by Nix outside of NixOS.
+
+If a package fails to run on macOS with an error message similar to the
+following, it's a likely sign that you need to have macFUSE installed.
+
+ dyld: Library not loaded: /usr/local/lib/libfuse.2.dylib
+ Referenced from: /nix/store/w8bi72bssv0bnxhwfw3xr1mvn7myf37x-sshfs-fuse-2.10/bin/sshfs
+ Reason: image not found
+ [1] 92299 abort /nix/store/w8bi72bssv0bnxhwfw3xr1mvn7myf37x-sshfs-fuse-2.10/bin/sshfs
diff --git a/doc/builders/packages/ibus.section.md b/doc/builders/packages/ibus.section.md
new file mode 100644
index 000000000000..2ce85467bb86
--- /dev/null
+++ b/doc/builders/packages/ibus.section.md
@@ -0,0 +1,38 @@
+# ibus-engines.typing-booster {#sec-ibus-typing-booster}
+
+This package is an ibus-based completion method to speed up typing.
+
+## Activating the engine {#sec-ibus-typing-booster-activate}
+
+IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html).
+
+On NixOS you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:
+
+```nix
+{ pkgs, ... }: {
+ i18n.inputMethod = {
+ enabled = "ibus";
+ ibus.engines = with pkgs.ibus-engines; [ typing-booster ];
+ };
+}
+```
+
+## Using custom hunspell dictionaries {#sec-ibus-typing-booster-customize-hunspell}
+
+The IBus engine is based on `hunspell` to support completion in many languages. By default the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:
+
+```nix
+ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; }
+```
+
+_Note: each language passed to `langs` must be an attribute name in `pkgs.hunspellDicts`._
+
+## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker}
+
+The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:
+
+On NixOS it can be installed using the following expression:
+
+```nix
+{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; }
+```
diff --git a/doc/builders/packages/ibus.xml b/doc/builders/packages/ibus.xml
deleted file mode 100644
index 2ed37903a273..000000000000
--- a/doc/builders/packages/ibus.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
- ibus-engines.typing-booster
-
-
- This package is an ibus-based completion method to speed up typing.
-
-
-
- Activating the engine
-
-
- IBus needs to be configured accordingly to activate typing-booster. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the upstream docs.
-
-
-
- On NixOS you need to explicitly enable ibus with given engines before customizing your desktop to use typing-booster. This can be achieved using the ibus module:
-{ pkgs, ... }: {
- i18n.inputMethod = {
- enabled = "ibus";
- ibus.engines = with pkgs.ibus-engines; [ typing-booster ];
- };
-}
-
-
-
-
- Using custom hunspell dictionaries
-
-
- The IBus engine is based on hunspell to support completion in many languages. By default the dictionaries de-de, en-us, fr-moderne es-es, it-it, sv-se and sv-fi are in use. To add another dictionary, the package can be overridden like this:
-ibus-engines.typing-booster.override {
- langs = [ "de-at" "en-gb" ];
-}
-
-
-
- Note: each language passed to langs must be an attribute name in pkgs.hunspellDicts.
-
-
-
-
- Built-in emoji picker
-
-
- The ibus-engines.typing-booster package contains a program named emoji-picker. To display all emojis correctly, a special font such as noto-fonts-emoji is needed:
-
-
-
- On NixOS it can be installed using the following expression:
-{ pkgs, ... }: {
- fonts.fonts = with pkgs; [ noto-fonts-emoji ];
-}
-
-
-
diff --git a/doc/builders/packages/index.xml b/doc/builders/packages/index.xml
index fac82180b260..9653bae472d4 100644
--- a/doc/builders/packages/index.xml
+++ b/doc/builders/packages/index.xml
@@ -12,7 +12,8 @@
-
+
+
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md
index 44e981f12a53..13f15b929cfc 100644
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@@ -68,15 +68,16 @@
Security fixes are submitted in the same way as other changes and thus the same guidelines apply.
-If the security fix comes in the form of a patch and a CVE is available, then the name of the patch should be the CVE identifier, so e.g. `CVE-2019-13636.patch` in the case of a patch that is included in the Nixpkgs tree. If a patch is fetched the name needs to be set as well, e.g.:
-
-```nix
-(fetchpatch {
- name = "CVE-2019-11068.patch";
- url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";
- sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";
-})
-```
+- If a new version fixing the vulnerability has been released, update the package;
+- If the security fix comes in the form of a patch and a CVE is available, then add the patch to the Nixpkgs tree, and apply it to the package.
+ The name of the patch should be the CVE identifier, so e.g. `CVE-2019-13636.patch`; If a patch is fetched the name needs to be set as well, e.g.:
+ ```nix
+ (fetchpatch {
+ name = "CVE-2019-11068.patch";
+ url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";
+ sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";
+ })
+ ```
If a security fix applies to both master and a stable release then, similar to regular changes, they are preferably delivered via master first and cherry-picked to the release branch.
diff --git a/doc/contributing/vulnerability-roundup.chapter.md b/doc/contributing/vulnerability-roundup.chapter.md
new file mode 100644
index 000000000000..d451420f9815
--- /dev/null
+++ b/doc/contributing/vulnerability-roundup.chapter.md
@@ -0,0 +1,45 @@
+# Vulnerability Roundup {#chap-vulnerability-roundup}
+
+## Issues {#vulnerability-roundup-issues}
+
+Vulnerable packages in Nixpkgs are managed using issues.
+Currently opened ones can be found using the following:
+
+[github.com/NixOS/nixpkgs/issues?q=is:issue+is:open+"Vulnerability+roundup"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+%22Vulnerability+roundup%22)
+
+Each issue correspond to a vulnerable version of a package; As a consequence:
+
+- One issue can contain several CVEs;
+- One CVE can be shared across several issues;
+- A single package can be concerned by several issues.
+
+
+A "Vulnerability roundup" issue usually respects the following format:
+
+```txt
+,
+
+
+
+
+
+
+```
+
+Note that there can be an extra comment containing links to previously reported (and still open) issues for the same package.
+
+
+## Triaging and Fixing {#vulnerability-roundup-triaging-and-fixing}
+
+**Note**: An issue can be a "false positive" (i.e. automatically opened, but without the package it refers to being actually vulnerable).
+If you find such a "false positive", comment on the issue an explanation of why it falls into this category, linking as much information as the necessary to help maintainers double check.
+
+If you are investigating a "true positive":
+
+- Find the earliest patched version or a code patch in the CVE details;
+- Is the issue already patched (version up-to-date or patch applied manually) in Nixpkgs's `master` branch?
+ - **No**:
+ - [Submit a security fix](#submitting-changes-submitting-security-fixes);
+ - Once the fix is merged into `master`, [submit the change to the vulnerable release branch(es)](https://nixos.org/manual/nixpkgs/stable/#submitting-changes-stable-release-branches);
+ - **Yes**: [Backport the change to the vulnerable release branch(es)](https://nixos.org/manual/nixpkgs/stable/#submitting-changes-stable-release-branches).
+- When the patch has made it into all the relevant branches (`master`, and the vulnerable releases), close the relevant issue(s).
diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 9a4e640935fe..de8414249abf 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -7,7 +7,7 @@
<function>lib.attrset.attrByPath</function>
- attrByPath :: [String] -> Any -> AttrSet
+ attrByPath :: [String] -> Any -> AttrSet -> Any
diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md
index 62e544cd48b6..416073df078e 100644
--- a/doc/languages-frameworks/android.section.md
+++ b/doc/languages-frameworks/android.section.md
@@ -80,7 +80,7 @@ Most of the function arguments have reasonable default settings.
You can specify license names:
-* `extraLicenses` is a list of of license names.
+* `extraLicenses` is a list of license names.
You can get these names from repo.json or `querypackages.sh licenses`. The SDK
license (`android-sdk-license`) is accepted for you if you set accept_license
to true. If you are doing something like working with preview SDKs, you will
diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md
index 88fd74db8256..c3947042494d 100644
--- a/doc/languages-frameworks/dotnet.section.md
+++ b/doc/languages-frameworks/dotnet.section.md
@@ -64,7 +64,7 @@ $ dotnet --info
The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project.
-## dotnetCorePackages.sdk vs vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore
+## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore
The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version.
diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md
index d81949c75f69..5935cbd7bd52 100644
--- a/doc/languages-frameworks/lua.section.md
+++ b/doc/languages-frameworks/lua.section.md
@@ -50,7 +50,7 @@ and install it in your profile with
```shell
nix-env -iA nixpkgs.myLuaEnv
```
-The environment is is installed by referring to the attribute, and considering
+The environment is installed by referring to the attribute, and considering
the `nixpkgs` channel was used.
#### Lua environment defined in `/etc/nixos/configuration.nix`
@@ -129,7 +129,7 @@ the whitelist maintainers/scripts/luarocks-packages.csv and updated by running m
[luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).
The automation only goes so far though and some packages need to be customized.
These customizations go in `pkgs/development/lua-modules/overrides.nix`.
-For instance if the rockspec defines `external_dependencies`, these need to be manually added in in its rockspec file then it won't work.
+For instance if the rockspec defines `external_dependencies`, these need to be manually added in its rockspec file then it won't work.
You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`.
Nix rely on luarocks to install lua packages, basically it runs:
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index e569cdaa9357..821d7aa886d7 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -334,7 +334,7 @@ Above, we were mostly just focused on use cases and what to do to get started
creating working Python environments in nix.
Now that you know the basics to be up and running, it is time to take a step
-back and take a deeper look at at how Python packages are packaged on Nix. Then,
+back and take a deeper look at how Python packages are packaged on Nix. Then,
we will look at how you can use development mode with your code.
#### Python library packages in Nixpkgs
@@ -638,7 +638,7 @@ are disabled.
#### Using pythonImportsCheck
-Although unit tests are highly prefered to valid correctness of a package. Not
+Although unit tests are highly prefered to validate correctness of a package, not
all packages have test suites that can be ran easily, and some have none at all.
To help ensure the package still works, `pythonImportsCheck` can attempt to import
the listed modules.
@@ -918,7 +918,7 @@ because their behaviour is different:
* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables
as well as the items listed in `setup_requires`.
-* `buildInputs ? []`: Build and/or run-time dependencies that need to be be
+* `buildInputs ? []`: Build and/or run-time dependencies that need to be
compiled for the host machine. Typically non-Python libraries which are being
linked.
* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These
@@ -1551,13 +1551,11 @@ In a `setup.py` or `setup.cfg` it is common to declare dependencies:
### Contributing guidelines
-Following rules are desired to be respected:
+The following rules are desired to be respected:
* Python libraries are called from `python-packages.nix` and packaged with
`buildPythonPackage`. The expression of a library should be in
`pkgs/development/python-modules//default.nix`.
-* Libraries in `pkgs/top-level/python-packages.nix` are sorted
- alphanumerically to avoid merge conflicts and ease locating attributes.
* Python applications live outside of `python-packages.nix` and are packaged
with `buildPythonApplication`.
* Make sure libraries build for all Python interpreters.
@@ -1567,8 +1565,11 @@ Following rules are desired to be respected:
case, when you disable tests, leave a comment explaining why.
* Commit names of Python libraries should reflect that they are Python
libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`.
-* Attribute names in `python-packages.nix` should be normalized according to
- [PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This
- means that characters should be converted to lowercase and `.` and `_` should
- be replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz )
-* Attribute names in `python-packages.nix` should be sorted alphanumerically.
+* Attribute names in `python-packages.nix` as well as `pname`s should match the
+ library's name on PyPI, but be normalized according to [PEP
+ 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This means
+ that characters should be converted to lowercase and `.` and `_` should be
+ replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz).
+ If necessary, `pname` has to be given a different value within `fetchPypi`.
+* Attribute names in `python-packages.nix` should be sorted alphanumerically to
+ avoid merge conflicts and ease locating attributes.
diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
index aeec154586c7..c519d79d3daf 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/doc/languages-frameworks/ruby.section.md
@@ -229,7 +229,7 @@ end
If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again.
-Now you can also also make a `default.nix` that looks like this:
+Now you can also make a `default.nix` that looks like this:
```nix
{ bundlerApp }:
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 94f94aaffe32..8121d03e046b 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -72,8 +72,8 @@ For `cargoHash` you can use:
Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
best practices guide, Rust applications should always commit the `Cargo.lock`
file in git to ensure a reproducible build. However, a few packages do not, and
-Nix depends on this file, so if it missing you can use `cargoPatches` to apply
-it in the `patchPhase`. Consider sending a PR upstream with a note to the
+Nix depends on this file, so if it is missing you can use `cargoPatches` to
+apply it in the `patchPhase`. Consider sending a PR upstream with a note to the
maintainer describing why it's important to include in the application.
The fetcher will verify that the `Cargo.lock` file is in sync with the `src`
@@ -146,6 +146,7 @@ where they are known to differ. But there are ways to customize the argument:
rustc.platform = { foo = ""; bar = ""; };
};
}
+ ```
will result in:
```shell
--target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""}
@@ -156,7 +157,7 @@ path) can be passed directly to `buildRustPackage`:
```nix
pkgs.rustPlatform.buildRustPackage {
- (...)
+ /* ... */
target = "x86_64-fortanix-unknown-sgx";
}
```
@@ -191,6 +192,13 @@ rustPlatform.buildRustPackage {
Please note that the code will be compiled twice here: once in `release` mode
for the `buildPhase`, and again in `debug` mode for the `checkPhase`.
+Test flags, e.g., `--features xxx/yyy`, can be passed to `cargo test` via the
+`cargoTestFlags` attribute.
+
+Another attribute, called `checkFlags`, is used to pass arguments to the test
+binary itself, as stated
+(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html].
+
#### Tests relying on the structure of the `target/` directory
Some tests may rely on the structure of the `target/` directory. Those tests
@@ -320,9 +328,10 @@ attributes can also be used:
variable `buildAndTestSubdir` can be used to build a crate in a
Cargo workspace. Additional maturin flags can be passed through
`maturinBuildFlags`.
-* `cargoCheckHook`: run tests using Cargo. Additional flags can be
- passed to Cargo using `checkFlags` and `checkFlagsArray`. By
- default, tests are run in parallel. This can be disabled by setting
+* `cargoCheckHook`: run tests using Cargo. The build type for checks
+ can be set using `cargoCheckType`. Additional flags can be passed to
+ the tests using `checkFlags` and `checkFlagsArray`. By default,
+ tests are run in parallel. This can be disabled by setting
`dontUseCargoParallelTests`.
* `cargoInstallHook`: install binaries and static/shared libraries
that were built using `cargoBuildHook`.
@@ -737,7 +746,7 @@ with import "${src.out}/rust-overlay.nix" pkgs pkgs;
stdenv.mkDerivation {
name = "rust-env";
buildInputs = [
- # Note: to use use stable, just replace `nightly` with `stable`
+ # Note: to use stable, just replace `nightly` with `stable`
latest.rustChannels.nightly.rust
# Add some extra dependencies from `pkgs`
diff --git a/doc/manual.xml b/doc/manual.xml
index b0490ec74aee..1c5a7bbcaa9e 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -15,9 +15,9 @@
Standard environment
-
-
-
+
+
+
@@ -35,6 +35,7 @@
+
diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md
new file mode 100644
index 000000000000..dd9f53258555
--- /dev/null
+++ b/doc/stdenv/meta.chapter.md
@@ -0,0 +1,194 @@
+# Meta-attributes {#chap-meta}
+
+Nix packages can declare *meta-attributes* that contain information about a package such as a description, its homepage, its license, and so on. For instance, the GNU Hello package has a `meta` declaration like this:
+
+```nix
+meta = with lib; {
+ description = "A program that produces a familiar, friendly greeting";
+ longDescription = ''
+ GNU Hello is a program that prints "Hello, world!" when you run it.
+ It is fully customizable.
+ '';
+ homepage = "https://www.gnu.org/software/hello/manual/";
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.eelco ];
+ platforms = platforms.all;
+};
+```
+
+Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string.
+
+The meta-attributes of a package can be queried from the command-line using `nix-env`:
+
+```ShellSession
+$ nix-env -qa hello --json
+{
+ "hello": {
+ "meta": {
+ "description": "A program that produces a familiar, friendly greeting",
+ "homepage": "https://www.gnu.org/software/hello/manual/",
+ "license": {
+ "fullName": "GNU General Public License version 3 or later",
+ "shortName": "GPLv3+",
+ "url": "http://www.fsf.org/licensing/licenses/gpl.html"
+ },
+ "longDescription": "GNU Hello is a program that prints \"Hello, world!\" when you run it.\nIt is fully customizable.\n",
+ "maintainers": [
+ "Ludovic Court\u00e8s "
+ ],
+ "platforms": [
+ "i686-linux",
+ "x86_64-linux",
+ "armv5tel-linux",
+ "armv7l-linux",
+ "mips32-linux",
+ "x86_64-darwin",
+ "i686-cygwin",
+ "i686-freebsd",
+ "x86_64-freebsd",
+ "i686-openbsd",
+ "x86_64-openbsd"
+ ],
+ "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14"
+ },
+ "name": "hello-2.9",
+ "system": "x86_64-linux"
+ }
+}
+```
+
+`nix-env` knows about the `description` field specifically:
+
+```ShellSession
+$ nix-env -qa hello --description
+hello-2.3 A program that produces a familiar, friendly greeting
+```
+
+## Standard meta-attributes {#sec-standard-meta-attributes}
+
+It is expected that each meta-attribute is one of the following:
+
+### `description` {#var-meta-description}
+
+A short (one-line) description of the package. This is shown by `nix-env -q --description` and also on the Nixpkgs release pages.
+
+Don’t include a period at the end. Don’t include newline characters. Capitalise the first character. For brevity, don’t repeat the name of package --- just describe what it does.
+
+Wrong: `"libpng is a library that allows you to decode PNG images."`
+
+Right: `"A library for decoding PNG images"`
+
+### `longDescription` {#var-meta-longDescription}
+
+An arbitrarily long description of the package.
+
+### `branch` {#var-meta-branch}
+
+Release branch. Used to specify that a package is not going to receive updates that are not in this branch; for example, Linux kernel 3.0 is supposed to be updated to 3.0.X, not 3.1.
+
+### `homepage` {#var-meta-homepage}
+
+The package’s homepage. Example: `https://www.gnu.org/software/hello/manual/`
+
+### `downloadPage` {#var-meta-downloadPage}
+
+The page where a link to the current version can be found. Example: `https://ftp.gnu.org/gnu/hello/`
+
+### `changelog` {#var-meta-changelog}
+
+A link or a list of links to the location of Changelog for a package. A link may use expansion to refer to the correct changelog version. Example: `"https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"`
+
+### `license` {#var-meta-license}
+
+The license, or licenses, for the package. One from the attribute set defined in [`nixpkgs/lib/licenses.nix`](https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix). At this moment using both a list of licenses and a single license is valid. If the license field is in the form of a list representation, then it means that parts of the package are licensed differently. Each license should preferably be referenced by their attribute. The non-list attribute value can also be a space delimited string representation of the contained attribute `shortNames` or `spdxIds`. The following are all valid examples:
+
+- Single license referenced by attribute (preferred) `lib.licenses.gpl3Only`.
+- Single license referenced by its attribute shortName (frowned upon) `"gpl3Only"`.
+- Single license referenced by its attribute spdxId (frowned upon) `"GPL-3.0-only"`.
+- Multiple licenses referenced by attribute (preferred) `with lib.licenses; [ asl20 free ofl ]`.
+- Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon) `"asl20 free ofl"`.
+
+For details, see [Licenses](#sec-meta-license).
+
+### `maintainers` {#var-meta-maintainers}
+
+A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice”, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`.
+
+### `priority` {#var-meta-priority}
+
+The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the Nix manual page for `nix-env` for details. Example: `"10"` (a low-priority package).
+
+### `platforms` {#var-meta-platforms}
+
+The list of Nix platform types on which the package is supported. Hydra builds packages according to the platform specified. If no platform is specified, the package does not have prebuilt binaries. An example is:
+
+```nix
+meta.platforms = lib.platforms.linux;
+```
+
+Attribute Set `lib.platforms` defines [various common lists](https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix) of platforms types.
+
+### `tests` {#var-meta-tests}
+
+::: warning
+This attribute is special in that it is not actually under the `meta` attribute set but rather under the `passthru` attribute set. This is due to how `meta` attributes work, and the fact that they are supposed to contain only metadata, not derivations.
+:::
+
+An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A derivation that is a test needs to have `meta.timeout` defined.
+
+The NixOS tests are available as `nixosTests` in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to:
+
+```nix
+{ /* ... */, nixosTests }:
+{
+ # ...
+ passthru.tests = {
+ basic-functionality-and-dovecot-integration = nixosTests.opensmtpd;
+ };
+}
+```
+
+### `timeout` {#var-meta-timeout}
+
+A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in `nixpkgs`.
+
+### `hydraPlatforms` {#var-meta-hydraPlatforms}
+
+The list of Nix platform types for which the Hydra instance at `hydra.nixos.org` will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g.
+
+```nix
+meta.platforms = lib.platforms.linux;
+meta.hydraPlatforms = [];
+```
+
+### `broken` {#var-meta-broken}
+
+If set to `true`, the package is marked as "broken", meaning that it won’t show up in `nix-env -qa`, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed.
+
+### `updateWalker` {#var-meta-updateWalker}
+
+If set to `true`, the package is tested to be updated correctly by the `update-walker.sh` script without additional settings. Such packages have `meta.version` set and their homepage (or the page specified by `meta.downloadPage`) contains a direct link to the package tarball.
+
+## Licenses {#sec-meta-license}
+
+The `meta.license` attribute should preferably contain a value from `lib.licenses` defined in [`nixpkgs/lib/licenses.nix`](https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix), or in-place license description of the same format if the license is unlikely to be useful in another expression.
+
+Although it’s typically better to indicate the specific license, a few generic options are available:
+
+### `lib.licenses.free`, `"free"`
+
+Catch-all for free software licenses not listed above.
+
+### `lib.licenses.unfreeRedistributable`, `"unfree-redistributable"`
+
+Unfree package that can be redistributed in binary form. That is, it’s legal to redistribute the *output* of the derivation. This means that the package can be included in the Nixpkgs channel.
+
+Sometimes proprietary software can only be redistributed unmodified. Make sure the builder doesn’t actually modify the original binaries; otherwise we’re breaking the license. For instance, the NVIDIA X11 drivers can be redistributed unmodified, but our builder applies `patchelf` to make them work. Thus, its license is `"unfree"` and it cannot be included in the Nixpkgs channel.
+
+### `lib.licenses.unfree`, `"unfree"`
+
+Unfree package that cannot be redistributed. You can build it yourself, but you cannot redistribute the output of the derivation. Thus it cannot be included in the Nixpkgs channel.
+
+### `lib.licenses.unfreeRedistributableFirmware`, `"unfree-redistributable-firmware"`
+
+This package supplies unfree, redistributable firmware. This is a separate value from `unfree-redistributable` because not everybody cares whether firmware is free.
diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml
deleted file mode 100644
index 91ace0b9cc95..000000000000
--- a/doc/stdenv/meta.xml
+++ /dev/null
@@ -1,349 +0,0 @@
-
- Meta-attributes
-
- Nix packages can declare meta-attributes that contain information about a package such as a description, its homepage, its license, and so on. For instance, the GNU Hello package has a meta declaration like this:
-
-meta = with lib; {
- description = "A program that produces a familiar, friendly greeting";
- longDescription = ''
- GNU Hello is a program that prints "Hello, world!" when you run it.
- It is fully customizable.
- '';
- homepage = "https://www.gnu.org/software/hello/manual/";
- license = licenses.gpl3Plus;
- maintainers = [ maintainers.eelco ];
- platforms = platforms.all;
-};
-
-
-
- Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string.
-
-
- The meta-attributes of a package can be queried from the command-line using nix-env:
-
-$ nix-env -qa hello --json
-{
- "hello": {
- "meta": {
- "description": "A program that produces a familiar, friendly greeting",
- "homepage": "https://www.gnu.org/software/hello/manual/",
- "license": {
- "fullName": "GNU General Public License version 3 or later",
- "shortName": "GPLv3+",
- "url": "http://www.fsf.org/licensing/licenses/gpl.html"
- },
- "longDescription": "GNU Hello is a program that prints \"Hello, world!\" when you run it.\nIt is fully customizable.\n",
- "maintainers": [
- "Ludovic Court\u00e8s <ludo@gnu.org>"
- ],
- "platforms": [
- "i686-linux",
- "x86_64-linux",
- "armv5tel-linux",
- "armv7l-linux",
- "mips32-linux",
- "x86_64-darwin",
- "i686-cygwin",
- "i686-freebsd",
- "x86_64-freebsd",
- "i686-openbsd",
- "x86_64-openbsd"
- ],
- "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14"
- },
- "name": "hello-2.9",
- "system": "x86_64-linux"
- }
-}
-
-
-
- nix-env knows about the description field specifically:
-
-$ nix-env -qa hello --description
-hello-2.3 A program that produces a familiar, friendly greeting
-
-
-
- Standard meta-attributes
-
-
- It is expected that each meta-attribute is one of the following:
-
-
-
-
-
- description
-
-
-
- A short (one-line) description of the package. This is shown by nix-env -q --description and also on the Nixpkgs release pages.
-
-
- Don’t include a period at the end. Don’t include newline characters. Capitalise the first character. For brevity, don’t repeat the name of package — just describe what it does.
-
-
- Wrong: "libpng is a library that allows you to decode PNG images."
-
-
- Right: "A library for decoding PNG images"
-
-
-
-
-
- longDescription
-
-
-
- An arbitrarily long description of the package.
-
-
-
-
-
- branch
-
-
-
- Release branch. Used to specify that a package is not going to receive updates that are not in this branch; for example, Linux kernel 3.0 is supposed to be updated to 3.0.X, not 3.1.
-
-
-
-
-
- homepage
-
-
-
- The package’s homepage. Example: https://www.gnu.org/software/hello/manual/
-
-
-
-
-
- downloadPage
-
-
-
- The page where a link to the current version can be found. Example: https://ftp.gnu.org/gnu/hello/
-
-
-
-
-
- changelog
-
-
-
- A link or a list of links to the location of Changelog for a package. A link may use expansion to refer to the correct changelog version. Example: "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"
-
-
-
-
-
- license
-
-
-
- The license, or licenses, for the package. One from the attribute set defined in nixpkgs/lib/licenses.nix. At this moment using both a list of licenses and a single license is valid. If the license field is in the form of a list representation, then it means that parts of the package are licensed differently. Each license should preferably be referenced by their attribute. The non-list attribute value can also be a space delimited string representation of the contained attribute shortNames or spdxIds. The following are all valid examples:
-
-
-
- Single license referenced by attribute (preferred) lib.licenses.gpl3Only.
-
-
-
-
- Single license referenced by its attribute shortName (frowned upon) "gpl3Only".
-
-
-
-
- Single license referenced by its attribute spdxId (frowned upon) "GPL-3.0-only".
-
-
-
-
- Multiple licenses referenced by attribute (preferred) with lib.licenses; [ asl20 free ofl ].
-
-
-
-
- Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon) "asl20 free ofl".
-
-
-
- For details, see .
-
-
-
-
-
- maintainers
-
-
-
- A list of the maintainers of this Nix expression. Maintainers are defined in nixpkgs/maintainers/maintainer-list.nix. There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled 'maintainers: add alice', and reference maintainers with maintainers = with lib.maintainers; [ alice bob ].
-
-
-
-
-
- priority
-
-
-
- The priority of the package, used by nix-env to resolve file name conflicts between packages. See the Nix manual page for nix-env for details. Example: "10" (a low-priority package).
-
-
-
-
-
- platforms
-
-
-
- The list of Nix platform types on which the package is supported. Hydra builds packages according to the platform specified. If no platform is specified, the package does not have prebuilt binaries. An example is:
-
-meta.platforms = lib.platforms.linux;
-
- Attribute Set lib.platforms defines various common lists of platforms types.
-
-
-
-
-
- tests
-
-
-
-
- This attribute is special in that it is not actually under the meta attribute set but rather under the passthru attribute set. This is due to how meta attributes work, and the fact that they are supposed to contain only metadata, not derivations.
-
-
-
- An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A derivation that is a test needs to have meta.timeout defined.
-
-
- The NixOS tests are available as nixosTests in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to:
-
-{ /* ... */, nixosTests }:
-{
- # ...
- passthru.tests = {
- basic-functionality-and-dovecot-integration = nixosTests.opensmtpd;
- };
-}
-
-
-
-
-
-
- timeout
-
-
-
- A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in nixpkgs.
-
-
-
-
-
- hydraPlatforms
-
-
-
- The list of Nix platform types for which the Hydra instance at hydra.nixos.org will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of meta.platforms. Thus, the only reason to set meta.hydraPlatforms is if you want hydra.nixos.org to build the package on a subset of meta.platforms, or not at all, e.g.
-
-meta.platforms = lib.platforms.linux;
-meta.hydraPlatforms = [];
-
-
-
-
-
-
- broken
-
-
-
- If set to true, the package is marked as “broken”, meaning that it won’t show up in nix-env -qa, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed.
-
-
-
-
-
- updateWalker
-
-
-
- If set to true, the package is tested to be updated correctly by the update-walker.sh script without additional settings. Such packages have meta.version set and their homepage (or the page specified by meta.downloadPage) contains a direct link to the package tarball.
-
-
-
-
-
-
- Licenses
-
-
- The meta.license attribute should preferrably contain a value from lib.licenses defined in nixpkgs/lib/licenses.nix, or in-place license description of the same format if the license is unlikely to be useful in another expression.
-
-
-
- Although it's typically better to indicate the specific license, a few generic options are available:
-
-
-
- lib.licenses.free, "free"
-
-
-
- Catch-all for free software licenses not listed above.
-
-
-
-
-
- lib.licenses.unfreeRedistributable, "unfree-redistributable"
-
-
-
- Unfree package that can be redistributed in binary form. That is, it’s legal to redistribute the output of the derivation. This means that the package can be included in the Nixpkgs channel.
-
-
- Sometimes proprietary software can only be redistributed unmodified. Make sure the builder doesn’t actually modify the original binaries; otherwise we’re breaking the license. For instance, the NVIDIA X11 drivers can be redistributed unmodified, but our builder applies patchelf to make them work. Thus, its license is "unfree" and it cannot be included in the Nixpkgs channel.
-
-
-
-
-
- lib.licenses.unfree, "unfree"
-
-
-
- Unfree package that cannot be redistributed. You can build it yourself, but you cannot redistribute the output of the derivation. Thus it cannot be included in the Nixpkgs channel.
-
-
-
-
-
- lib.licenses.unfreeRedistributableFirmware, "unfree-redistributable-firmware"
-
-
-
- This package supplies unfree, redistributable firmware. This is a separate value from unfree-redistributable because not everybody cares whether firmware is free.
-
-
-
-
-
-
-
diff --git a/doc/stdenv/multiple-output.chapter.md b/doc/stdenv/multiple-output.chapter.md
new file mode 100644
index 000000000000..90bc25bef739
--- /dev/null
+++ b/doc/stdenv/multiple-output.chapter.md
@@ -0,0 +1,128 @@
+# Multiple-output packages {#chap-multiple-output}
+
+## Introduction {#sec-multiple-outputs-introduction}
+
+The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate Nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs.
+
+The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less.
+
+::: note
+The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.
+:::
+
+A number of attributes can be used to work with a derivation with multiple outputs. The attribute `outputs` is a list of strings, which are the names of the outputs. For each of these names, an identically named attribute is created, corresponding to that output. The attribute `meta.outputsToInstall` is used to determine the default set of outputs to install when using the derivation name unqualified.
+
+## Installing a split package {#sec-multiple-outputs-installing}
+
+When installing a package with multiple outputs, the package’s `meta.outputsToInstall` attribute determines which outputs are actually installed. `meta.outputsToInstall` is a list whose [default installs binaries and the associated man pages](https://github.com/NixOS/nixpkgs/blob/f1680774340d5443a1409c3421ced84ac1163ba9/pkgs/stdenv/generic/make-derivation.nix#L310-L320). The following sections describe ways to install different outputs.
+
+### Selecting outputs to install via NixOS {#sec-multiple-outputs-installing-nixos}
+
+NixOS provides two ways to select the outputs to install for packages listed in `environment.systemPackages`:
+
+- The configuration option `environment.extraOutputsToInstall` is appended to each package’s `meta.outputsToInstall` attribute to determine the outputs to install. It can for example be used to install `info` documentation or debug symbols for all packages.
+
+- The outputs can be listed as packages in `environment.systemPackages`. For example, the `"out"` and `"info"` outputs for the `coreutils` package can be installed by including `coreutils` and `coreutils.info` in `environment.systemPackages`.
+
+### Selecting outputs to install via `nix-env` {#sec-multiple-outputs-installing-nix-env}
+
+`nix-env` lacks an easy way to select the outputs to install. When installing a package, `nix-env` always installs the outputs listed in `meta.outputsToInstall`, even when the user explicitly selects an output.
+
+::: warning
+`nix-env` silenty disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example,
+
+```ShellSession
+$ nix-env -iA nixpkgs.coreutils.info
+```
+
+installs the `"out"` output (`coreutils.meta.outputsToInstall` is `[ "out" ]`) instead of the requested `"info"`.
+:::
+
+The only recourse to select an output with `nix-env` is to override the package’s `meta.outputsToInstall`, using the functions described in . For example, the following overlay adds the `"info"` output for the `coreutils` package:
+
+```nix
+self: super:
+{
+ coreutils = super.coreutils.overrideAttrs (oldAttrs: {
+ meta = oldAttrs.meta // { outputsToInstall = oldAttrs.meta.outputsToInstall or [ "out" ] ++ [ "info" ]; };
+ });
+}
+```
+
+## Using a split package {#sec-multiple-outputs-using-split-packages}
+
+In the Nix language the individual outputs can be reached explicitly as attributes, e.g. `coreutils.info`, but the typical case is just using packages as build inputs.
+
+When a multiple-output derivation gets into a build input of another derivation, the `dev` output is added if it exists, otherwise the first output is added. In addition to that, `propagatedBuildOutputs` of that package which by default contain `$outputBin` and `$outputLib` are also added. (See .)
+
+In some cases it may be desirable to combine different outputs under a single store path. A function `symlinkJoin` can be used to do this. (Note that it may negate some closure size benefits of using a multiple-output package.)
+
+## Writing a split derivation {#sec-multiple-outputs-}
+
+Here you find how to write a derivation that produces multiple outputs.
+
+In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in ``; it’s relatively well-readable. The whole machinery is triggered by defining the `outputs` attribute to contain the list of desired output names (strings).
+
+```nix
+outputs = [ "bin" "dev" "out" "doc" ];
+```
+
+Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main `out` output, as it catches any files that didn’t get elsewhere.
+
+::: note
+There is a special handling of the `debug` output, described at .
+:::
+
+### “Binaries first” {#multiple-output-file-binaries-first-convention}
+
+A commonly adopted convention in `nixpkgs` is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the `perl` package contains a `perl` executable it can be referenced as `${pkgs.perl}/bin/perl` within a Nix derivation that needs to execute a Perl script.
+
+The `glibc` package is a deliberate single exception to the “binaries first” convention. The `glibc` has `libs` as its first output allowing the libraries provided by `glibc` to be referenced directly (e.g. `${stdenv.glibc}/lib/ld-linux-x86-64.so.2`). The executables provided by `glibc` can be accessed via its `bin` attribute (e.g. `${stdenv.glibc.bin}/bin/ldd`).
+
+The reason for why `glibc` deviates from the convention is because referencing a library provided by `glibc` is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of `glibc` libraries from Nix packages (please see the documentation on [patchelf](https://github.com/NixOS/patchelf/blob/master/README) for more details).
+
+### File type groups {#multiple-output-file-type-groups}
+
+The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an `outputFoo` variable specifying the output name where they should go. If that variable isn’t defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn’t defined.
+
+#### ` $outputDev`
+
+is for development-only files. These include C(++) headers (`include/`), pkg-config (`lib/pkgconfig/`), cmake (`lib/cmake/`) and aclocal files (`share/aclocal/`). They go to `dev` or `out` by default.
+
+#### ` $outputBin`
+
+is meant for user-facing binaries, typically residing in `bin/`. They go to `bin` or `out` by default.
+
+#### ` $outputLib`
+
+is meant for libraries, typically residing in `lib/` and `libexec/`. They go to `lib` or `out` by default.
+
+#### ` $outputDoc`
+
+is for user documentation, typically residing in `share/doc/`. It goes to `doc` or `out` by default.
+
+#### ` $outputDevdoc`
+
+is for _developer_ documentation. Currently we count gtk-doc and devhelp books, typically residing in `share/gtk-doc/` and `share/devhelp/`, in there. It goes to `devdoc` or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
+
+#### ` $outputMan`
+
+is for man pages (except for section 3), typically residing in `share/man/man[0-9]/`. They go to `man` or `$outputBin` by default.
+
+#### ` $outputDevman`
+
+is for section 3 man pages, typically residing in `share/man/man[0-9]/`. They go to `devman` or `$outputMan` by default.
+
+#### ` $outputInfo`
+
+is for info pages, typically residing in `share/info/`. They go to `info` or `$outputBin` by default.
+
+### Common caveats {#sec-multiple-outputs-caveats}
+
+- Some configure scripts don’t like some of the parameters passed by default by the framework, e.g. `--docdir=/foo/bar`. You can disable this by setting `setOutputFlags = false;`.
+
+- The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.)
+
+- Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into `out`, e.g. locale strings, so there is often no advantage in separating the libraries into `lib`, as keeping them in `out` is easier.
+
+- Some packages have hidden assumptions on install paths, which complicates splitting.
diff --git a/doc/stdenv/multiple-output.xml b/doc/stdenv/multiple-output.xml
deleted file mode 100644
index 5f2d2b8cfb93..000000000000
--- a/doc/stdenv/multiple-output.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-
-
-]>
-
- Multiple-output packages
-
- Introduction
-
-
- The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate Nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs.
-
-
-
- The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less.
-
-
-
-
- The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.
-
-
-
-
- A number of attributes can be used to work with a derivation with multiple outputs. The attribute outputs is a list of strings, which are the names of the outputs. For each of these names, an identically named attribute is created, corresponding to that output. The attribute meta.outputsToInstall is used to determine the default set of outputs to install when using the derivation name unqualified.
-
-
-
- Installing a split package
-
-
- When installing a package with multiple outputs, the package's meta.outputsToInstall attribute determines which outputs are actually installed. meta.outputsToInstall is a list whose default installs binaries and the associated man pages. The following sections describe ways to install different outputs.
-
-
-
- Selecting outputs to install via NixOS
-
-
- NixOS provides two ways to select the outputs to install for packages listed in environment.systemPackages:
-
-
-
-
-
- The configuration option environment.extraOutputsToInstall is appended to each package's meta.outputsToInstall attribute to determine the outputs to install. It can for example be used to install info documentation or debug symbols for all packages.
-
-
-
-
- The outputs can be listed as packages in environment.systemPackages. For example, the "out" and "info" outputs for the coreutils package can be installed by including coreutils and coreutils.info in environment.systemPackages.
-
-
-
-
-
-
- Selecting outputs to install via <command>nix-env</command>
-
-
- nix-env lacks an easy way to select the outputs to install. When installing a package, nix-env always installs the outputs listed in meta.outputsToInstall, even when the user explicitly selects an output.
-
-
-
-
- nix-env silenty disregards the outputs selected by the user, and instead installs the outputs from meta.outputsToInstall. For example,
-
-$ nix-env -iA nixpkgs.coreutils.info
-
- installs the "out" output (coreutils.meta.outputsToInstall is [ "out" ]) instead of the requested "info".
-
-
-
-
- The only recourse to select an output with nix-env is to override the package's meta.outputsToInstall, using the functions described in . For example, the following overlay adds the "info" output for the coreutils package:
-
-
-self: super:
-{
- coreutils = super.coreutils.overrideAttrs (oldAttrs: {
- meta = oldAttrs.meta // { outputsToInstall = oldAttrs.meta.outputsToInstall or [ "out" ] ++ [ "info" ]; };
- });
-}
-
-
-
-
- Using a split package
-
-
- In the Nix language the individual outputs can be reached explicitly as attributes, e.g. coreutils.info, but the typical case is just using packages as build inputs.
-
-
-
- When a multiple-output derivation gets into a build input of another derivation, the dev output is added if it exists, otherwise the first output is added. In addition to that, propagatedBuildOutputs of that package which by default contain $outputBin and $outputLib are also added. (See .)
-
-
-
- In some cases it may be desirable to combine different outputs under a single store path. A function symlinkJoin can be used to do this. (Note that it may negate some closure size benefits of using a multiple-output package.)
-
-
-
- Writing a split derivation
-
-
- Here you find how to write a derivation that produces multiple outputs.
-
-
-
- In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh>; it's relatively well-readable. The whole machinery is triggered by defining the outputs attribute to contain the list of desired output names (strings).
-
-
-outputs = [ "bin" "dev" "out" "doc" ];
-
-
- Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main out output, as it catches any files that didn't get elsewhere.
-
-
-
-
- There is a special handling of the debug output, described at .
-
-
-
-
- <quote>Binaries first</quote>
-
-
- A commonly adopted convention in nixpkgs is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the perl package contains a perl executable it can be referenced as ${pkgs.perl}/bin/perl within a Nix derivation that needs to execute a Perl script.
-
-
-
- The glibc package is a deliberate single exception to the binaries first
convention. The glibc has libs as its first output allowing the libraries provided by glibc to be referenced directly (e.g. ${stdenv.glibc}/lib/ld-linux-x86-64.so.2). The executables provided by glibc can be accessed via its bin attribute (e.g. ${stdenv.glibc.bin}/bin/ldd).
-
-
-
- The reason for why glibc deviates from the convention is because referencing a library provided by glibc is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of glibc libraries from Nix packages (please see the documentation on patchelf for more details).
-
-
-
-
- File type groups
-
-
- The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an outputFoo variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined.
-
-
-
-
-
- $outputDev
-
-
-
- is for development-only files. These include C(++) headers (include/), pkg-config (lib/pkgconfig/), cmake (lib/cmake/) and aclocal files (share/aclocal/). They go to dev or out by default.
-
-
-
-
-
- $outputBin
-
-
-
- is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default.
-
-
-
-
-
- $outputLib
-
-
-
- is meant for libraries, typically residing in lib/ and libexec/. They go to lib or out by default.
-
-
-
-
-
- $outputDoc
-
-
-
- is for user documentation, typically residing in share/doc/. It goes to doc or out by default.
-
-
-
-
-
- $outputDevdoc
-
-
-
- is for developer documentation. Currently we count gtk-doc and devhelp books, typically residing in share/gtk-doc/ and share/devhelp/, in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
-
-
-
-
-
- $outputMan
-
-
-
- is for man pages (except for section 3), typically residing in share/man/man[0-9]/. They go to man or $outputBin by default.
-
-
-
-
-
- $outputDevman
-
-
-
- is for section 3 man pages, typically residing in share/man/man3/. They go to devman or $outputMan by default.
-
-
-
-
-
- $outputInfo
-
-
-
- is for info pages, typically residing in share/info/. They go to info or $outputBin by default.
-
-
-
-
-
-
-
- Common caveats
-
-
-
-
- Some configure scripts don't like some of the parameters passed by default by the framework, e.g. --docdir=/foo/bar. You can disable this by setting setOutputFlags = false;.
-
-
-
-
- The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.)
-
-
-
-
- Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into out, e.g. locale strings, so there is often no advantage in separating the libraries into lib, as keeping them in out is easier.
-
-
-
-
- Some packages have hidden assumptions on install paths, which complicates splitting.
-
-
-
-
-
-
-
diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
new file mode 100644
index 000000000000..b23c50e83644
--- /dev/null
+++ b/doc/stdenv/stdenv.chapter.md
@@ -0,0 +1,1215 @@
+# The Standard Environment {#chap-stdenv}
+
+The standard build environment in the Nix Packages collection provides an environment for building Unix packages that does a lot of common build tasks automatically. In fact, for Unix packages that use the standard `./configure; make; make install` build interface, you don’t need to write a build script at all; the standard environment does everything automatically. If `stdenv` doesn’t do what you need automatically, you can easily customise or override the various build phases.
+
+## Using `stdenv` {#sec-using-stdenv}
+
+To build a package with the standard environment, you use the function `stdenv.mkDerivation`, instead of the primitive built-in function `derivation`, e.g.
+
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ src = fetchurl {
+ url = "http://example.org/libfoo-1.2.3.tar.bz2";
+ sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m";
+ };
+}
+```
+
+(`stdenv` needs to be in scope, so if you write this in a separate Nix expression from `pkgs/all-packages.nix`, you need to pass it as a function argument.) Specifying a `name` and a `src` is the absolute minimum Nix requires. For convenience, you can also use `pname` and `version` attributes and `mkDerivation` will automatically set `name` to `"${pname}-${version}"` by default. Since [RFC 0035](https://github.com/NixOS/rfcs/pull/35), this is preferred for packages in Nixpkgs, as it allows us to reuse the version easily:
+
+```nix
+stdenv.mkDerivation rec {
+ pname = "libfoo";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "http://example.org/libfoo-source-${version}.tar.bz2";
+ sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m";
+ };
+}
+```
+
+Many packages have dependencies that are not provided in the standard environment. It’s usually sufficient to specify those dependencies in the `buildInputs` attribute:
+
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ ...
+ buildInputs = [libbar perl ncurses];
+}
+```
+
+This attribute ensures that the `bin` subdirectories of these packages appear in the `PATH` environment variable during the build, that their `include` subdirectories are searched by the C compiler, and so on. (See for details.)
+
+Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of *phases*, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see .) For instance, a package that doesn’t supply a makefile but instead has to be compiled "manually" could be handled like this:
+
+```nix
+stdenv.mkDerivation {
+ name = "fnord-4.5";
+ ...
+ buildPhase = ''
+ gcc foo.c -o foo
+ '';
+ installPhase = ''
+ mkdir -p $out/bin
+ cp foo $out/bin
+ '';
+}
+```
+
+(Note the use of `''`-style string literals, which are very convenient for large multi-line script fragments because they don’t need escaping of `"` and `\`, and because indentation is intelligently removed.)
+
+There are many other attributes to customise the build. These are listed in .
+
+While the standard environment provides a generic builder, you can still supply your own build script:
+
+```nix
+stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ ...
+ builder = ./builder.sh;
+}
+```
+
+where the builder can do anything it wants, but typically starts with
+
+```bash
+source $stdenv/setup
+```
+
+to let `stdenv` set up the environment (e.g., process the `buildInputs`). If you want, you can still use `stdenv`’s generic builder:
+
+```bash
+source $stdenv/setup
+
+buildPhase() {
+ echo "... this is my custom build phase ..."
+ gcc foo.c -o foo
+}
+
+installPhase() {
+ mkdir -p $out/bin
+ cp foo $out/bin
+}
+
+genericBuild
+```
+
+## Tools provided by `stdenv` {#sec-tools-of-stdenv}
+
+The standard environment provides the following packages:
+
+- The GNU C Compiler, configured with C and C++ support.
+- GNU coreutils (contains a few dozen standard Unix commands).
+- GNU findutils (contains `find`).
+- GNU diffutils (contains `diff`, `cmp`).
+- GNU `sed`.
+- GNU `grep`.
+- GNU `awk`.
+- GNU `tar`.
+- `gzip`, `bzip2` and `xz`.
+- GNU Make.
+- Bash. This is the shell used for all builders in the Nix Packages collection. Not using `/bin/sh` removes a large source of portability problems.
+- The `patch` command.
+
+On Linux, `stdenv` also includes the `patchelf` utility.
+
+## Specifying dependencies {#ssec-stdenv-dependencies}
+
+As described in the Nix manual, almost any `*.drv` store path in a derivation’s attribute set will induce a dependency on that derivation. `mkDerivation`, however, takes a few attributes intended to, between them, include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the `PATH`. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See for details.
+
+Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation’s, and whether they are propagated. The platform distinctions are motivated by cross compilation; see for exactly what each platform means. [^footnote-stdenv-ignored-build-platform] But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with `strictDeps` set it is mostly enforced even in the native case.
+
+The extension of `PATH` with dependencies, alluded to above, proceeds according to the relative platforms alone. The process is carried out only for dependencies whose host platform matches the new derivation’s build platform i.e. dependencies which run on the platform where the new derivation will be built. [^footnote-stdenv-native-dependencies-in-path] For each dependency \ of those dependencies, `dep/bin`, if present, is added to the `PATH` environment variable.
+
+The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency.
+
+It is important to note that dependencies are not necessarily propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. The exact rules for dependency propagation can be given by assigning to each dependency two integers based one how its host and target platforms are offset from the depending derivation’s platforms. Those offsets are given below in the descriptions of each dependency list attribute. Algorithmically, we traverse propagated inputs, accumulating every propagated dependency’s propagated dependencies and adjusting them to account for the “shift in perspective” described by the current dependency’s platform offsets. This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. We also prune transitive dependencies whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd.
+
+We can define the process precisely with [Natural Deduction](https://en.wikipedia.org/wiki/Natural_deduction) using the inference rules. This probably seems a bit obtuse, but so is the bash code that actually implements it! [^footnote-stdenv-find-inputs-location] They’re confusing in very different ways so… hopefully if something doesn’t make sense in one presentation, it will in the other!
+
+```
+let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
+
+propagated-dep(h0, t0, A, B)
+propagated-dep(h1, t1, B, C)
+h0 + h1 in {-1, 0, 1}
+h0 + t1 in {-1, 0, 1}
+-------------------------------------- Transitive property
+propagated-dep(mapOffset(h0, t0, h1),
+ mapOffset(h0, t0, t1),
+ A, C)
+```
+
+```
+let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
+
+dep(h0, _, A, B)
+propagated-dep(h1, t1, B, C)
+h0 + h1 in {-1, 0, 1}
+h0 + t1 in {-1, 0, -1}
+----------------------------- Take immediate dependencies' propagated dependencies
+propagated-dep(mapOffset(h0, t0, h1),
+ mapOffset(h0, t0, t1),
+ A, C)
+```
+
+```
+propagated-dep(h, t, A, B)
+----------------------------- Propagated dependencies count as dependencies
+dep(h, t, A, B)
+```
+
+Some explanation of this monstrosity is in order. In the common case, the target offset of a dependency is the successor to the target offset: `t = h + 1`. That means that:
+
+```
+let f(h, t, i) = i + (if i <= 0 then h else t - 1)
+let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1)
+let f(h, h + 1, i) = i + (if i <= 0 then h else h)
+let f(h, h + 1, i) = i + h
+```
+
+This is where “sum-like” comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn’t add any new information.
+
+Because of the bounds checks, the uncommon cases are `h = t` and `h + 2 = t`. In the former case, the motivation for `mapOffset` is that since its host and target platforms are the same, no transitive dependency of it should be able to “discover” an offset greater than its reduced target offsets. `mapOffset` effectively “squashes” all its transitive dependencies’ offsets so that none will ever be greater than the target offset of the original `h = t` package. In the other case, `h + 1` is skipped over between the host and target offsets. Instead of squashing the offsets, we need to “rip” them apart so no transitive dependencies’ offset is that one.
+
+Overall, the unifying theme here is that propagation shouldn’t be introducing transitive dependencies involving platforms the depending package is unaware of. \[One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn’t know how to ask for. The platform description in that scenario is a kind of unforagable capability.\] The offset bounds checking and definition of `mapOffset` together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren’t in the derivation “spec” of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency.
+
+### Variables specifying dependencies
+#### `depsBuildBuild` {#var-stdenv-depsBuildBuild}
+
+A list of dependencies whose host and target platforms are the new derivation’s build platform. This means a `-1` host and `-1` target offset from the new derivation’s platforms. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc`, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries.
+
+Since these packages are able to be run at build-time, they are always added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
+
+#### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs}
+
+A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s host platform. This means a `-1` host offset and `0` target offset from the new derivation’s platforms. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild` or `depsBuildTarget`. This could be called `depsBuildHost` but `nativeBuildInputs` is used for historical continuity.
+
+Since these packages are able to be run at build-time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
+
+#### `depsBuildTarget` {#var-stdenv-depsBuildTarget}
+
+A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s target platform. This means a `-1` host offset and `1` target offset from the new derivation’s platforms. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won’t run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional.
+
+This is a somewhat confusing concept to wrap one’s head around, and for good reason. As the only dependency type where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage *two* away from the current one. It and its use-case go hand in hand and are both considered poor form: try to not need this sort of dependency, and try to avoid building standard libraries and runtimes in the same derivation as the compiler produces code using them. Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. In short, do not use this attribute unless you are packaging a compiler and are sure it is needed.
+
+Since these packages are able to run at build time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
+
+#### `depsHostHost` {#var-stdenv-depsHostHost}
+
+A list of dependencies whose host and target platforms match the new derivation’s host platform. This means a `0` host offset and `0` target offset from the new derivation’s host platform. These are packages used at run-time to generate code also used at run-time. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It’s always preferable to use a `depsBuildBuild` dependency in the derivation being built over a `depsHostHost` on the tool doing the building for this purpose.
+
+#### `buildInputs` {#var-stdenv-buildInputs}
+
+A list of dependencies whose host platform and target platform match the new derivation’s. This means a `0` host offset and a `1` target offset from the new derivation’s host platform. This would be called `depsHostTarget` but for historical continuity. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild`.
+
+These are often programs and libraries used by the new derivation at *run*-time, but that isn’t always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker.
+
+#### `depsTargetTarget` {#var-stdenv-depsTargetTarget}
+
+A list of dependencies whose host platform matches the new derivation’s target platform. This means a `1` offset from the new derivation’s platforms. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It’s poor form in almost all cases for a package to depend on another from a future stage \[future stage corresponding to positive offset\]. Do not use this attribute unless you are packaging a compiler and are sure it is needed.
+
+#### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated}
+
+The propagated equivalent of `depsBuildBuild`. This perhaps never ought to be used, but it is included for consistency \[see below for the others\].
+
+#### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs}
+
+The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. If instead, package `Z` has `nativeBuildInputs = [Y]`, then `Z` will be built as if it included `X` in the `depsBuildBuild` of package `Z`, because of the sum of the two `-1` host offsets.
+
+#### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated}
+
+The propagated equivalent of `depsBuildTarget`. This is prefixed for the same reason of alerting potential users.
+
+#### `depsHostHostPropagated` {#var-stdenv-depsHostHostPropagated}
+
+The propagated equivalent of `depsHostHost`.
+
+#### `propagatedBuildInputs` {#var-stdenv-propagatedBuildInputs}
+
+The propagated equivalent of `buildInputs`. This would be called `depsHostTargetPropagated` but for historical continuity.
+
+#### `depsTargetTargetPropagated` {#var-stdenv-depsTargetTargetPropagated}
+
+The propagated equivalent of `depsTargetTarget`. This is prefixed for the same reason of alerting potential users.
+
+## Attributes {#ssec-stdenv-attributes}
+
+### Variables affecting `stdenv` initialisation
+
+#### `NIX_DEBUG` {#var-stdenv-NIX_DEBUG}
+
+A natural number indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing.
+
+### Attributes affecting build properties
+
+#### `enableParallelBuilding` {#var-stdenv-enableParallelBuilding}
+
+If set to `true`, `stdenv` will pass specific flags to `make` and other build tools to enable parallel building with up to `build-cores` workers.
+
+Unless set to `false`, some build systems with good support for parallel building including `cmake`, `meson`, and `qmake` will set it to `true`.
+
+### Special variables
+
+#### `passthru` {#var-stdenv-passthru}
+
+This is an attribute set which can be filled with arbitrary values. For example:
+
+```nix
+passthru = {
+ foo = "bar";
+ baz = {
+ value1 = 4;
+ value2 = 5;
+ };
+}
+```
+
+Values inside it are not passed to the builder, so you can change them without triggering a rebuild. However, they can be accessed outside of a derivation directly, as if they were set inside a derivation itself, e.g. `hello.baz.value1`. We don’t specify any usage or schema of `passthru` - it is meant for values that would be useful outside the derivation in other parts of a Nix expression (e.g. in other derivations). An example would be to convey some specific dependency of your derivation which contains a program with plugins support. Later, others who make derivations with plugins can use passed-through dependency to ensure that their plugin would be binary-compatible with built program.
+
+#### `passthru.updateScript` {#var-passthru-updateScript}
+
+A script to be run by `maintainers/scripts/update.nix` when the package is matched. It needs to be an executable file, either on the file system:
+
+```nix
+passthru.updateScript = ./update.sh;
+```
+
+or inside the expression itself:
+
+```nix
+passthru.updateScript = writeScript "update-zoom-us" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl pcre common-updater-scripts
+
+ set -eu -o pipefail
+
+ version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')"
+ update-source-version zoom-us "$version"
+'';
+```
+
+The attribute can also contain a list, a script followed by arguments to be passed to it:
+
+```nix
+passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
+```
+
+The script will be run with `UPDATE_NIX_ATTR_PATH` environment variable set to the attribute path it is supposed to update.
+
+::: note
+The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running `git commit` or any other commands that cannot handle that.
+:::
+
+For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`.
+
+## Phases {#sec-stdenv-phases}
+
+The generic builder has a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm.
+
+Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`.
+
+### Controlling phases {#ssec-controlling-phases}
+
+There are a number of variables that control what phases are executed and in what order:
+
+#### Variables affecting phase control
+
+##### `phases` {#var-stdenv-phases}
+
+Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is `$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases`.
+
+Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`), as you then don’t specify all the normal phases.
+
+##### `prePhases` {#var-stdenv-prePhases}
+
+Additional phases executed before any of the default phases.
+
+##### `preConfigurePhases` {#var-stdenv-preConfigurePhases}
+
+Additional phases executed just before the configure phase.
+
+##### `preBuildPhases` {#var-stdenv-preBuildPhases}
+
+Additional phases executed just before the build phase.
+
+##### `preInstallPhases` {#var-stdenv-preInstallPhases}
+
+Additional phases executed just before the install phase.
+
+##### `preFixupPhases` {#var-stdenv-preFixupPhases}
+
+Additional phases executed just before the fixup phase.
+
+##### `preDistPhases` {#var-stdenv-preDistPhases}
+
+Additional phases executed just before the distribution phase.
+
+##### `postPhases` {#var-stdenv-postPhases}
+
+Additional phases executed after any of the default phases.
+
+### The unpack phase {#ssec-unpack-phase}
+
+The unpack phase is responsible for unpacking the source code of the package. The default implementation of `unpackPhase` unpacks the source files listed in the `src` environment variable to the current directory. It supports the following files by default:
+
+#### Tar files
+
+These can optionally be compressed using `gzip` (`.tar.gz`, `.tgz` or `.tar.Z`), `bzip2` (`.tar.bz2`, `.tbz2` or `.tbz`) or `xz` (`.tar.xz`, `.tar.lzma` or `.txz`).
+
+#### Zip files
+
+Zip files are unpacked using `unzip`. However, `unzip` is not in the standard environment, so you should add it to `nativeBuildInputs` yourself.
+
+#### Directories in the Nix store
+
+These are simply copied to the current directory. The hash part of the file name is stripped, e.g. `/nix/store/1wydxgby13cz...-my-sources` would be copied to `my-sources`.
+
+Additional file types can be supported by setting the `unpackCmd` variable (see below).
+
+#### Variables controlling the unpack phase
+##### `srcs` / `src` {#var-stdenv-src}
+
+The list of source files or directories to be unpacked or copied. One of these must be set.
+
+##### `sourceRoot` {#var-stdenv-sourceRoot}
+
+After running `unpackPhase`, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set `sourceRoot` to the name of the intended directory.
+
+##### `setSourceRoot` {#var-stdenv-setSourceRoot}
+
+Alternatively to setting `sourceRoot`, you can set `setSourceRoot` to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set `sourceRoot`.
+
+##### `preUnpack` {#var-stdenv-preUnpack}
+
+Hook executed at the start of the unpack phase.
+
+##### `postUnpack` {#var-stdenv-postUnpack}
+
+Hook executed at the end of the unpack phase.
+
+##### `dontUnpack` {#var-stdenv-dontUnpack}
+
+Set to true to skip the unpack phase.
+
+##### `dontMakeSourcesWritable` {#var-stdenv-dontMakeSourcesWritable}
+
+If set to `1`, the unpacked sources are *not* made writable. By default, they are made writable to prevent problems with read-only sources. For example, copied store directories would be read-only without this.
+
+##### `unpackCmd` {#var-stdenv-unpackCmd}
+
+The unpack phase evaluates the string `$unpackCmd` for any unrecognised file. The path to the current source file is contained in the `curSrc` variable.
+
+### The patch phase {#ssec-patch-phase}
+
+The patch phase applies the list of patches defined in the `patches` variable.
+
+#### Variables controlling the patch phase
+
+##### `dontPatch` {#var-stdenv-dontPatch}
+
+Set to true to skip the patch phase.
+
+##### `patches` {#var-stdenv-patches}
+
+The list of patches. They must be in the format accepted by the `patch` command, and may optionally be compressed using `gzip` (`.gz`), `bzip2` (`.bz2`) or `xz` (`.xz`).
+
+##### `patchFlags` {#var-stdenv-patchFlags}
+
+Flags to be passed to `patch`. If not set, the argument `-p1` is used, which causes the leading directory component to be stripped from the file names in each patch.
+
+##### `prePatch` {#var-stdenv-prePatch}
+
+Hook executed at the start of the patch phase.
+
+##### `postPatch` {#var-stdenv-postPatch}
+
+Hook executed at the end of the patch phase.
+
+### The configure phase {#ssec-configure-phase}
+
+The configure phase prepares the source tree for building. The default `configurePhase` runs `./configure` (typically an Autoconf-generated script) if it exists.
+
+#### Variables controlling the configure phase
+
+##### `configureScript` {#var-stdenv-configureScript}
+
+The name of the configure script. It defaults to `./configure` if it exists; otherwise, the configure phase is skipped. This can actually be a command (like `perl ./Configure.pl`).
+
+##### `configureFlags` {#var-stdenv-configureFlags}
+
+A list of strings passed as additional arguments to the configure script.
+
+##### `dontConfigure` {#var-stdenv-dontConfigure}
+
+Set to true to skip the configure phase.
+
+##### `configureFlagsArray` {#var-stdenv-configureFlagsArray}
+
+A shell array containing additional arguments passed to the configure script. You must use this instead of `configureFlags` if the arguments contain spaces.
+
+##### `dontAddPrefix` {#var-stdenv-dontAddPrefix}
+
+By default, the flag `--prefix=$prefix` is added to the configure flags. If this is undesirable, set this variable to true.
+
+##### `prefix` {#var-stdenv-prefix}
+
+The prefix under which the package must be installed, passed via the `--prefix` option to the configure script. It defaults to `$out`.
+
+##### `prefixKey` {#var-stdenv-prefixKey}
+
+The key to use when specifying the prefix. By default, this is set to `--prefix=` as that is used by the majority of packages.
+
+##### `dontAddDisableDepTrack` {#var-stdenv-dontAddDisableDepTrack}
+
+By default, the flag `--disable-dependency-tracking` is added to the configure flags to speed up Automake-based builds. If this is undesirable, set this variable to true.
+
+##### `dontFixLibtool` {#var-stdenv-dontFixLibtool}
+
+By default, the configure phase applies some special hackery to all files called `ltmain.sh` before running the configure script in order to improve the purity of Libtool-based packages [^footnote-stdenv-sys-lib-search-path] . If this is undesirable, set this variable to true.
+
+##### `dontDisableStatic` {#var-stdenv-dontDisableStatic}
+
+By default, when the configure script has `--enable-static`, the option `--disable-static` is added to the configure flags.
+
+If this is undesirable, set this variable to true.
+
+##### `configurePlatforms` {#var-stdenv-configurePlatforms}
+
+By default, when cross compiling, the configure script has `--build=...` and `--host=...` passed. Packages can instead pass `[ "build" "host" "target" ]` or a subset to control exactly which platform flags are passed. Compilers and other tools can use this to also pass the target platform. [^footnote-stdenv-build-time-guessing-impurity]
+
+##### `preConfigure` {#var-stdenv-preConfigure}
+
+Hook executed at the start of the configure phase.
+
+##### `postConfigure` {#var-stdenv-postConfigure}
+
+Hook executed at the end of the configure phase.
+
+### The build phase {#build-phase}
+
+The build phase is responsible for actually building the package (e.g. compiling it). The default `buildPhase` simply calls `make` if a file named `Makefile`, `makefile` or `GNUmakefile` exists in the current directory (or the `makefile` is explicitly set); otherwise it does nothing.
+
+#### Variables controlling the build phase
+
+##### `dontBuild` {#var-stdenv-dontBuild}
+
+Set to true to skip the build phase.
+
+##### `makefile` {#var-stdenv-makefile}
+
+The file name of the Makefile.
+
+##### `makeFlags` {#var-stdenv-makeFlags}
+
+A list of strings passed as additional flags to `make`. These flags are also used by the default install and check phase. For setting make flags specific to the build phase, use `buildFlags` (see below).
+
+```nix
+makeFlags = [ "PREFIX=$(out)" ];
+```
+
+::: note
+The flags are quoted in bash, but environment variables can be specified by using the make syntax.
+:::
+
+##### `makeFlagsArray` {#var-stdenv-makeFlagsArray}
+
+A shell array containing additional arguments passed to `make`. You must use this instead of `makeFlags` if the arguments contain spaces, e.g.
+
+```nix
+preBuild = ''
+ makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
+'';
+```
+
+Note that shell arrays cannot be passed through environment variables, so you cannot set `makeFlagsArray` in a derivation attribute (because those are passed through environment variables): you have to define them in shell code.
+
+##### `buildFlags` / `buildFlagsArray` {#var-stdenv-buildFlags}
+
+A list of strings passed as additional flags to `make`. Like `makeFlags` and `makeFlagsArray`, but only used by the build phase.
+
+##### `preBuild` {#var-stdenv-preBuild}
+
+Hook executed at the start of the build phase.
+
+##### `postBuild` {#var-stdenv-postBuild}
+
+Hook executed at the end of the build phase.
+
+You can set flags for `make` through the `makeFlags` variable.
+
+Before and after running `make`, the hooks `preBuild` and `postBuild` are called, respectively.
+
+### The check phase {#ssec-check-phase}
+
+The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled.
+
+#### Variables controlling the check phase
+
+##### `doCheck` {#var-stdenv-doCheck}
+
+Controls whether the check phase is executed. By default it is skipped, but if `doCheck` is set to true, the check phase is usually executed. Thus you should set
+
+```nix
+doCheck = true;
+```
+
+in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doCheck` is set, as the newly-built program won’t run on the platform used to build it.
+
+##### `makeFlags` / `makeFlagsArray` / `makefile`
+
+See the [build phase](#var-stdenv-makeFlags) for details.
+
+##### `checkTarget` {#var-stdenv-checkTarget}
+
+The make target that runs the tests. Defaults to `check`.
+
+##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags}
+
+A list of strings passed as additional flags to `make`. Like `makeFlags` and `makeFlagsArray`, but only used by the check phase.
+
+##### `checkInputs` {#var-stdenv-checkInputs}
+
+A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doCheck` is set.
+
+##### `preCheck` {#var-stdenv-preCheck}
+
+Hook executed at the start of the check phase.
+
+##### `postCheck` {#var-stdenv-postCheck}
+
+Hook executed at the end of the check phase.
+
+### The install phase {#ssec-install-phase}
+
+The install phase is responsible for installing the package in the Nix store under `out`. The default `installPhase` creates the directory `$out` and calls `make install`.
+
+#### Variables controlling the install phase
+
+##### `dontInstall` {#var-stdenv-dontInstall}
+
+Set to true to skip the install phase.
+
+##### `makeFlags` / `makeFlagsArray` / `makefile`
+
+See the [build phase](#var-stdenv-makeFlags) for details.
+
+##### `installTargets` {#var-stdenv-installTargets}
+
+The make targets that perform the installation. Defaults to `install`. Example:
+
+```nix
+installTargets = "install-bin install-doc";
+```
+
+##### `installFlags` / `installFlagsArray` {#var-stdenv-installFlags}
+
+A list of strings passed as additional flags to `make`. Like `makeFlags` and `makeFlagsArray`, but only used by the install phase.
+
+##### `preInstall` {#var-stdenv-preInstall}
+
+Hook executed at the start of the install phase.
+
+##### `postInstall` {#var-stdenv-postInstall}
+
+Hook executed at the end of the install phase.
+
+### The fixup phase {#ssec-fixup-phase}
+
+The fixup phase performs some (Nix-specific) post-processing actions on the files installed under `$out` by the install phase. The default `fixupPhase` does the following:
+
+- It moves the `man/`, `doc/` and `info/` subdirectories of `$out` to `share/`.
+- It strips libraries and executables of debug information.
+- On Linux, it applies the `patchelf` command to ELF executables and libraries to remove unused directories from the `RPATH` in order to prevent unnecessary runtime dependencies.
+- It rewrites the interpreter paths of shell scripts to paths found in `PATH`. E.g., `/usr/bin/perl` will be rewritten to `/nix/store/some-perl/bin/perl` found in `PATH`.
+
+#### Variables controlling the fixup phase
+
+##### `dontFixup` {#var-stdenv-dontFixup}
+
+Set to true to skip the fixup phase.
+
+##### `dontStrip` {#var-stdenv-dontStrip}
+
+If set, libraries and executables are not stripped. By default, they are.
+
+##### `dontStripHost` {#var-stdenv-dontStripHost}
+
+Like `dontStrip`, but only affects the `strip` command targetting the package’s host platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
+
+##### `dontStripTarget` {#var-stdenv-dontStripTarget}
+
+Like `dontStrip`, but only affects the `strip` command targetting the packages’ target platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
+
+##### `dontMoveSbin` {#var-stdenv-dontMoveSbin}
+
+If set, files in `$out/sbin` are not moved to `$out/bin`. By default, they are.
+
+##### `stripAllList` {#var-stdenv-stripAllList}
+
+List of directories to search for libraries and executables from which *all* symbols should be stripped. By default, it’s empty. Stripping all symbols is risky, since it may remove not just debug symbols but also ELF information necessary for normal execution.
+
+##### `stripAllFlags` {#var-stdenv-stripAllFlags}
+
+Flags passed to the `strip` command applied to the files in the directories listed in `stripAllList`. Defaults to `-s` (i.e. `--strip-all`).
+
+##### `stripDebugList` {#var-stdenv-stripDebugList}
+
+List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to `lib lib32 lib64 libexec bin sbin`.
+
+##### `stripDebugFlags` {#var-stdenv-stripDebugFlags}
+
+Flags passed to the `strip` command applied to the files in the directories listed in `stripDebugList`. Defaults to `-S` (i.e. `--strip-debug`).
+
+##### `dontPatchELF` {#var-stdenv-dontPatchELF}
+
+If set, the `patchelf` command is not used to remove unnecessary `RPATH` entries. Only applies to Linux.
+
+##### `dontPatchShebangs` {#var-stdenv-dontPatchShebangs}
+
+If set, scripts starting with `#!` do not have their interpreter paths rewritten to paths in the Nix store.
+
+##### `dontPruneLibtoolFiles` {#var-stdenv-dontPruneLibtoolFiles}
+
+If set, libtool `.la` files associated with shared libraries won’t have their `dependency_libs` field cleared.
+
+##### `forceShare` {#var-stdenv-forceShare}
+
+The list of directories that must be moved from `$out` to `$out/share`. Defaults to `man doc info`.
+
+##### `setupHook` {#var-stdenv-setupHook}
+
+A package can export a [setup hook](#ssec-setup-hooks) by setting this variable. The setup hook, if defined, is copied to `$out/nix-support/setup-hook`. Environment variables are then substituted in it using `substituteAll`.
+
+##### `preFixup` {#var-stdenv-preFixup}
+
+Hook executed at the start of the fixup phase.
+
+##### `postFixup` {#var-stdenv-postFixup}
+
+Hook executed at the end of the fixup phase.
+
+##### `separateDebugInfo` {#stdenv-separateDebugInfo}
+
+If set to `true`, the standard environment will enable debug information in C/C++ builds. After installation, the debug information will be separated from the executables and stored in the output named `debug`. (This output is enabled automatically; you don’t need to set the `outputs` attribute explicitly.) To be precise, the debug information is stored in `debug/lib/debug/.build-id/XX/YYYY…`, where \ is the \ of the binary — a SHA-1 hash of the contents of the binary. Debuggers like GDB use the build ID to look up the separated debug information.
+
+For example, with GDB, you can add
+
+```
+set debug-file-directory ~/.nix-profile/lib/debug
+```
+
+to `~/.gdbinit`. GDB will then be able to find debug information installed via `nix-env -i`.
+
+### The installCheck phase {#ssec-installCheck-phase}
+
+The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default `installCheck` calls `make installcheck`.
+
+#### Variables controlling the installCheck phase
+
+##### `doInstallCheck` {#var-stdenv-doInstallCheck}
+
+Controls whether the installCheck phase is executed. By default it is skipped, but if `doInstallCheck` is set to true, the installCheck phase is usually executed. Thus you should set
+
+```nix
+doInstallCheck = true;
+```
+
+in the derivation to enable install checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how `doInstallCheck` is set, as the newly-built program won’t run on the platform used to build it.
+
+##### `installCheckTarget` {#var-stdenv-installCheckTarget}
+
+The make target that runs the install tests. Defaults to `installcheck`.
+
+##### `installCheckFlags` / `installCheckFlagsArray` {#var-stdenv-installCheckFlags}
+
+A list of strings passed as additional flags to `make`. Like `makeFlags` and `makeFlagsArray`, but only used by the installCheck phase.
+
+##### `installCheckInputs` {#var-stdenv-installCheckInputs}
+
+A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doInstallCheck` is set.
+
+##### `preInstallCheck` {#var-stdenv-preInstallCheck}
+
+Hook executed at the start of the installCheck phase.
+
+##### `postInstallCheck` {#var-stdenv-postInstallCheck}
+
+Hook executed at the end of the installCheck phase.
+
+### The distribution phase {#ssec-distribution-phase}
+
+The distribution phase is intended to produce a source distribution of the package. The default `distPhase` first calls `make dist`, then it copies the resulting source tarballs to `$out/tarballs/`. This phase is only executed if the attribute `doDist` is set.
+
+#### Variables controlling the distribution phase
+
+##### `distTarget` {#var-stdenv-distTarget}
+
+The make target that produces the distribution. Defaults to `dist`.
+
+##### `distFlags` / `distFlagsArray` {#var-stdenv-distFlags}
+
+Additional flags passed to `make`.
+
+##### `tarballs` {#var-stdenv-tarballs}
+
+The names of the source distribution files to be copied to `$out/tarballs/`. It can contain shell wildcards. The default is `*.tar.gz`.
+
+##### `dontCopyDist` {#var-stdenv-dontCopyDist}
+
+If set, no files are copied to `$out/tarballs/`.
+
+##### `preDist` {#var-stdenv-preDist}
+
+Hook executed at the start of the distribution phase.
+
+##### `postDist` {#var-stdenv-postDist}
+
+Hook executed at the end of the distribution phase.
+
+## Shell functions {#ssec-stdenv-functions}
+
+The standard environment provides a number of useful functions.
+
+### `makeWrapper` \ \ \ {#fun-makeWrapper}
+
+Constructs a wrapper for a program with various possible arguments. For example:
+
+```bash
+# adds `FOOBAR=baz` to `$out/bin/foo`’s environment
+makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz
+
+# prefixes the binary paths of `hello` and `git`
+# Be advised that paths often should be patched in directly
+# (via string replacements or in `configurePhase`).
+makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]}
+```
+
+There’s many more kinds of arguments, they are documented in `nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh`.
+
+`wrapProgram` is a convenience function you probably want to use most of the time.
+
+### `substitute` \ \ \ {#fun-substitute}
+
+Performs string substitution on the contents of \, writing the result to \. The substitutions in \ are of the following form:
+
+#### `--replace` \ \
+
+Replace every occurrence of the string \ by \.
+
+#### `--subst-var` \
+
+Replace every occurrence of `@varName@` by the contents of the environment variable \. This is useful for generating files from templates, using `@...@` in the template as placeholders.
+
+#### `--subst-var-by` \ \
+
+Replace every occurrence of `@varName@` by the string \.
+
+Example:
+
+```shell
+substitute ./foo.in ./foo.out \
+ --replace /usr/bin/bar $bar/bin/bar \
+ --replace "a string containing spaces" "some other text" \
+ --subst-var someVar
+```
+
+### `substituteInPlace` \ \ {#fun-substituteInPlace}
+
+Like `substitute`, but performs the substitutions in place on the file \.
+
+### `substituteAll` \ \ {#fun-substituteAll}
+
+Replaces every occurrence of `@varName@`, where \ is any environment variable, in \, writing the result to \. For instance, if \ has the contents
+
+```bash
+#! @bash@/bin/sh
+PATH=@coreutils@/bin
+echo @foo@
+```
+
+and the environment contains `bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39` and `coreutils=/nix/store/68afga4khv0w...-coreutils-6.12`, but does not contain the variable `foo`, then the output will be
+
+```bash
+#! /nix/store/bmwp0q28cf21...-bash-3.2-p39/bin/sh
+PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin
+echo @foo@
+```
+
+That is, no substitution is performed for undefined variables.
+
+Environment variables that start with an uppercase letter or an underscore are filtered out, to prevent global variables (like `HOME`) or private variables (like `__ETC_PROFILE_DONE`) from accidentally getting substituted. The variables also have to be valid bash "names", as defined in the bash manpage (alphanumeric or `_`, must not start with a number).
+
+### `substituteAllInPlace` \ {#fun-substituteAllInPlace}
+
+Like `substituteAll`, but performs the substitutions in place on the file \.
+
+### `stripHash` \ {#fun-stripHash}
+
+Strips the directory and hash part of a store path, outputting the name part to `stdout`. For example:
+
+```bash
+# prints coreutils-8.24
+stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
+```
+
+If you wish to store the result in another variable, then the following idiom may be useful:
+
+```bash
+name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
+someVar=$(stripHash $name)
+```
+
+### `wrapProgram` \ \ {#fun-wrapProgram}
+
+Convenience function for `makeWrapper` that automatically creates a sane wrapper file. It takes all the same arguments as `makeWrapper`, except for `--argv0`.
+
+It cannot be applied multiple times, since it will overwrite the wrapper file.
+
+## Package setup hooks {#ssec-setup-hooks}
+
+Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used.
+
+In order to alleviate this burden, the setup hook mechanism was written, where any package can include a shell script that \[by convention rather than enforcement by Nix\], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed.
+
+The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn’t without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the letter isn’t. For example, if a derivation path is mentioned more than once, Nix itself doesn’t care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so.
+
+The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper’s setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of `envBuildBuildHooks`, `envBuildHostHooks`, `envBuildTargetHooks`, `envHostHostHooks`, `envHostTargetHooks`, or `envTargetTargetHooks`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there’s 12 total but we ignore the propagated/non-propagated axis).
+
+Packages adding a hook should not hard code a specific hook, but rather choose a variable *relative* to how they are included. Returning to the C compiler wrapper example, if the wrapper itself is an `n` dependency, then it only wants to accumulate flags from `n + 1` dependencies, as only those ones match the compiler’s target platform. The `hostOffset` variable is defined with the current dependency’s host offset `targetOffset` with its target offset, before its setup hook is sourced. Additionally, since most environment hooks don’t care about the target platform, that means the setup hook can append to the right bash array by doing something like
+
+```{.bash}
+addEnvHooks "$hostOffset" myBashFunction
+```
+
+The *existence* of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there’s little benefit from mandating it be stable for any period of time.
+
+First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using `stdenv.mkDerivation`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa.
+
+### `move-docs.sh`
+
+This setup hook moves any installed documentation to the `/share` subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the `share` subdirectory.
+
+### `compress-man-pages.sh`
+
+This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages.
+
+### `strip.sh`
+
+This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages.
+
+### `patch-shebangs.sh`
+
+This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g `#!/bin/bash`). In Nix, we want an exact path to that interpreter to be used. This often replaces `/bin/sh` with a path in the Nix store.
+
+### `audit-tmpdir.sh`
+
+This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only.
+
+### `multiple-outputs.sh`
+
+This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in `outputs`. This behavior can be turned off by setting `setOutputFlags` to false in the derivation environment. See for more information.
+
+### `move-sbin.sh`
+
+This setup hook moves any binaries installed in the `sbin/` subdirectory into `bin/`. In addition, a link is provided from `sbin/` to `bin/` for compatibility.
+
+### `move-lib64.sh`
+
+This setup hook moves any libraries installed in the `lib64/` subdirectory into `lib/`. In addition, a link is provided from `lib64/` to `lib/` for compatibility.
+
+### `move-systemd-user-units.sh`
+
+This setup hook moves any systemd user units installed in the `lib/` subdirectory into `share/`. In addition, a link is provided from `share/` to `lib/` for compatibility. This is needed for systemd to find user services when installed into the user profile.
+
+### `set-source-date-epoch-to-latest.sh`
+
+This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file.
+
+### Bintools Wrapper
+
+The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. \[The “Bintools” name is supposed to be a compromise between “Binutils” and “cctools” not denoting any specific implementation.\] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper.
+
+The Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. For example, it shouldn’t care about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. It is currently accomplished by collecting directories of host-platform dependencies (i.e. `buildInputs` and `nativeBuildInputs`) in environment variables. The Bintools Wrapper’s setup hook causes any `lib` and `lib64` subdirectories to be added to `NIX_LDFLAGS`. Since the CC Wrapper and the Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to the CC Wrapper. But the CC Wrapper’s code, by contrast, has quite lengthy comments. The Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync.
+
+A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables fulfill which purpose. They are defined to just be the base name of the tools, under the assumption that the Bintools Wrapper’s binaries will be on the path. Firstly, this helps poorly-written packages, e.g. ones that look for just `gcc` when `CC` isn’t defined yet `clang` is to be used. Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use. [^footnote-stdenv-per-platform-wrapper] `BUILD_`- and `TARGET_`-prefixed versions of the normal environment variable are defined for additional Bintools Wrappers, properly disambiguating them.
+
+A problem with this final task is that the Bintools Wrapper is honest and defines `LD` as `ld`. Most packages, however, firstly use the C compiler for linking, secondly use `LD` anyways, defining it as the C compiler, and thirdly, only so define `LD` when it is undefined as a fallback. This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won’t override yet doesn’t want to use. The workaround is to define, just for the problematic package, `LD` as the C compiler. A good way to do this would be `preConfigure = "LD=$CC"`.
+
+### CC Wrapper
+
+The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin’s libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper.
+
+Dependency finding is undoubtedly the main task of the CC Wrapper. This works just like the Bintools Wrapper, except that any `include` subdirectory of any relevant dependency is added to `NIX_CFLAGS_COMPILE`. The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
+
+Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard environment variables with the names of the tools it wraps, for the same reasons described above. Importantly, while it includes a `cc` symlink to the c compiler for portability, the `CC` will be defined using the compiler’s “real name” (i.e. `gcc` or `clang`). This helps lousy build systems that inspect on the name of the compiler rather than run it.
+
+Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses.
+
+### Perl {#setup-hook-perl}
+
+Adds the `lib/site_perl` subdirectory of each build input to the `PERL5LIB` environment variable. For instance, if `buildInputs` contains Perl, then the `lib/site_perl` subdirectory of each input is added to the `PERL5LIB` environment variable.
+
+### Python {#setup-hook-python}
+
+Adds the `lib/${python.libPrefix}/site-packages` subdirectory of each build input to the `PYTHONPATH` environment variable.
+
+### pkg-config {#setup-hook-pkg-config}
+
+Adds the `lib/pkgconfig` and `share/pkgconfig` subdirectories of each build input to the `PKG_CONFIG_PATH` environment variable.
+
+### Automake {#setup-hook-automake}
+
+Adds the `share/aclocal` subdirectory of each build input to the `ACLOCAL_PATH` environment variable.
+
+### Autoconf {#setup-hook-autoconf}
+
+The `autoreconfHook` derivation adds `autoreconfPhase`, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts.
+
+### libxml2 {#setup-hook-libxml2}
+
+Adds every file named `catalog.xml` found under the `xml/dtd` and `xml/xsl` subdirectories of each build input to the `XML_CATALOG_FILES` environment variable.
+
+### teTeX / TeX Live
+
+Adds the `share/texmf-nix` subdirectory of each build input to the `TEXINPUTS` environment variable.
+
+### Qt 4
+
+Sets the `QTDIR` environment variable to Qt’s path.
+
+### gdk-pixbuf {#setup-hook-gdk-pixbuf}
+
+Exports `GDK_PIXBUF_MODULE_FILE` environment variable to the builder. Add librsvg package to `buildInputs` to get svg support. See also the [setup hook description in GNOME platform docs](#ssec-gnome-hooks-gdk-pixbuf).
+
+### GHC
+
+Creates a temporary package database and registers every Haskell build input in it (TODO: how?).
+
+### GNOME platform
+
+Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in .
+
+### autoPatchelfHook {#setup-hook-autopatchelfhook}
+
+This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given `buildInputs` and `nativeBuildInputs`.
+
+You can also specify a `runtimeDependencies` variable which lists dependencies to be unconditionally added to rpath of all executables. This is useful for programs that use dlopen 3 to load libraries at runtime.
+
+In certain situations you may want to run the main command (`autoPatchelf`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchelf` environment variable to a non-empty value.
+
+By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value.
+
+The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories.
+
+### breakpointHook
+
+This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the `cntr` command. Upon build error it will print instructions on how to use `cntr`, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At `/var/lib/cntr` the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. `cntr` is only supported on Linux-based platforms. To use it first add `cntr` to your `environment.systemPackages` on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add `breakpointHook` to `nativeBuildInputs`.
+
+```nix
+nativeBuildInputs = [ breakpointHook ];
+```
+
+When a build failure happens there will be an instruction printed that shows how to attach with `cntr` to the build sandbox.
+
+::: note
+::: title
+Caution with remote builds
+:::
+
+This won’t work with remote builds as the build environment is on a different machine and can’t be accessed by `cntr`. Remote builds can be turned off by setting `--option builders ''` for `nix-build` or `--builders ''` for `nix build`.
+:::
+
+### installShellFiles
+
+This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook.
+
+The `installManPage` function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with `.gz` suffix). This function will place them into the correct directory.
+
+The `installShellCompletion` function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of `--bash`, `--fish`, or `--zsh`. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag `--name NAME` before the path. If this flag is not provided, zsh completions will be renamed automatically such that `foobar.zsh` becomes `_foobar`. A root name may be provided for all paths using the flag `--cmd NAME`; this synthesizes the appropriate name depending on the shell (e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for zsh). The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which case the shell and name must be provided.
+
+```nix
+nativeBuildInputs = [ installShellFiles ];
+postInstall = ''
+ installManPage doc/foobar.1 doc/barfoo.3
+ # explicit behavior
+ installShellCompletion --bash --name foobar.bash share/completions.bash
+ installShellCompletion --fish --name foobar.fish share/completions.fish
+ installShellCompletion --zsh --name _foobar share/completions.zsh
+ # implicit behavior
+ installShellCompletion share/completions/foobar.{bash,fish,zsh}
+ # using named fd
+ installShellCompletion --cmd foobar \
+ --bash <($out/bin/foobar --bash-completion) \
+ --fish <($out/bin/foobar --fish-completion) \
+ --zsh <($out/bin/foobar --zsh-completion)
+'';
+```
+
+### libiconv, libintl
+
+A few libraries automatically add to `NIX_LDFLAGS` their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set `dontAddExtraLibs`.
+
+### validatePkgConfig
+
+The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables.
+
+### cmake
+
+Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to CMAKE_PREFIX_PATH so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting configurePhase to a custom value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator.
+
+### xcbuildHook
+
+Overrides the build and install phases to run the "xcbuild" command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild.
+
+### Meson
+
+Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere.
+
+#### Variables controlling Meson
+
+##### `mesonFlags`
+
+Controls the flags passed to meson.
+
+##### `mesonBuildType`
+
+Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`.
+
+##### `mesonAutoFeatures`
+
+What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`.
+
+##### `mesonWrapMode`
+
+What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access.
+
+##### `dontUseMesonConfigure`
+
+Disables using Meson’s `configurePhase`.
+
+### ninja
+
+Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja.
+
+### unzip
+
+This setup hook will allow you to unzip .zip files specified in `$src`. There are many similar packages like `unrar`, `undmg`, etc.
+
+### wafHook
+
+Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script.
+
+### scons
+
+Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time.
+
+## Purity in Nixpkgs {#sec-purity-in-nixpkgs}
+
+*Measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them.*
+
+GCC doesn’t search in locations such as `/usr/include`. In fact, attempts to add such directories through the `-I` flag are filtered out. Likewise, the linker (from GNU binutils) doesn’t search in standard locations such as `/usr/lib`. Programs built on Linux are linked against a GNU C Library that likewise doesn’t search in the default system locations.
+
+## Hardening in Nixpkgs {#sec-hardening-in-nixpkgs}
+
+There are flags available to harden packages at compile or link-time. These can be toggled using the `stdenv.mkDerivation` parameters `hardeningDisable` and `hardeningEnable`.
+
+Both parameters take a list of flags as strings. The special `"all"` flag can be passed to `hardeningDisable` to turn off all hardening. These flags can also be used as environment variables for testing or development purposes.
+
+The following flags are enabled by default and might require disabling with `hardeningDisable` if the program to package is incompatible.
+
+### `format`
+
+Adds the `-Wformat -Wformat-security -Werror=format-security` compiler options. At present, this warns about calls to `printf` and `scanf` functions where the format string is not a string literal and there are no format arguments, as in `printf(foo);`. This may be a security hole if the format string came from untrusted input and contains `%n`.
+
+This needs to be turned off or fixed for errors similar to:
+
+```
+/tmp/nix-build-zynaddsubfx-2.5.2.drv-0/zynaddsubfx-2.5.2/src/UI/guimain.cpp:571:28: error: format not a string literal and no format arguments [-Werror=format-security]
+ printf(help_message);
+ ^
+cc1plus: some warnings being treated as errors
+```
+
+### `stackprotector`
+
+Adds the `-fstack-protector-strong --param ssp-buffer-size=4` compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application).
+
+This needs to be turned off or fixed for errors similar to:
+
+```
+bin/blib.a(bios_console.o): In function `bios_handle_cup':
+/tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail'
+```
+
+### `fortify`
+
+Adds the `-O2 -D_FORTIFY_SOURCE=2` compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain `%n` are blocked. If an application depends on such a format string, it will need to be worked around.
+
+Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set `NIX_CFLAGS_COMPILE` to `-Wno-error=warning-type`.
+
+This needs to be turned off or fixed for errors similar to:
+
+```
+malloc.c:404:15: error: return type is an incomplete type
+malloc.c:410:19: error: storage size of 'ms' isn't known
+
+strdup.h:22:1: error: expected identifier or '(' before '__extension__'
+
+strsep.c:65:23: error: register name not specified for 'delim'
+
+installwatch.c:3751:5: error: conflicting types for '__open_2'
+
+fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments
+```
+
+### `pic`
+
+Adds the `-fPIC` compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible.
+
+Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won’t build with PIC enabled. The compiler will is most cases complain that PIC is not supported for a specific build.
+
+This needs to be turned off or fixed for assembler errors similar to:
+
+```
+ccbLfRgg.s: Assembler messages:
+ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF'
+```
+
+### `strictoverflow`
+
+Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option `-fno-strict-overflow` makes gcc behave as if signed integer overflows were defined.
+
+This flag should not trigger any build or runtime errors.
+
+### `relro`
+
+Adds the `-z relro` linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable.
+
+This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the `bindnow` flag must also be disabled and incompatible programs typically fail with similar errors at runtime.
+
+### `bindnow`
+
+Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons.
+
+This flag can break dynamic shared object loading. For instance, the module systems of Xorg and PHP are incompatible with this flag. Programs incompatible with this flag often fail at runtime due to missing symbols, like:
+
+```
+intel_drv.so: undefined symbol: vgaHWFreeHWRec
+```
+
+The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services.
+
+### `pie`
+
+Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack.
+
+For more in-depth information on these hardening flags and hardening in general, refer to the [Debian Wiki](https://wiki.debian.org/Hardening), [Ubuntu Wiki](https://wiki.ubuntu.com/Security/Features), [Gentoo Wiki](https://wiki.gentoo.org/wiki/Project:Hardened), and the [Arch Wiki](https://wiki.archlinux.org/index.php/DeveloperWiki:Security).
+
+[^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation.
+[^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`.
+[^footnote-stdenv-find-inputs-location]: The `findInputs` function, currently residing in `pkgs/stdenv/generic/setup.sh`, implements the propagation logic.
+[^footnote-stdenv-sys-lib-search-path]: It clears the `sys_lib_*search_path` variables in the Libtool script to prevent Libtool from using libraries in `/usr/lib` and such.
+[^footnote-stdenv-build-time-guessing-impurity]: Eventually these will be passed building natively as well, to improve determinism: build-time guessing, as is done today, is a risk of impurity.
+[^footnote-stdenv-per-platform-wrapper]: Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms.
diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml
deleted file mode 100644
index b2004270e9b7..000000000000
--- a/doc/stdenv/stdenv.xml
+++ /dev/null
@@ -1,2419 +0,0 @@
-
- The Standard Environment
-
- The standard build environment in the Nix Packages collection provides an environment for building Unix packages that does a lot of common build tasks automatically. In fact, for Unix packages that use the standard ./configure; make; make install build interface, you don’t need to write a build script at all; the standard environment does everything automatically. If stdenv doesn’t do what you need automatically, you can easily customise or override the various build phases.
-
-
- Using <literal>stdenv</literal>
-
-
- To build a package with the standard environment, you use the function stdenv.mkDerivation, instead of the primitive built-in function derivation, e.g.
-
-stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- src = fetchurl {
- url = "http://example.org/libfoo-1.2.3.tar.bz2";
- sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m";
- };
-}
- (stdenv needs to be in scope, so if you write this in a separate Nix expression from pkgs/all-packages.nix, you need to pass it as a function argument.) Specifying a name and a src is the absolute minimum Nix requires. For convenience, you can also use pname and version attributes and mkDerivation will automatically set name to "${pname}-${version}" by default. Since RFC 0035, this is preferred for packages in Nixpkgs, as it allows us to reuse the version easily:
-
-stdenv.mkDerivation rec {
- pname = "libfoo";
- version = "1.2.3";
- src = fetchurl {
- url = "http://example.org/libfoo-source-${version}.tar.bz2";
- sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m";
- };
-}
-
-
-
- Many packages have dependencies that are not provided in the standard environment. It’s usually sufficient to specify those dependencies in the buildInputs attribute:
-
-stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- ...
- buildInputs = [libbar perl ncurses];
-}
- This attribute ensures that the bin subdirectories of these packages appear in the PATH environment variable during the build, that their include subdirectories are searched by the C compiler, and so on. (See for details.)
-
-
-
- Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of phases, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see .) For instance, a package that doesn’t supply a makefile but instead has to be compiled “manually” could be handled like this:
-
-stdenv.mkDerivation {
- name = "fnord-4.5";
- ...
- buildPhase = ''
- gcc foo.c -o foo
- '';
- installPhase = ''
- mkdir -p $out/bin
- cp foo $out/bin
- '';
-}
- (Note the use of ''-style string literals, which are very convenient for large multi-line script fragments because they don’t need escaping of " and \, and because indentation is intelligently removed.)
-
-
-
- There are many other attributes to customise the build. These are listed in .
-
-
-
- While the standard environment provides a generic builder, you can still supply your own build script:
-
-stdenv.mkDerivation {
- name = "libfoo-1.2.3";
- ...
- builder = ./builder.sh;
-}
- where the builder can do anything it wants, but typically starts with
-
-source $stdenv/setup
-
- to let stdenv set up the environment (e.g., process the buildInputs). If you want, you can still use stdenv’s generic builder:
-
-source $stdenv/setup
-
-buildPhase() {
- echo "... this is my custom build phase ..."
- gcc foo.c -o foo
-}
-
-installPhase() {
- mkdir -p $out/bin
- cp foo $out/bin
-}
-
-genericBuild
-
-
-
-
- Tools provided by <literal>stdenv</literal>
-
-
- The standard environment provides the following packages:
-
-
-
- The GNU C Compiler, configured with C and C++ support.
-
-
-
-
- GNU coreutils (contains a few dozen standard Unix commands).
-
-
-
-
- GNU findutils (contains find).
-
-
-
-
- GNU diffutils (contains diff, cmp).
-
-
-
-
- GNU sed.
-
-
-
-
- GNU grep.
-
-
-
-
- GNU awk.
-
-
-
-
- GNU tar.
-
-
-
-
- gzip, bzip2 and xz.
-
-
-
-
- GNU Make.
-
-
-
-
- Bash. This is the shell used for all builders in the Nix Packages collection. Not using /bin/sh removes a large source of portability problems.
-
-
-
-
- The patch command.
-
-
-
-
-
-
- On Linux, stdenv also includes the patchelf utility.
-
-
-
- Specifying dependencies
-
-
- As described in the Nix manual, almost any *.drv store path in a derivation's attribute set will induce a dependency on that derivation. mkDerivation, however, takes a few attributes intended to, between them, include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the PATH. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See for details.
-
-
-
- Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated. The platform distinctions are motivated by cross compilation; see for exactly what each platform means.
-
-
- The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always specified as interfaces, not concrete implementation.
-
-
- But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with strictDeps set it is mostly enforced even in the native case.
-
-
-
- The extension of PATH with dependencies, alluded to above, proceeds according to the relative platforms alone. The process is carried out only for dependencies whose host platform matches the new derivation's build platform i.e. dependencies which run on the platform where the new derivation will be built.
-
-
- Currently, this means for native builds all dependencies are put on the PATH. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the depsBuild* and nativeBuildInputs would be added to the PATH.
-
-
- For each dependency dep of those dependencies, dep/bin, if present, is added to the PATH environment variable.
-
-
-
- The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency.
-
-
-
- It is important to note that dependencies are not necessarily propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. The exact rules for dependency propagation can be given by assigning to each dependency two integers based one how its host and target platforms are offset from the depending derivation's platforms. Those offsets are given below in the descriptions of each dependency list attribute. Algorithmically, we traverse propagated inputs, accumulating every propagated dependency's propagated dependencies and adjusting them to account for the "shift in perspective" described by the current dependency's platform offsets. This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. We also prune transitive dependencies whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd.
-
-
-
- We can define the process precisely with Natural Deduction using the inference rules. This probably seems a bit obtuse, but so is the bash code that actually implements it!
-
-
- The findInputs function, currently residing in pkgs/stdenv/generic/setup.sh, implements the propagation logic.
-
-
- They're confusing in very different ways so... hopefully if something doesn't make sense in one presentation, it will in the other!
-
-let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
-
-propagated-dep(h0, t0, A, B)
-propagated-dep(h1, t1, B, C)
-h0 + h1 in {-1, 0, 1}
-h0 + t1 in {-1, 0, 1}
--------------------------------------- Transitive property
-propagated-dep(mapOffset(h0, t0, h1),
- mapOffset(h0, t0, t1),
- A, C)
-
-let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
-
-dep(h0, _, A, B)
-propagated-dep(h1, t1, B, C)
-h0 + h1 in {-1, 0, 1}
-h0 + t1 in {-1, 0, -1}
------------------------------ Take immediate dependencies' propagated dependencies
-propagated-dep(mapOffset(h0, t0, h1),
- mapOffset(h0, t0, t1),
- A, C)
-
-propagated-dep(h, t, A, B)
------------------------------ Propagated dependencies count as dependencies
-dep(h, t, A, B)
- Some explanation of this monstrosity is in order. In the common case, the target offset of a dependency is the successor to the target offset: t = h + 1. That means that:
-
-let f(h, t, i) = i + (if i <= 0 then h else t - 1)
-let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1)
-let f(h, h + 1, i) = i + (if i <= 0 then h else h)
-let f(h, h + 1, i) = i + h
-
- This is where "sum-like" comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn't add any new information.
-
-
-
- Because of the bounds checks, the uncommon cases are h = t and h + 2 = t. In the former case, the motivation for mapOffset is that since its host and target platforms are the same, no transitive dependency of it should be able to "discover" an offset greater than its reduced target offsets. mapOffset effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original h = t package. In the other case, h + 1 is skipped over between the host and target offsets. Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one.
-
-
-
- Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the depending package is unaware of. [One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn't know how to ask for. The platform description in that scenario is a kind of unforagable capability.] The offset bounds checking and definition of mapOffset together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency.
-
-
-
- Variables specifying dependencies
-
-
- depsBuildBuild
-
-
-
- A list of dependencies whose host and target platforms are the new derivation's build platform. This means a -1 host and -1 target offset from the new derivation's platforms. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in nativeBuildInputs instead. The most common use of this buildPackages.stdenv.cc, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries.
-
-
- Since these packages are able to be run at build-time, they are always added to the PATH, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future.
-
-
-
-
-
- nativeBuildInputs
-
-
-
- A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform. This means a -1 host offset and 0 target offset from the new derivation's platforms. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild or depsBuildTarget. This could be called depsBuildHost but nativeBuildInputs is used for historical continuity.
-
-
- Since these packages are able to be run at build-time, they are added to the PATH, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future.
-
-
-
-
-
- depsBuildTarget
-
-
-
- A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform. This means a -1 host offset and 1 target offset from the new derivation's platforms. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional.
-
-
- This is a somewhat confusing concept to wrap one’s head around, and for good reason. As the only dependency type where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage two away from the current one. It and its use-case go hand in hand and are both considered poor form: try to not need this sort of dependency, and try to avoid building standard libraries and runtimes in the same derivation as the compiler produces code using them. Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. In short, do not use this attribute unless you are packaging a compiler and are sure it is needed.
-
-
- Since these packages are able to run at build time, they are added to the PATH, as described above. But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. This isn't currently enforced, but could be in the future.
-
-
-
-
-
- depsHostHost
-
-
-
- A list of dependencies whose host and target platforms match the new derivation's host platform. This means a 0 host offset and 0 target offset from the new derivation's host platform. These are packages used at run-time to generate code also used at run-time. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It's always preferable to use a depsBuildBuild dependency in the derivation being built over a depsHostHost on the tool doing the building for this purpose.
-
-
-
-
-
- buildInputs
-
-
-
- A list of dependencies whose host platform and target platform match the new derivation's. This means a 0 host offset and a 1 target offset from the new derivation's host platform. This would be called depsHostTarget but for historical continuity. If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild.
-
-
- These are often programs and libraries used by the new derivation at run-time, but that isn't always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker.
-
-
-
-
-
- depsTargetTarget
-
-
-
- A list of dependencies whose host platform matches the new derivation's target platform. This means a 1 offset from the new derivation's platforms. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset]. Do not use this attribute unless you are packaging a compiler and are sure it is needed.
-
-
-
-
-
- depsBuildBuildPropagated
-
-
-
- The propagated equivalent of depsBuildBuild. This perhaps never ought to be used, but it is included for consistency [see below for the others].
-
-
-
-
-
- propagatedNativeBuildInputs
-
-
-
- The propagated equivalent of nativeBuildInputs. This would be called depsBuildHostPropagated but for historical continuity. For example, if package Y has propagatedNativeBuildInputs = [X], and package Z has buildInputs = [Y], then package Z will be built as if it included package X in its nativeBuildInputs. If instead, package Z has nativeBuildInputs = [Y], then Z will be built as if it included X in the depsBuildBuild of package Z, because of the sum of the two -1 host offsets.
-
-
-
-
-
- depsBuildTargetPropagated
-
-
-
- The propagated equivalent of depsBuildTarget. This is prefixed for the same reason of alerting potential users.
-
-
-
-
-
- depsHostHostPropagated
-
-
-
- The propagated equivalent of depsHostHost.
-
-
-
-
-
- propagatedBuildInputs
-
-
-
- The propagated equivalent of buildInputs. This would be called depsHostTargetPropagated but for historical continuity.
-
-
-
-
-
- depsTargetTargetPropagated
-
-
-
- The propagated equivalent of depsTargetTarget. This is prefixed for the same reason of alerting potential users.
-
-
-
-
-
-
- Attributes
-
-
- Variables affecting <literal>stdenv</literal> initialisation
-
-
- NIX_DEBUG
-
-
-
- A natural number indicating how much information to log. If set to 1 or higher, stdenv will print moderate debugging information during the build. In particular, the gcc and ld wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the stdenv setup script will be run with set -x tracing. If set to 7 or higher, the gcc and ld wrapper scripts will also be run with set -x tracing.
-
-
-
-
-
-
- Attributes affecting build properties
-
-
- enableParallelBuilding
-
-
-
- If set to true, stdenv will pass specific flags to make and other build tools to enable parallel building with up to build-cores workers.
-
-
- Unless set to false, some build systems with good support for parallel building including cmake, meson, and qmake will set it to true.
-
-
-
-
-
-
- Special variables
-
-
- passthru
-
-
-
- This is an attribute set which can be filled with arbitrary values. For example:
-
-passthru = {
- foo = "bar";
- baz = {
- value1 = 4;
- value2 = 5;
- };
-}
-
-
-
- Values inside it are not passed to the builder, so you can change them without triggering a rebuild. However, they can be accessed outside of a derivation directly, as if they were set inside a derivation itself, e.g. hello.baz.value1. We don't specify any usage or schema of passthru - it is meant for values that would be useful outside the derivation in other parts of a Nix expression (e.g. in other derivations). An example would be to convey some specific dependency of your derivation which contains a program with plugins support. Later, others who make derivations with plugins can use passed-through dependency to ensure that their plugin would be binary-compatible with built program.
-
-
-
-
-
- passthru.updateScript
-
-
-
- A script to be run by maintainers/scripts/update.nix when the package is matched. It needs to be an executable file, either on the file system:
-
-passthru.updateScript = ./update.sh;
-
- or inside the expression itself:
-
-passthru.updateScript = writeScript "update-zoom-us" ''
- #!/usr/bin/env nix-shell
- #!nix-shell -i bash -p curl pcre common-updater-scripts
-
- set -eu -o pipefail
-
- version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')"
- update-source-version zoom-us "$version"
-'';
-
- The attribute can also contain a list, a script followed by arguments to be passed to it:
-
-passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
-
- The script will be run with UPDATE_NIX_ATTR_PATH environment variable set to the attribute path it is supposed to update.
-
-
- The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running git commit or any other commands that cannot handle that.
-
-
-
-
- For information about how to run the updates, execute nix-shell maintainers/scripts/update.nix.
-
-
-
-
-
-
- Phases
-
-
- The generic builder has a number of phases. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm.
-
-
-
- Each phase can be overridden in its entirety either by setting the environment variable namePhase to a string containing some shell commands to be executed, or by redefining the shell function namePhase. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to add some commands to a phase, e.g. by defining postInstall or preFixup, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file pkgs/stdenv/generic/setup.sh.
-
-
-
- Controlling phases
-
-
- There are a number of variables that control what phases are executed and in what order:
-
- Variables affecting phase control
-
-
- phases
-
-
-
- Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is $prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases.
-
-
- Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as preInstallPhases), as you then don’t specify all the normal phases.
-
-
-
-
-
- prePhases
-
-
-
- Additional phases executed before any of the default phases.
-
-
-
-
-
- preConfigurePhases
-
-
-
- Additional phases executed just before the configure phase.
-
-
-
-
-
- preBuildPhases
-
-
-
- Additional phases executed just before the build phase.
-
-
-
-
-
- preInstallPhases
-
-
-
- Additional phases executed just before the install phase.
-
-
-
-
-
- preFixupPhases
-
-
-
- Additional phases executed just before the fixup phase.
-
-
-
-
-
- preDistPhases
-
-
-
- Additional phases executed just before the distribution phase.
-
-
-
-
-
- postPhases
-
-
-
- Additional phases executed after any of the default phases.
-
-
-
-
-
-
-
-
- The unpack phase
-
-
- The unpack phase is responsible for unpacking the source code of the package. The default implementation of unpackPhase unpacks the source files listed in the src environment variable to the current directory. It supports the following files by default:
-
-
-
- Tar files
-
-
-
- These can optionally be compressed using gzip (.tar.gz, .tgz or .tar.Z), bzip2 (.tar.bz2, .tbz2 or .tbz) or xz (.tar.xz, .tar.lzma or .txz).
-
-
-
-
-
- Zip files
-
-
-
- Zip files are unpacked using unzip. However, unzip is not in the standard environment, so you should add it to nativeBuildInputs yourself.
-
-
-
-
-
- Directories in the Nix store
-
-
-
- These are simply copied to the current directory. The hash part of the file name is stripped, e.g. /nix/store/1wydxgby13cz...-my-sources would be copied to my-sources.
-
-
-
-
- Additional file types can be supported by setting the unpackCmd variable (see below).
-
-
-
-
-
- Variables controlling the unpack phase
-
-
- srcs / src
-
-
-
- The list of source files or directories to be unpacked or copied. One of these must be set.
-
-
-
-
-
- sourceRoot
-
-
-
- After running unpackPhase, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set sourceRoot to the name of the intended directory.
-
-
-
-
-
- setSourceRoot
-
-
-
- Alternatively to setting sourceRoot, you can set setSourceRoot to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set sourceRoot.
-
-
-
-
-
- preUnpack
-
-
-
- Hook executed at the start of the unpack phase.
-
-
-
-
-
- postUnpack
-
-
-
- Hook executed at the end of the unpack phase.
-
-
-
-
-
- dontUnpack
-
-
-
- Set to true to skip the unpack phase.
-
-
-
-
-
- dontMakeSourcesWritable
-
-
-
- If set to 1, the unpacked sources are not made writable. By default, they are made writable to prevent problems with read-only sources. For example, copied store directories would be read-only without this.
-
-
-
-
-
- unpackCmd
-
-
-
- The unpack phase evaluates the string $unpackCmd for any unrecognised file. The path to the current source file is contained in the curSrc variable.
-
-
-
-
-
-
-
- The patch phase
-
-
- The patch phase applies the list of patches defined in the patches variable.
-
-
-
- Variables controlling the patch phase
-
-
- dontPatch
-
-
-
- Set to true to skip the patch phase.
-
-
-
-
-
- patches
-
-
-
- The list of patches. They must be in the format accepted by the patch command, and may optionally be compressed using gzip (.gz), bzip2 (.bz2) or xz (.xz).
-
-
-
-
-
- patchFlags
-
-
-
- Flags to be passed to patch. If not set, the argument is used, which causes the leading directory component to be stripped from the file names in each patch.
-
-
-
-
-
- prePatch
-
-
-
- Hook executed at the start of the patch phase.
-
-
-
-
-
- postPatch
-
-
-
- Hook executed at the end of the patch phase.
-
-
-
-
-
-
-
- The configure phase
-
-
- The configure phase prepares the source tree for building. The default configurePhase runs ./configure (typically an Autoconf-generated script) if it exists.
-
-
-
- Variables controlling the configure phase
-
-
- configureScript
-
-
-
- The name of the configure script. It defaults to ./configure if it exists; otherwise, the configure phase is skipped. This can actually be a command (like perl ./Configure.pl).
-
-
-
-
-
- configureFlags
-
-
-
- A list of strings passed as additional arguments to the configure script.
-
-
-
-
-
- dontConfigure
-
-
-
- Set to true to skip the configure phase.
-
-
-
-
-
- configureFlagsArray
-
-
-
- A shell array containing additional arguments passed to the configure script. You must use this instead of configureFlags if the arguments contain spaces.
-
-
-
-
-
- dontAddPrefix
-
-
-
- By default, the flag --prefix=$prefix is added to the configure flags. If this is undesirable, set this variable to true.
-
-
-
-
-
- prefix
-
-
-
- The prefix under which the package must be installed, passed via the option to the configure script. It defaults to .
-
-
-
-
-
- prefixKey
-
-
-
- The key to use when specifying the prefix. By default, this is set to as that is used by the majority of packages.
-
-
-
-
-
- dontAddDisableDepTrack
-
-
-
- By default, the flag --disable-dependency-tracking is added to the configure flags to speed up Automake-based builds. If this is undesirable, set this variable to true.
-
-
-
-
-
- dontFixLibtool
-
-
-
- By default, the configure phase applies some special hackery to all files called ltmain.sh before running the configure script in order to improve the purity of Libtool-based packages
-
-
- It clears the sys_lib_*search_path variables in the Libtool script to prevent Libtool from using libraries in /usr/lib and such.
-
-
- . If this is undesirable, set this variable to true.
-
-
-
-
-
- dontDisableStatic
-
-
-
- By default, when the configure script has , the option is added to the configure flags.
-
-
- If this is undesirable, set this variable to true.
-
-
-
-
-
- configurePlatforms
-
-
-
- By default, when cross compiling, the configure script has and passed. Packages can instead pass [ "build" "host" "target" ] or a subset to control exactly which platform flags are passed. Compilers and other tools can use this to also pass the target platform.
-
-
- Eventually these will be passed building natively as well, to improve determinism: build-time guessing, as is done today, is a risk of impurity.
-
-
-
-
-
-
-
- preConfigure
-
-
-
- Hook executed at the start of the configure phase.
-
-
-
-
-
- postConfigure
-
-
-
- Hook executed at the end of the configure phase.
-
-
-
-
-
-
-
- The build phase
-
-
- The build phase is responsible for actually building the package (e.g. compiling it). The default buildPhase simply calls make if a file named Makefile, makefile or GNUmakefile exists in the current directory (or the makefile is explicitly set); otherwise it does nothing.
-
-
-
- Variables controlling the build phase
-
-
- dontBuild
-
-
-
- Set to true to skip the build phase.
-
-
-
-
-
- makefile
-
-
-
- The file name of the Makefile.
-
-
-
-
-
- makeFlags
-
-
-
- A list of strings passed as additional flags to make. These flags are also used by the default install and check phase. For setting make flags specific to the build phase, use buildFlags (see below).
-
-makeFlags = [ "PREFIX=$(out)" ];
-
-
-
- The flags are quoted in bash, but environment variables can be specified by using the make syntax.
-
-
-
-
-
-
-
- makeFlagsArray
-
-
-
- A shell array containing additional arguments passed to make. You must use this instead of makeFlags if the arguments contain spaces, e.g.
-
-preBuild = ''
- makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
-'';
-
- Note that shell arrays cannot be passed through environment variables, so you cannot set makeFlagsArray in a derivation attribute (because those are passed through environment variables): you have to define them in shell code.
-
-
-
-
-
- buildFlags / buildFlagsArray
-
-
-
- A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the build phase.
-
-
-
-
-
- preBuild
-
-
-
- Hook executed at the start of the build phase.
-
-
-
-
-
- postBuild
-
-
-
- Hook executed at the end of the build phase.
-
-
-
-
-
-
- You can set flags for make through the makeFlags variable.
-
-
-
- Before and after running make, the hooks preBuild and postBuild are called, respectively.
-
-
-
-
- The check phase
-
-
- The check phase checks whether the package was built correctly by running its test suite. The default checkPhase calls make check, but only if the doCheck variable is enabled.
-
-
-
- Variables controlling the check phase
-
-
- doCheck
-
-
-
- Controls whether the check phase is executed. By default it is skipped, but if doCheck is set to true, the check phase is usually executed. Thus you should set
-doCheck = true;
- in the derivation to enable checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how doCheck is set, as the newly-built program won't run on the platform used to build it.
-
-
-
-
-
- makeFlags / makeFlagsArray / makefile
-
-
-
- See the build phase for details.
-
-
-
-
-
- checkTarget
-
-
-
- The make target that runs the tests. Defaults to check.
-
-
-
-
-
- checkFlags / checkFlagsArray
-
-
-
- A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the check phase.
-
-
-
-
-
- checkInputs
-
-
-
- A list of dependencies used by the phase. This gets included in nativeBuildInputs when doCheck is set.
-
-
-
-
-
- preCheck
-
-
-
- Hook executed at the start of the check phase.
-
-
-
-
-
- postCheck
-
-
-
- Hook executed at the end of the check phase.
-
-
-
-
-
-
-
- The install phase
-
-
- The install phase is responsible for installing the package in the Nix store under out. The default installPhase creates the directory $out and calls make install.
-
-
-
- Variables controlling the install phase
-
-
- dontInstall
-
-
-
- Set to true to skip the install phase.
-
-
-
-
-
- makeFlags / makeFlagsArray / makefile
-
-
-
- See the build phase for details.
-
-
-
-
-
- installTargets
-
-
-
- The make targets that perform the installation. Defaults to install. Example:
-
-installTargets = "install-bin install-doc";
-
-
-
-
-
- installFlags / installFlagsArray
-
-
-
- A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the install phase.
-
-
-
-
-
- preInstall
-
-
-
- Hook executed at the start of the install phase.
-
-
-
-
-
- postInstall
-
-
-
- Hook executed at the end of the install phase.
-
-
-
-
-
-
-
- The fixup phase
-
-
- The fixup phase performs some (Nix-specific) post-processing actions on the files installed under $out by the install phase. The default fixupPhase does the following:
-
-
-
- It moves the man/, doc/ and info/ subdirectories of $out to share/.
-
-
-
-
- It strips libraries and executables of debug information.
-
-
-
-
- On Linux, it applies the patchelf command to ELF executables and libraries to remove unused directories from the RPATH in order to prevent unnecessary runtime dependencies.
-
-
-
-
- It rewrites the interpreter paths of shell scripts to paths found in PATH. E.g., /usr/bin/perl will be rewritten to /nix/store/some-perl/bin/perl found in PATH.
-
-
-
-
-
-
- Variables controlling the fixup phase
-
-
- dontFixup
-
-
-
- Set to true to skip the fixup phase.
-
-
-
-
-
- dontStrip
-
-
-
- If set, libraries and executables are not stripped. By default, they are.
-
-
-
-
-
- dontStripHost
-
-
-
- Like dontStrip, but only affects the strip command targetting the package's host platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
-
-
-
-
-
- dontStripTarget
-
-
-
- Like dontStrip, but only affects the strip command targetting the packages' target platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
-
-
-
-
-
- dontMoveSbin
-
-
-
- If set, files in $out/sbin are not moved to $out/bin. By default, they are.
-
-
-
-
-
- stripAllList
-
-
-
- List of directories to search for libraries and executables from which all symbols should be stripped. By default, it’s empty. Stripping all symbols is risky, since it may remove not just debug symbols but also ELF information necessary for normal execution.
-
-
-
-
-
- stripAllFlags
-
-
-
- Flags passed to the strip command applied to the files in the directories listed in stripAllList. Defaults to (i.e. ).
-
-
-
-
-
- stripDebugList
-
-
-
- List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to lib lib32 lib64 libexec bin sbin.
-
-
-
-
-
- stripDebugFlags
-
-
-
- Flags passed to the strip command applied to the files in the directories listed in stripDebugList. Defaults to (i.e. ).
-
-
-
-
-
- dontPatchELF
-
-
-
- If set, the patchelf command is not used to remove unnecessary RPATH entries. Only applies to Linux.
-
-
-
-
-
- dontPatchShebangs
-
-
-
- If set, scripts starting with #! do not have their interpreter paths rewritten to paths in the Nix store.
-
-
-
-
-
- dontPruneLibtoolFiles
-
-
-
- If set, libtool .la files associated with shared libraries won't have their dependency_libs field cleared.
-
-
-
-
-
- forceShare
-
-
-
- The list of directories that must be moved from $out to $out/share. Defaults to man doc info.
-
-
-
-
-
- setupHook
-
-
-
- A package can export a setup hook by setting this variable. The setup hook, if defined, is copied to $out/nix-support/setup-hook. Environment variables are then substituted in it using substituteAll.
-
-
-
-
-
- preFixup
-
-
-
- Hook executed at the start of the fixup phase.
-
-
-
-
-
- postFixup
-
-
-
- Hook executed at the end of the fixup phase.
-
-
-
-
-
- separateDebugInfo
-
-
-
- If set to true, the standard environment will enable debug information in C/C++ builds. After installation, the debug information will be separated from the executables and stored in the output named debug. (This output is enabled automatically; you don’t need to set the outputs attribute explicitly.) To be precise, the debug information is stored in debug/lib/debug/.build-id/XX/YYYY…, where XXYYYY… is the build ID of the binary — a SHA-1 hash of the contents of the binary. Debuggers like GDB use the build ID to look up the separated debug information.
-
-
- For example, with GDB, you can add
-
-set debug-file-directory ~/.nix-profile/lib/debug
-
- to ~/.gdbinit. GDB will then be able to find debug information installed via nix-env -i.
-
-
-
-
-
-
-
- The installCheck phase
-
-
- The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default installCheck calls make installcheck.
-
-
-
- Variables controlling the installCheck phase
-
-
- doInstallCheck
-
-
-
- Controls whether the installCheck phase is executed. By default it is skipped, but if doInstallCheck is set to true, the installCheck phase is usually executed. Thus you should set
-doInstallCheck = true;
- in the derivation to enable install checks. The exception is cross compilation. Cross compiled builds never run tests, no matter how doInstallCheck is set, as the newly-built program won't run on the platform used to build it.
-
-
-
-
-
- installCheckTarget
-
-
-
- The make target that runs the install tests. Defaults to installcheck.
-
-
-
-
-
- installCheckFlags / installCheckFlagsArray
-
-
-
- A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the installCheck phase.
-
-
-
-
-
- installCheckInputs
-
-
-
- A list of dependencies used by the phase. This gets included in nativeBuildInputs when doInstallCheck is set.
-
-
-
-
-
- preInstallCheck
-
-
-
- Hook executed at the start of the installCheck phase.
-
-
-
-
-
- postInstallCheck
-
-
-
- Hook executed at the end of the installCheck phase.
-
-
-
-
-
-
-
- The distribution phase
-
-
- The distribution phase is intended to produce a source distribution of the package. The default distPhase first calls make dist, then it copies the resulting source tarballs to $out/tarballs/. This phase is only executed if the attribute doDist is set.
-
-
-
- Variables controlling the distribution phase
-
-
- distTarget
-
-
-
- The make target that produces the distribution. Defaults to dist.
-
-
-
-
-
- distFlags / distFlagsArray
-
-
-
- Additional flags passed to make.
-
-
-
-
-
- tarballs
-
-
-
- The names of the source distribution files to be copied to $out/tarballs/. It can contain shell wildcards. The default is *.tar.gz.
-
-
-
-
-
- dontCopyDist
-
-
-
- If set, no files are copied to $out/tarballs/.
-
-
-
-
-
- preDist
-
-
-
- Hook executed at the start of the distribution phase.
-
-
-
-
-
- postDist
-
-
-
- Hook executed at the end of the distribution phase.
-
-
-
-
-
-
-
- Shell functions
-
-
- The standard environment provides a number of useful functions.
-
-
-
-
-
- makeWrapper executable wrapperfile args
-
-
-
- Constructs a wrapper for a program with various possible arguments. For example:
-
-# adds `FOOBAR=baz` to `$out/bin/foo`’s environment
-makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz
-
-# prefixes the binary paths of `hello` and `git`
-# Be advised that paths often should be patched in directly
-# (via string replacements or in `configurePhase`).
-makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]}
-
- There’s many more kinds of arguments, they are documented in nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh.
-
-
- wrapProgram is a convenience function you probably want to use most of the time.
-
-
-
-
-
- substitute infile outfile subs
-
-
-
- Performs string substitution on the contents of infile, writing the result to outfile. The substitutions in subs are of the following form:
-
-
-
- s1 s2
-
-
-
- Replace every occurrence of the string s1 by s2.
-
-
-
-
-
- varName
-
-
-
- Replace every occurrence of @varName@ by the contents of the environment variable varName. This is useful for generating files from templates, using @...@ in the template as placeholders.
-
-
-
-
-
- varName s
-
-
-
- Replace every occurrence of @varName@ by the string s.
-
-
-
-
-
-
- Example:
-
-substitute ./foo.in ./foo.out \
- --replace /usr/bin/bar $bar/bin/bar \
- --replace "a string containing spaces" "some other text" \
- --subst-var someVar
-
-
-
-
-
-
- substituteInPlace file subs
-
-
-
- Like substitute, but performs the substitutions in place on the file file.
-
-
-
-
-
- substituteAll infile outfile
-
-
-
- Replaces every occurrence of @varName@, where varName is any environment variable, in infile, writing the result to outfile. For instance, if infile has the contents
-
-#! @bash@/bin/sh
-PATH=@coreutils@/bin
-echo @foo@
-
- and the environment contains bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39 and coreutils=/nix/store/68afga4khv0w...-coreutils-6.12, but does not contain the variable foo, then the output will be
-
-#! /nix/store/bmwp0q28cf21...-bash-3.2-p39/bin/sh
-PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin
-echo @foo@
-
- That is, no substitution is performed for undefined variables.
-
-
- Environment variables that start with an uppercase letter or an underscore are filtered out, to prevent global variables (like HOME) or private variables (like __ETC_PROFILE_DONE) from accidentally getting substituted. The variables also have to be valid bash “names”, as defined in the bash manpage (alphanumeric or _, must not start with a number).
-
-
-
-
-
- substituteAllInPlace file
-
-
-
- Like substituteAll, but performs the substitutions in place on the file file.
-
-
-
-
-
- stripHash path
-
-
-
- Strips the directory and hash part of a store path, outputting the name part to stdout. For example:
-
-# prints coreutils-8.24
-stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
-
- If you wish to store the result in another variable, then the following idiom may be useful:
-
-name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
-someVar=$(stripHash $name)
-
-
-
-
-
-
- wrapProgram executable makeWrapperArgs
-
-
-
- Convenience function for makeWrapper that automatically creates a sane wrapper file. It takes all the same arguments as makeWrapper, except for --argv0.
-
-
- It cannot be applied multiple times, since it will overwrite the wrapper file.
-
-
-
-
-
-
- Package setup hooks
-
-
- Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used.
-
-
-
- In order to alleviate this burden, the setup hook mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed.
-
-
-
- The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn't without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the letter isn't. For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so.
-
-
-
- The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of envBuildBuildHooks, envBuildHostHooks, envBuildTargetHooks, envHostHostHooks, envHostTargetHooks, or envTargetTargetHooks. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).
-
-
-
- Packages adding a hook should not hard code a specific hook, but rather choose a variable relative to how they are included. Returning to the C compiler wrapper example, if the wrapper itself is an n dependency, then it only wants to accumulate flags from n + 1 dependencies, as only those ones match the compiler's target platform. The hostOffset variable is defined with the current dependency's host offset targetOffset with its target offset, before its setup hook is sourced. Additionally, since most environment hooks don't care about the target platform, that means the setup hook can append to the right bash array by doing something like
-
-addEnvHooks "$hostOffset" myBashFunction
-
-
-
-
- The existence of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time.
-
-
-
- First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using stdenv.mkDerivation. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa.
-
-
-
- move-docs.sh
-
-
-
- This setup hook moves any installed documentation to the /share subdirectory directory. This includes the man, doc and info directories. This is needed for legacy programs that do not know how to use the share subdirectory.
-
-
-
-
-
- compress-man-pages.sh
-
-
-
- This setup hook compresses any man pages that have been installed. The compression is done using the gzip program. This helps to reduce the installed size of packages.
-
-
-
-
-
- strip.sh
-
-
-
- This runs the strip command on installed binaries and libraries. This removes unnecessary information like debug symbols when they are not needed. This also helps to reduce the installed size of packages.
-
-
-
-
-
- patch-shebangs.sh
-
-
-
- This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g #!/bin/bash). In Nix, we want an exact path to that interpreter to be used. This often replaces /bin/sh with a path in the Nix store.
-
-
-
-
-
- audit-tmpdir.sh
-
-
-
- This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only.
-
-
-
-
-
- multiple-outputs.sh
-
-
-
- This setup hook adds configure flags that tell packages to install files into any one of the proper outputs listed in outputs. This behavior can be turned off by setting setOutputFlags to false in the derivation environment. See for more information.
-
-
-
-
-
- move-sbin.sh
-
-
-
- This setup hook moves any binaries installed in the sbin subdirectory into bin. In addition, a link is provided from sbin to bin for compatibility.
-
-
-
-
-
- move-lib64.sh
-
-
-
- This setup hook moves any libraries installed in the lib64 subdirectory into lib. In addition, a link is provided from lib64 to lib for compatibility.
-
-
-
-
-
- move-systemd-user-units.sh
-
-
-
- This setup hook moves any systemd user units installed in the lib subdirectory into share. In addition, a link is provided from share to lib for compatibility. This is needed for systemd to find user services when installed into the user profile.
-
-
-
-
-
- set-source-date-epoch-to-latest.sh
-
-
-
- This sets SOURCE_DATE_EPOCH to the modification time of the most recent file.
-
-
-
-
-
- Bintools Wrapper
-
-
-
- The Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.] Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the Bintools Wrapper. Packages typically depend on CC Wrapper, which in turn (at run time) depends on the Bintools Wrapper.
-
-
- The Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. For example, it shouldn't care about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. It is currently accomplished by collecting directories of host-platform dependencies (i.e. buildInputs and nativeBuildInputs) in environment variables. The Bintools Wrapper's setup hook causes any lib and lib64 subdirectories to be added to NIX_LDFLAGS. Since the CC Wrapper and the Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to the CC Wrapper. But the CC Wrapper's code, by contrast, has quite lengthy comments. The Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync.
-
-
- A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables fulfill which purpose. They are defined to just be the base name of the tools, under the assumption that the Bintools Wrapper's binaries will be on the path. Firstly, this helps poorly-written packages, e.g. ones that look for just gcc when CC isn't defined yet clang is to be used. Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use.
-
-
- Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms.
-
-
- BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for additional Bintools Wrappers, properly disambiguating them.
-
-
- A problem with this final task is that the Bintools Wrapper is honest and defines LD as ld. Most packages, however, firstly use the C compiler for linking, secondly use LD anyways, defining it as the C compiler, and thirdly, only so define LD when it is undefined as a fallback. This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use. The workaround is to define, just for the problematic package, LD as the C compiler. A good way to do this would be preConfigure = "LD=$CC".
-
-
-
-
-
- CC Wrapper
-
-
-
- The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by the CC Wrapper. Packages typically depend on the CC Wrapper, which in turn (at run-time) depends on the Bintools Wrapper.
-
-
- Dependency finding is undoubtedly the main task of the CC Wrapper. This works just like the Bintools Wrapper, except that any include subdirectory of any relevant dependency is added to NIX_CFLAGS_COMPILE. The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
-
-
- Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard environment variables with the names of the tools it wraps, for the same reasons described above. Importantly, while it includes a cc symlink to the c compiler for portability, the CC will be defined using the compiler's "real name" (i.e. gcc or clang). This helps lousy build systems that inspect on the name of the compiler rather than run it.
-
-
-
-
-
-
-
- Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses.
-
-
-
- Perl
-
-
-
- Adds the lib/site_perl subdirectory of each build input to the PERL5LIB environment variable. For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable.
-
-
-
-
-
- Python
-
-
-
- Adds the lib/${python.libPrefix}/site-packages subdirectory of each build input to the PYTHONPATH environment variable.
-
-
-
-
-
- pkg-config
-
-
-
- Adds the lib/pkgconfig and share/pkgconfig subdirectories of each build input to the PKG_CONFIG_PATH environment variable.
-
-
-
-
-
- Automake
-
-
-
- Adds the share/aclocal subdirectory of each build input to the ACLOCAL_PATH environment variable.
-
-
-
-
-
- Autoconf
-
-
-
- The autoreconfHook derivation adds autoreconfPhase, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts.
-
-
-
-
-
- libxml2
-
-
-
- Adds every file named catalog.xml found under the xml/dtd and xml/xsl subdirectories of each build input to the XML_CATALOG_FILES environment variable.
-
-
-
-
-
- teTeX / TeX Live
-
-
-
- Adds the share/texmf-nix subdirectory of each build input to the TEXINPUTS environment variable.
-
-
-
-
-
- Qt 4
-
-
-
- Sets the QTDIR environment variable to Qt’s path.
-
-
-
-
-
- gdk-pixbuf
-
-
-
- Exports GDK_PIXBUF_MODULE_FILE environment variable to the builder. Add librsvg package to buildInputs to get svg support. See also the setup hook description in GNOME platform docs.
-
-
-
-
-
- GHC
-
-
-
- Creates a temporary package database and registers every Haskell build input in it (TODO: how?).
-
-
-
-
-
- GNOME platform
-
-
-
- Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in .
-
-
-
-
-
- autoPatchelfHook
-
-
-
- This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given buildInputs and nativeBuildInputs.
-
-
- You can also specify a runtimeDependencies variable which lists dependencies to be unconditionally added to rpath of all executables. This is useful for programs that use
- dlopen
- 3 to load libraries at runtime.
-
-
- In certain situations you may want to run the main command (autoPatchelf) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the dontAutoPatchelf environment variable to a non-empty value.
-
-
- By default autoPatchelf will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the autoPatchelfIgnoreMissingDeps environment variable to a non-empty value.
-
-
- The autoPatchelf command also recognizes a --no-recurse command line flag, which prevents it from recursing into subdirectories.
-
-
-
-
-
- breakpointHook
-
-
-
- This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the cntr command. Upon build error it will print instructions on how to use cntr, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At /var/lib/cntr the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. cntr is only supported on Linux-based platforms. To use it first add cntr to your environment.systemPackages on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add breakpointHook to nativeBuildInputs.
-
-nativeBuildInputs = [ breakpointHook ];
-
- When a build failure happens there will be an instruction printed that shows how to attach with cntr to the build sandbox.
-
-
- Caution with remote builds
-
- This won't work with remote builds as the build environment is on a different machine and can't be accessed by cntr. Remote builds can be turned off by setting --option builders '' for nix-build or --builders '' for nix build.
-
-
-
-
-
-
- installShellFiles
-
-
-
- This hook helps with installing manpages and shell completion files. It exposes 2 shell functions installManPage and installShellCompletion that can be used from your postInstall hook.
-
-
- The installManPage function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with .gz suffix). This function will place them into the correct directory.
-
-
- The installShellCompletion function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of --bash, --fish, or --zsh. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag --name NAME before the path. If this flag is not provided, zsh completions will be renamed automatically such that foobar.zsh becomes _foobar. A root name may be provided for all paths using the flag --cmd NAME; this synthesizes the appropriate name depending on the shell (e.g. --cmd foo will synthesize the name foo.bash for bash and _foo for zsh). The path may also be a fifo or named fd (such as produced by <(cmd)), in which case the shell and name must be provided.
-
-nativeBuildInputs = [ installShellFiles ];
-postInstall = ''
- installManPage doc/foobar.1 doc/barfoo.3
- # explicit behavior
- installShellCompletion --bash --name foobar.bash share/completions.bash
- installShellCompletion --fish --name foobar.fish share/completions.fish
- installShellCompletion --zsh --name _foobar share/completions.zsh
- # implicit behavior
- installShellCompletion share/completions/foobar.{bash,fish,zsh}
- # using named fd
- installShellCompletion --cmd foobar \
- --bash <($out/bin/foobar --bash-completion) \
- --fish <($out/bin/foobar --fish-completion) \
- --zsh <($out/bin/foobar --zsh-completion)
-'';
-
-
-
-
-
-
- libiconv, libintl
-
-
-
- A few libraries automatically add to NIX_LDFLAGS their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set dontAddExtraLibs.
-
-
-
-
-
- validatePkgConfig
-
-
-
- The validatePkgConfig hook validates all pkg-config (.pc) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables.
-
-
-
-
-
- cmake
-
-
-
- Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to CMAKE_PREFIX_PATH so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting configurePhase to a custom value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator.
-
-
-
-
-
- xcbuildHook
-
-
-
- Overrides the build and install phases to run the “xcbuild” command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild.
-
-
-
-
-
- Meson
-
-
-
- Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, enableParallelBuilding is enabled as Meson supports parallel building almost everywhere.
-
-
- Variables controlling Meson
-
-
- mesonFlags
-
-
-
- Controls the flags passed to meson.
-
-
-
-
-
- mesonBuildType
-
-
-
- Which --buildtype to pass to Meson. We default to plain.
-
-
-
-
-
- mesonAutoFeatures
-
-
-
- What value to set -Dauto_features= to. We default to enabled.
-
-
-
-
-
- mesonWrapMode
-
-
-
- What value to set -Dwrap_mode= to. We default to nodownload as we disallow network access.
-
-
-
-
-
- dontUseMesonConfigure
-
-
-
- Disables using Meson's configurePhase.
-
-
-
-
-
-
-
-
- ninja
-
-
-
- Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the dontUseNinjaBuild, dontUseNinjaInstall, and dontUseNinjaCheck, respectively. Parallel building is enabled by default in Ninja.
-
-
-
-
-
- unzip
-
-
-
- This setup hook will allow you to unzip .zip files specified in $src. There are many similar packages like unrar, undmg, etc.
-
-
-
-
-
- wafHook
-
-
-
- Overrides the configure, build, and install phases. This will run the "waf" script used by many projects. If wafPath (default ./waf) doesn’t exist, it will copy the version of waf available in Nixpkgs. wafFlags can be used to pass flags to the waf script.
-
-
-
-
-
- scons
-
-
-
- Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time.
-
-
-
-
-
-
-
- Purity in Nixpkgs
-
-
- [measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them]
-
-
-
- GCC doesn't search in locations such as /usr/include. In fact, attempts to add such directories through the flag are filtered out. Likewise, the linker (from GNU binutils) doesn't search in standard locations such as /usr/lib. Programs built on Linux are linked against a GNU C Library that likewise doesn't search in the default system locations.
-
-
-
- Hardening in Nixpkgs
-
-
- There are flags available to harden packages at compile or link-time. These can be toggled using the stdenv.mkDerivation parameters hardeningDisable and hardeningEnable.
-
-
-
- Both parameters take a list of flags as strings. The special "all" flag can be passed to hardeningDisable to turn off all hardening. These flags can also be used as environment variables for testing or development purposes.
-
-
-
- The following flags are enabled by default and might require disabling with hardeningDisable if the program to package is incompatible.
-
-
-
-
-
- format
-
-
-
- Adds the compiler options. At present, this warns about calls to printf and scanf functions where the format string is not a string literal and there are no format arguments, as in printf(foo);. This may be a security hole if the format string came from untrusted input and contains %n.
-
-
- This needs to be turned off or fixed for errors similar to:
-
-
-/tmp/nix-build-zynaddsubfx-2.5.2.drv-0/zynaddsubfx-2.5.2/src/UI/guimain.cpp:571:28: error: format not a string literal and no format arguments [-Werror=format-security]
- printf(help_message);
- ^
-cc1plus: some warnings being treated as errors
-
-
-
-
-
- stackprotector
-
-
-
- Adds the compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application).
-
-
- This needs to be turned off or fixed for errors similar to:
-
-
-bin/blib.a(bios_console.o): In function `bios_handle_cup':
-/tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail'
-
-
-
-
-
- fortify
-
-
-
- Adds the compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain '%n' are blocked. If an application depends on such a format string, it will need to be worked around.
-
-
- Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set to .
-
-
- This needs to be turned off or fixed for errors similar to:
-
-
-malloc.c:404:15: error: return type is an incomplete type
-malloc.c:410:19: error: storage size of 'ms' isn't known
-
-
-strdup.h:22:1: error: expected identifier or '(' before '__extension__'
-
-
-strsep.c:65:23: error: register name not specified for 'delim'
-
-
-installwatch.c:3751:5: error: conflicting types for '__open_2'
-
-
-fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments
-
-
-
-
-
- pic
-
-
-
- Adds the compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible.
-
-
- Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won't build with PIC enabled. The compiler will is most cases complain that PIC is not supported for a specific build.
-
-
- This needs to be turned off or fixed for assembler errors similar to:
-
-
-ccbLfRgg.s: Assembler messages:
-ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF'
-
-
-
-
-
- strictoverflow
-
-
-
- Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option makes gcc behave as if signed integer overflows were defined.
-
-
- This flag should not trigger any build or runtime errors.
-
-
-
-
-
- relro
-
-
-
- Adds the linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable.
-
-
- This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the bindnow flag must also be disabled and incompatible programs typically fail with similar errors at runtime.
-
-
-
-
-
- bindnow
-
-
-
- Adds the linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to relro). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn't be an issue for daemons.
-
-
- This flag can break dynamic shared object loading. For instance, the module systems of Xorg and PHP are incompatible with this flag. Programs incompatible with this flag often fail at runtime due to missing symbols, like:
-
-
-intel_drv.so: undefined symbol: vgaHWFreeHWRec
-
-
-
-
-
-
- The following flags are disabled by default and should be enabled with hardeningEnable for packages that take untrusted input like network services.
-
-
-
-
-
- pie
-
-
-
- Adds the compiler and linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the pic flag, so they gain ASLR automatically, but binary .text regions need to be build with pie to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack.
-
-
-
-
-
-
- For more in-depth information on these hardening flags and hardening in general, refer to the Debian Wiki, Ubuntu Wiki, Gentoo Wiki, and the Arch Wiki.
-
-
-
diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml
index 1def8b069555..8f12aad2adad 100644
--- a/doc/using/overlays.xml
+++ b/doc/using/overlays.xml
@@ -230,7 +230,7 @@ self: super:
- For BLAS/LAPACK switching to work correctly, all packages must depend on blas or lapack. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions versions of BLAS/LAPACK currently in the wild, LP64 (integer size = 32 bits) and ILP64 (integer size = 64 bits). Some software needs special flags or patches to work with ILP64. You can check if ILP64 is used in Nixpkgs with blas.isILP64 and lapack.isILP64. Some software does NOT work with ILP64, and derivations need to specify an assertion to prevent this. You can prevent ILP64 from being used with the following:
+ For BLAS/LAPACK switching to work correctly, all packages must depend on blas or lapack. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, LP64 (integer size = 32 bits) and ILP64 (integer size = 64 bits). Some software needs special flags or patches to work with ILP64. You can check if ILP64 is used in Nixpkgs with blas.isILP64 and lapack.isILP64. Some software does NOT work with ILP64, and derivations need to specify an assertion to prevent this. You can prevent ILP64 from being used with the following:
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 993783db3ed6..46ac0443a03f 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -603,6 +603,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
+ odbl = spdx {
+ spdxId = "ODbL-1.0";
+ fullName = "Open Data Commons Open Database License v1.0";
+ };
+
ofl = spdx {
spdxId = "OFL-1.1";
fullName = "SIL Open Font License 1.1";
diff --git a/lib/modules.nix b/lib/modules.nix
index 33a0d84a6d7f..d3f10944e708 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -361,6 +361,17 @@ rec {
*/
byName = attr: f: modules:
foldl' (acc: module:
+ if !(builtins.isAttrs module.${attr}) then
+ throw ''
+ You're trying to declare a value of type `${builtins.typeOf module.${attr}}'
+ rather than an attribute-set for the option
+ `${builtins.concatStringsSep "." prefix}'!
+
+ This usually happens if `${builtins.concatStringsSep "." prefix}' has option
+ definitions inside that are not matched. Please check how to properly define
+ this option by e.g. referring to `man 5 configuration.nix'!
+ ''
+ else
acc // (mapAttrs (n: v:
(acc.${n} or []) ++ f module v
) module.${attr}
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 1bbe976c4d21..1e38dbf531b1 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -107,6 +107,11 @@ rec {
powerpc64le = "ppc64le";
}.${final.parsed.cpu.name} or final.parsed.cpu.name;
+ darwinArch = {
+ armv7a = "armv7";
+ aarch64 = "arm64";
+ }.${final.parsed.cpu.name} or final.parsed.cpu.name;
+
emulator = pkgs: let
qemu-user = pkgs.qemu.override {
smartcardSupport = false;
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 3bf90cd0cafb..f46e9c826a5c 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -303,14 +303,12 @@ rec {
preferBuiltin = true;
target = "zImage";
extraConfig = ''
- # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
+ # Serial port for Raspberry Pi 3. Wasn't included in ARMv7 defconfig
+ # until 4.17.
SERIAL_8250_BCM2835AUX y
SERIAL_8250_EXTENDED y
SERIAL_8250_SHARE_IRQ y
- # Fix broken sunxi-sid nvmem driver.
- TI_CPTS y
-
# Hangs ODROID-XU4
ARM_BIG_LITTLE_CPUIDLE n
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index f843d303e440..2eddeec07b1a 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -169,7 +169,7 @@ checkConfigOutput "foo" config.submodule.foo ./declare-submoduleWith-special.nix
## shorthandOnlyDefines config behaves as expected
checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix
-checkConfigError 'value is a boolean while a set was expected' config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
+checkConfigError "You're trying to declare a value of type \`bool'\nrather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
## submoduleWith should merge all modules in one swoop
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a9bf9e61f97b..6d048f208784 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -746,6 +746,12 @@
githubId = 1296771;
name = "Anders Riutta";
};
+ armijnhemel = {
+ email = "armijn@tjaldur.nl";
+ github = "armijnhemel";
+ githubId = 10587952;
+ name = "Armijn Hemel";
+ };
arnarg = {
email = "arnarg@fastmail.com";
github = "arnarg";
@@ -1859,6 +1865,12 @@
fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C";
}];
};
+ collares = {
+ email = "mauricio@collares.org";
+ github = "collares";
+ githubId = 244239;
+ name = "Mauricio Collares";
+ };
copumpkin = {
email = "pumpkingod@gmail.com";
github = "copumpkin";
@@ -2889,6 +2901,12 @@
githubId = 3787281;
name = "Erik Rybakken";
};
+ erin = {
+ name = "Erin van der Veen";
+ email = "erin@erinvanderveen.nl";
+ github = "ErinvanderVeen";
+ githubId = 10973664;
+ };
erosennin = {
email = "ag@sologoc.com";
github = "erosennin";
@@ -2924,7 +2942,7 @@
name = "Adam Copp";
};
ethancedwards8 = {
- email = "ethancarteredwards@gmail.com";
+ email = "ethan@ethancedwards.com";
github = "ethancedwards8";
githubId = 60861925;
name = "Ethan Carter Edwards";
@@ -3181,6 +3199,12 @@
githubId = 19961516;
name = "Felix Weilbach";
};
+ fliegendewurst = {
+ email = "arne.keller@posteo.de";
+ github = "FliegendeWurst";
+ githubId = 12560461;
+ name = "Arne Keller";
+ };
flokli = {
email = "flokli@flokli.de";
github = "flokli";
@@ -3615,6 +3639,12 @@
githubId = 343415;
name = "Greg Roodt";
};
+ gtrunsec = {
+ email = "gtrunsec@hardenedlinux.org";
+ github = "GTrunSec";
+ githubId = 21156405;
+ name = "GuangTao Zhang";
+ };
guibou = {
email = "guillaum.bouchard@gmail.com";
github = "guibou";
@@ -3991,6 +4021,12 @@
githubId = 61913481;
name = "Mat Marini";
};
+ illustris = {
+ email = "me@illustris.tech";
+ github = "illustris";
+ githubId = 3948275;
+ name = "Harikrishnan R";
+ };
ilya-fedin = {
email = "fedin-ilja2010@ya.ru";
github = "ilya-fedin";
@@ -4147,6 +4183,12 @@
github = "j0hax";
githubId = 3802620;
};
+ j4m3s = {
+ name = "James Landrein";
+ email = "github@j4m3s.eu";
+ github = "j4m3s-s";
+ githubId = 9413812;
+ };
jacg = {
name = "Jacek Generowicz";
email = "jacg@my-post-office.net";
@@ -4171,6 +4213,12 @@
githubId = 175537;
name = "Johannes Lötzsch";
};
+ jackgerrits = {
+ email = "jack@jackgerrits.com";
+ github = "jackgerrits";
+ githubId = 7558482;
+ name = "Jack Gerrits";
+ };
jagajaga = {
email = "ars.seroka@gmail.com";
github = "jagajaga";
@@ -5524,6 +5572,12 @@
githubId = 7622248;
name = "Sebastian Zivota";
};
+ locallycompact = {
+ email = "dan.firth@homotopic.tech";
+ github = "locallycompact";
+ githubId = 1267527;
+ name = "Daniel Firth";
+ };
lopsided98 = {
email = "benwolsieffer@gmail.com";
github = "lopsided98";
@@ -6289,6 +6343,12 @@
githubId = 1776903;
name = "Andrew Abbott";
};
+ mitchmindtree = {
+ email = "mail@mitchellnordine.com";
+ github = "mitchmindtree";
+ githubId = 4587373;
+ name = "Mitchell Nordine";
+ };
mjanczyk = {
email = "m@dragonvr.pl";
github = "mjanczyk";
@@ -6743,6 +6803,12 @@
githubId = 1488603;
name = "François Espinet";
};
+ neverbehave = {
+ email = "i@never.pet";
+ github = "NeverBehave";
+ githubId = 17120571;
+ name = "Xinhao Luo";
+ };
nikitavoloboev = {
email = "nikita.voloboev@gmail.com";
github = "nikitavoloboev";
@@ -6839,6 +6905,12 @@
githubId = 16385648;
name = "Niko Pavlinek";
};
+ nixinator = {
+ email = "33lockdown33@protonmail.com";
+ github = "nixinator";
+ githubId = 66913205;
+ name = "Rick Sanchez";
+ };
nixy = {
email = "nixy@nixy.moe";
github = "nixy";
@@ -6981,6 +7053,12 @@
githubId = 3359345;
name = "obadz";
};
+ obsidian-systems-maintenance = {
+ name = "Obsidian Systems Maintenance";
+ email = "maintainer@obsidian.systems";
+ github = "obsidian-systems-maintenance";
+ githubId = 80847921;
+ };
odi = {
email = "oliver.dunkl@gmail.com";
github = "odi";
@@ -9761,6 +9839,16 @@
githubId = 16151097;
name = "Valentin Gehrke";
};
+ tuxinaut = {
+ email = "trash4you@tuxinaut.de";
+ github = "tuxinaut";
+ githubId = 722482;
+ name = "Denny Schäfer";
+ keys = [{
+ longkeyid = "rsa4096/0xB057455D1E567270";
+ fingerprint = "C752 0E49 4D92 1740 D263 C467 B057 455D 1E56 7270";
+ }];
+ };
tv = {
email = "tv@krebsco.de";
github = "4z3";
@@ -10104,6 +10192,12 @@
email = "vq@erq.se";
name = "Daniel Nilsson";
};
+ vrinek = {
+ email = "vrinek@hey.com";
+ github = "vrinek";
+ name = "Kostas Karachalios";
+ githubId = 81346;
+ };
vrthra = {
email = "rahul@gopinath.org";
github = "vrthra";
@@ -10156,6 +10250,12 @@
email = "kirill.wedens@gmail.com";
name = "wedens";
};
+ weihua = {
+ email = "luwh364@gmail.com";
+ github = "weihua-lu";
+ githubId = 9002575;
+ name = "Weihua Lu";
+ };
wheelsandmetal = {
email = "jakob@schmutz.co.uk";
github = "wheelsandmetal";
@@ -10712,6 +10812,12 @@
githubId = 3674056;
name = "Asad Saeeduddin";
};
+ matthewcroughan = {
+ email = "matt@croughan.sh";
+ github = "matthewcroughan";
+ githubId = 26458780;
+ name = "Matthew Croughan";
+ };
ngerstle = {
name = "Nicholas Gerstle";
email = "ngerstle@gmail.com";
diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py
new file mode 100644
index 000000000000..9ac1ccffb789
--- /dev/null
+++ b/maintainers/scripts/pluginupdate.py
@@ -0,0 +1,526 @@
+# Used by pkgs/misc/vim-plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py
+
+# format:
+# $ nix run nixpkgs.python3Packages.black -c black update.py
+# type-check:
+# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py
+# linted:
+# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py
+
+import argparse
+import functools
+import http
+import json
+import os
+import subprocess
+import sys
+import time
+import traceback
+import urllib.error
+import urllib.parse
+import urllib.request
+import xml.etree.ElementTree as ET
+from datetime import datetime
+from functools import wraps
+from multiprocessing.dummy import Pool
+from pathlib import Path
+from typing import Dict, List, Optional, Tuple, Union, Any, Callable
+from urllib.parse import urljoin, urlparse
+from tempfile import NamedTemporaryFile
+
+import git
+
+ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here
+ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # "
+ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # "
+
+
+def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2):
+ """Retry calling the decorated function using an exponential backoff.
+ http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/
+ original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry
+ (BSD licensed)
+ :param ExceptionToCheck: the exception on which to retry
+ :param tries: number of times to try (not retry) before giving up
+ :param delay: initial delay between retries in seconds
+ :param backoff: backoff multiplier e.g. value of 2 will double the delay
+ each retry
+ """
+
+ def deco_retry(f: Callable) -> Callable:
+ @wraps(f)
+ def f_retry(*args: Any, **kwargs: Any) -> Any:
+ mtries, mdelay = tries, delay
+ while mtries > 1:
+ try:
+ return f(*args, **kwargs)
+ except ExceptionToCheck as e:
+ print(f"{str(e)}, Retrying in {mdelay} seconds...")
+ time.sleep(mdelay)
+ mtries -= 1
+ mdelay *= backoff
+ return f(*args, **kwargs)
+
+ return f_retry # true decorator
+
+ return deco_retry
+
+
+def make_request(url: str) -> urllib.request.Request:
+ token = os.getenv("GITHUB_API_TOKEN")
+ headers = {}
+ if token is not None:
+ headers["Authorization"] = f"token {token}"
+ return urllib.request.Request(url, headers=headers)
+
+
+class Repo:
+ def __init__(
+ self, owner: str, name: str, branch: str, alias: Optional[str]
+ ) -> None:
+ self.owner = owner
+ self.name = name
+ self.branch = branch
+ self.alias = alias
+ self.redirect: Dict[str, str] = {}
+
+ def url(self, path: str) -> str:
+ return urljoin(f"https://github.com/{self.owner}/{self.name}/", path)
+
+ def __repr__(self) -> str:
+ return f"Repo({self.owner}, {self.name})"
+
+ @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
+ def has_submodules(self) -> bool:
+ try:
+ req = make_request(self.url(f"blob/{self.branch}/.gitmodules"))
+ urllib.request.urlopen(req, timeout=10).close()
+ except urllib.error.HTTPError as e:
+ if e.code == 404:
+ return False
+ else:
+ raise
+ return True
+
+ @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
+ def latest_commit(self) -> Tuple[str, datetime]:
+ commit_url = self.url(f"commits/{self.branch}.atom")
+ commit_req = make_request(commit_url)
+ with urllib.request.urlopen(commit_req, timeout=10) as req:
+ self.check_for_redirect(commit_url, req)
+ xml = req.read()
+ root = ET.fromstring(xml)
+ latest_entry = root.find(ATOM_ENTRY)
+ assert latest_entry is not None, f"No commits found in repository {self}"
+ commit_link = latest_entry.find(ATOM_LINK)
+ assert commit_link is not None, f"No link tag found feed entry {xml}"
+ url = urlparse(commit_link.get("href"))
+ updated_tag = latest_entry.find(ATOM_UPDATED)
+ assert (
+ updated_tag is not None and updated_tag.text is not None
+ ), f"No updated tag found feed entry {xml}"
+ updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ")
+ return Path(str(url.path)).name, updated
+
+ def check_for_redirect(self, url: str, req: http.client.HTTPResponse):
+ response_url = req.geturl()
+ if url != response_url:
+ new_owner, new_name = (
+ urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]
+ )
+ end_line = "\n" if self.alias is None else f" as {self.alias}\n"
+ plugin_line = "{owner}/{name}" + end_line
+
+ old_plugin = plugin_line.format(owner=self.owner, name=self.name)
+ new_plugin = plugin_line.format(owner=new_owner, name=new_name)
+ self.redirect[old_plugin] = new_plugin
+
+ def prefetch_git(self, ref: str) -> str:
+ data = subprocess.check_output(
+ ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref]
+ )
+ return json.loads(data)["sha256"]
+
+ def prefetch_github(self, ref: str) -> str:
+ data = subprocess.check_output(
+ ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]
+ )
+ return data.strip().decode("utf-8")
+
+
+class Plugin:
+ def __init__(
+ self,
+ name: str,
+ commit: str,
+ has_submodules: bool,
+ sha256: str,
+ date: Optional[datetime] = None,
+ ) -> None:
+ self.name = name
+ self.commit = commit
+ self.has_submodules = has_submodules
+ self.sha256 = sha256
+ self.date = date
+
+ @property
+ def normalized_name(self) -> str:
+ return self.name.replace(".", "-")
+
+ @property
+ def version(self) -> str:
+ assert self.date is not None
+ return self.date.strftime("%Y-%m-%d")
+
+ def as_json(self) -> Dict[str, str]:
+ copy = self.__dict__.copy()
+ del copy["date"]
+ return copy
+
+
+class Editor:
+ """The configuration of the update script."""
+
+ def __init__(
+ self,
+ name: str,
+ root: Path,
+ get_plugins: str,
+ generate_nix: Callable[[List[Tuple[str, str, Plugin]], str], None],
+ default_in: Optional[Path] = None,
+ default_out: Optional[Path] = None,
+ deprecated: Optional[Path] = None,
+ cache_file: Optional[str] = None,
+ ):
+ self.name = name
+ self.root = root
+ self.get_plugins = get_plugins
+ self.generate_nix = generate_nix
+ self.default_in = default_in or root.joinpath(f"{name}-plugin-names")
+ self.default_out = default_out or root.joinpath("generated.nix")
+ self.deprecated = deprecated or root.joinpath("deprecated.json")
+ self.cache_file = cache_file or f"{name}-plugin-cache.json"
+
+
+class CleanEnvironment(object):
+ def __enter__(self) -> None:
+ self.old_environ = os.environ.copy()
+ local_pkgs = str(Path(__file__).parent.parent.parent)
+ os.environ["NIX_PATH"] = f"localpkgs={local_pkgs}"
+ self.empty_config = NamedTemporaryFile()
+ self.empty_config.write(b"{}")
+ self.empty_config.flush()
+ os.environ["NIXPKGS_CONFIG"] = self.empty_config.name
+
+ def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
+ os.environ.update(self.old_environ)
+ self.empty_config.close()
+
+
+def get_current_plugins(editor: Editor) -> List[Plugin]:
+ with CleanEnvironment():
+ out = subprocess.check_output(["nix", "eval", "--json", editor.get_plugins])
+ data = json.loads(out)
+ plugins = []
+ for name, attr in data.items():
+ p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
+ plugins.append(p)
+ return plugins
+
+
+def prefetch_plugin(
+ user: str,
+ repo_name: str,
+ branch: str,
+ alias: Optional[str],
+ cache: "Optional[Cache]" = None,
+) -> Tuple[Plugin, Dict[str, str]]:
+ repo = Repo(user, repo_name, branch, alias)
+ commit, date = repo.latest_commit()
+ has_submodules = repo.has_submodules()
+ cached_plugin = cache[commit] if cache else None
+ if cached_plugin is not None:
+ cached_plugin.name = alias or repo_name
+ cached_plugin.date = date
+ return cached_plugin, repo.redirect
+
+ print(f"prefetch {user}/{repo_name}")
+ if has_submodules:
+ sha256 = repo.prefetch_git(commit)
+ else:
+ sha256 = repo.prefetch_github(commit)
+
+ return (
+ Plugin(alias or repo_name, commit, has_submodules, sha256, date=date),
+ repo.redirect,
+ )
+
+
+def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin:
+ plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line))
+ return plugin
+
+
+def print_download_error(plugin: str, ex: Exception):
+ print(f"{plugin}: {ex}", file=sys.stderr)
+ ex_traceback = ex.__traceback__
+ tb_lines = [
+ line.rstrip("\n")
+ for line in traceback.format_exception(ex.__class__, ex, ex_traceback)
+ ]
+ print("\n".join(tb_lines))
+
+
+def check_results(
+ results: List[Tuple[str, str, Union[Exception, Plugin], Dict[str, str]]]
+) -> Tuple[List[Tuple[str, str, Plugin]], Dict[str, str]]:
+ failures: List[Tuple[str, Exception]] = []
+ plugins = []
+ redirects: Dict[str, str] = {}
+ for (owner, name, result, redirect) in results:
+ if isinstance(result, Exception):
+ failures.append((name, result))
+ else:
+ plugins.append((owner, name, result))
+ redirects.update(redirect)
+
+ print(f"{len(results) - len(failures)} plugins were checked", end="")
+ if len(failures) == 0:
+ print()
+ return plugins, redirects
+ else:
+ print(f", {len(failures)} plugin(s) could not be downloaded:\n")
+
+ for (plugin, exception) in failures:
+ print_download_error(plugin, exception)
+
+ sys.exit(1)
+
+
+def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]:
+ branch = "master"
+ alias = None
+ name, repo = line.split("/")
+ if " as " in repo:
+ repo, alias = repo.split(" as ")
+ alias = alias.strip()
+ if "@" in repo:
+ repo, branch = repo.split("@")
+
+ return (name.strip(), repo.strip(), branch.strip(), alias)
+
+
+def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]:
+ plugins = []
+ with open(plugin_file) as f:
+ for line in f:
+ plugin = parse_plugin_line(line)
+ if not plugin[0]:
+ msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]"
+ print(msg, file=sys.stderr)
+ sys.exit(1)
+ plugins.append(plugin)
+ return plugins
+
+
+def get_cache_path(cache_file_name: str) -> Optional[Path]:
+ xdg_cache = os.environ.get("XDG_CACHE_HOME", None)
+ if xdg_cache is None:
+ home = os.environ.get("HOME", None)
+ if home is None:
+ return None
+ xdg_cache = str(Path(home, ".cache"))
+
+ return Path(xdg_cache, cache_file_name)
+
+
+class Cache:
+ def __init__(self, initial_plugins: List[Plugin], cache_file_name: str) -> None:
+ self.cache_file = get_cache_path(cache_file_name)
+
+ downloads = {}
+ for plugin in initial_plugins:
+ downloads[plugin.commit] = plugin
+ downloads.update(self.load())
+ self.downloads = downloads
+
+ def load(self) -> Dict[str, Plugin]:
+ if self.cache_file is None or not self.cache_file.exists():
+ return {}
+
+ downloads: Dict[str, Plugin] = {}
+ with open(self.cache_file) as f:
+ data = json.load(f)
+ for attr in data.values():
+ p = Plugin(
+ attr["name"], attr["commit"], attr["has_submodules"], attr["sha256"]
+ )
+ downloads[attr["commit"]] = p
+ return downloads
+
+ def store(self) -> None:
+ if self.cache_file is None:
+ return
+
+ os.makedirs(self.cache_file.parent, exist_ok=True)
+ with open(self.cache_file, "w+") as f:
+ data = {}
+ for name, attr in self.downloads.items():
+ data[name] = attr.as_json()
+ json.dump(data, f, indent=4, sort_keys=True)
+
+ def __getitem__(self, key: str) -> Optional[Plugin]:
+ return self.downloads.get(key, None)
+
+ def __setitem__(self, key: str, value: Plugin) -> None:
+ self.downloads[key] = value
+
+
+def prefetch(
+ args: Tuple[str, str, str, Optional[str]], cache: Cache
+) -> Tuple[str, str, Union[Exception, Plugin], dict]:
+ assert len(args) == 4
+ owner, repo, branch, alias = args
+ try:
+ plugin, redirect = prefetch_plugin(owner, repo, branch, alias, cache)
+ cache[plugin.commit] = plugin
+ return (owner, repo, plugin, redirect)
+ except Exception as e:
+ return (owner, repo, e, {})
+
+
+def rewrite_input(
+ input_file: Path,
+ deprecated: Path,
+ redirects: Dict[str, str] = None,
+ append: Tuple = (),
+):
+ with open(input_file, "r") as f:
+ lines = f.readlines()
+
+ lines.extend(append)
+
+ if redirects:
+ lines = [redirects.get(line, line) for line in lines]
+
+ cur_date_iso = datetime.now().strftime("%Y-%m-%d")
+ with open(deprecated, "r") as f:
+ deprecations = json.load(f)
+ for old, new in redirects.items():
+ old_plugin = fetch_plugin_from_pluginline(old)
+ new_plugin = fetch_plugin_from_pluginline(new)
+ if old_plugin.normalized_name != new_plugin.normalized_name:
+ deprecations[old_plugin.normalized_name] = {
+ "new": new_plugin.normalized_name,
+ "date": cur_date_iso,
+ }
+ with open(deprecated, "w") as f:
+ json.dump(deprecations, f, indent=4, sort_keys=True)
+
+ lines = sorted(lines, key=str.casefold)
+
+ with open(input_file, "w") as f:
+ f.writelines(lines)
+
+
+def parse_args(editor: Editor):
+ parser = argparse.ArgumentParser(
+ description=(
+ f"Updates nix derivations for {editor.name} plugins"
+ f"By default from {editor.default_in} to {editor.default_out}"
+ )
+ )
+ parser.add_argument(
+ "--add",
+ dest="add_plugins",
+ default=[],
+ action="append",
+ help=f"Plugin to add to {editor.name}Plugins from Github in the form owner/repo",
+ )
+ parser.add_argument(
+ "--input-names",
+ "-i",
+ dest="input_file",
+ default=editor.default_in,
+ help="A list of plugins in the form owner/repo",
+ )
+ parser.add_argument(
+ "--out",
+ "-o",
+ dest="outfile",
+ default=editor.default_out,
+ help="Filename to save generated nix code",
+ )
+ parser.add_argument(
+ "--proc",
+ "-p",
+ dest="proc",
+ type=int,
+ default=30,
+ help="Number of concurrent processes to spawn.",
+ )
+ return parser.parse_args()
+
+
+def commit(repo: git.Repo, message: str, files: List[Path]) -> None:
+ repo.index.add([str(f.resolve()) for f in files])
+
+ if repo.index.diff("HEAD"):
+ print(f'committing to nixpkgs "{message}"')
+ repo.index.commit(message)
+ else:
+ print("no changes in working tree to commit")
+
+
+def get_update(input_file: str, outfile: str, proc: int, editor: Editor):
+ cache: Cache = Cache(get_current_plugins(editor), editor.cache_file)
+ _prefetch = functools.partial(prefetch, cache=cache)
+
+ def update() -> dict:
+ plugin_names = load_plugin_spec(input_file)
+
+ try:
+ pool = Pool(processes=proc)
+ results = pool.map(_prefetch, plugin_names)
+ finally:
+ cache.store()
+
+ plugins, redirects = check_results(results)
+
+ editor.generate_nix(plugins, outfile)
+
+ return redirects
+
+ return update
+
+
+def update_plugins(editor: Editor):
+ """The main entry function of this module. All input arguments are grouped in the `Editor`."""
+
+ args = parse_args(editor)
+ nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)
+ update = get_update(args.input_file, args.outfile, args.proc, editor)
+
+ redirects = update()
+ rewrite_input(args.input_file, editor.deprecated, redirects)
+ commit(nixpkgs_repo, f"{editor.name}Plugins: update", [args.outfile])
+
+ if redirects:
+ update()
+ commit(
+ nixpkgs_repo,
+ f"{editor.name}Plugins: resolve github repository redirects",
+ [args.outfile, args.input_file, editor.deprecated],
+ )
+
+ for plugin_line in args.add_plugins:
+ rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",))
+ update()
+ plugin = fetch_plugin_from_pluginline(plugin_line)
+ commit(
+ nixpkgs_repo,
+ "{editor}Plugins.{name}: init at {version}".format(
+ editor=editor.name, name=plugin.normalized_name, version=plugin.version
+ ),
+ [args.outfile, args.input_file],
+ )
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7d778a8ae30c..8acf68ac3af1 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -82,6 +82,7 @@ with lib.maintainers; {
jtojnar
worldofpeace
dasj19
+ maxeaubrey
];
scope = "Maintain GNOME desktop environment and platform.";
};
@@ -96,6 +97,18 @@ with lib.maintainers; {
scope = "Maintain Jitsi.";
};
+ kodi = {
+ members = [
+ aanderse
+ cpages
+ edwtjo
+ minijackson
+ peterhoeg
+ sephalon
+ ];
+ scope = "Maintain Kodi and related packages.";
+ };
+
matrix = {
members = [
ma27
@@ -134,6 +147,7 @@ with lib.maintainers; {
timokau
omasanori
raskin
+ collares
];
scope = "Maintain SageMath and the dependencies that are likely to break it.";
};
diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
index b86a76005753..b2b6481b20c7 100644
--- a/nixos/doc/manual/Makefile
+++ b/nixos/doc/manual/Makefile
@@ -1,5 +1,5 @@
.PHONY: all
-all: manual-combined.xml format
+all: manual-combined.xml
.PHONY: debug
debug: generated manual-combined.xml
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
index 405a50a9e430..d8654d71ac00 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.xml
+++ b/nixos/doc/manual/configuration/luks-file-systems.xml
@@ -26,7 +26,11 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: ***
# mkfs.ext4 /dev/mapper/crypted
- To ensure that this file system is automatically mounted at boot time as
+ The LUKS volume should be automatically picked up by
+ nixos-generate-config, but you might want to verify that your
+ hardware-configuration.nix looks correct.
+
+ To manually ensure that the system is automatically mounted at boot time as
/, add the following to
configuration.nix:
diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml
index 32e00544ceff..89fab6665616 100644
--- a/nixos/doc/manual/development/writing-documentation.xml
+++ b/nixos/doc/manual/development/writing-documentation.xml
@@ -25,7 +25,8 @@
$ cd /path/to/nixpkgs/nixos/doc/manual
-$ make
+$ nix-shell
+nix-shell$ make
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index bedeb7ccfa8e..02f6bd6bed4e 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -374,7 +374,7 @@
You may want to look at the options starting with
and
-
+
as well.
diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml
index 218bb3ae309d..b7947293c012 100644
--- a/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/nixos/doc/manual/release-notes/rl-2105.xml
@@ -720,8 +720,8 @@ environment.systemPackages = [
- Aditionally to the much stricter runtime environmet the
- /dev/urandom mount lines we previously had in the code (that would
+ Additionally to the much stricter runtime environment the
+ /dev/urandom mount lines we previously had in the code (that
randomly failed during the stop-phase) have been removed as systemd will take care of those for us.
@@ -809,7 +809,7 @@ environment.systemPackages = [
Platforms, like stdenv.hostPlatform, no longer have a platform attribute.
- It has been (mostly) flattoned away:
+ It has been (mostly) flattened away:
platform.gcc is now gcc
diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh
index 77cc64e591e9..0eec4d041108 100755
--- a/nixos/maintainers/scripts/gce/create-gce.sh
+++ b/nixos/maintainers/scripts/gce/create-gce.sh
@@ -17,7 +17,19 @@ nix-build '' \
img_path=$(echo gce/*.tar.gz)
img_name=${IMAGE_NAME:-$(basename "$img_path")}
img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g')
+img_family=$(echo "$img_id" | cut -d - -f1-4)
+
if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then
gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name"
gsutil acl ch -u AllUsers:R "gs://${BUCKET_NAME}/$img_name"
+
+ gcloud compute images create \
+ "$img_id" \
+ --source-uri "gs://${BUCKET_NAME}/$img_name" \
+ --family="$img_family"
+
+ gcloud compute images add-iam-policy-binding \
+ "$img_id" \
+ --member='allAuthenticatedUsers' \
+ --role='roles/compute.imageUser'
fi
diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index 44040217b027..bef08dc40207 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -288,7 +288,7 @@ foreach my $u (values %usersOut) {
push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n";
}
-updateFile("/etc/shadow", \@shadowNew, 0600);
+updateFile("/etc/shadow", \@shadowNew, 0640);
{
my $uid = getpwnam "root";
my $gid = getgrnam "shadow";
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index d81d6c6cb9b8..c88cc6930614 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -98,7 +98,7 @@ in
See "Multiple-output packages" chapter in the nixpkgs manual for more info.
'';
- # which is at ../../../doc/multiple-output.xml
+ # which is at ../../../doc/multiple-output.chapter.md
};
man.enable = mkOption {
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index be3f4cbbcfe4..1410e33342a6 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -47,9 +47,9 @@ in
doc = mkOption {
type = docFile;
internal = true;
- example = "./meta.xml";
+ example = "./meta.chapter.xml";
description = ''
- Documentation prologe for the set of options of each module. This
+ Documentation prologue for the set of options of each module. This
option should be defined at most once per module.
'';
};
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3a1907ee201e..4a63a09ab846 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -155,6 +155,7 @@
./programs/nm-applet.nix
./programs/npm.nix
./programs/oblogout.nix
+ ./programs/partition-manager.nix
./programs/plotinus.nix
./programs/proxychains.nix
./programs/qt5ct.nix
@@ -177,6 +178,7 @@
./programs/tmux.nix
./programs/traceroute.nix
./programs/tsm-client.nix
+ ./programs/turbovnc.nix
./programs/udevil.nix
./programs/usbtop.nix
./programs/vim.nix
@@ -680,6 +682,7 @@
./services/networking/i2p.nix
./services/networking/icecream/scheduler.nix
./services/networking/icecream/daemon.nix
+ ./services/networking/inspircd.nix
./services/networking/iodine.nix
./services/networking/iperf3.nix
./services/networking/ircd-hybrid/default.nix
@@ -882,6 +885,7 @@
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
+ ./services/web-apps/bookstack.nix
./services/web-apps/convos.nix
./services/web-apps/cryptpad.nix
./services/web-apps/documize.nix
diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix
index 75b3e707d576..09cb6030e661 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixos/modules/programs/less.nix
@@ -40,7 +40,7 @@ in
configFile = mkOption {
type = types.nullOr types.path;
default = null;
- example = literalExample "$${pkgs.my-configs}/lesskey";
+ example = literalExample "\${pkgs.my-configs}/lesskey";
description = ''
Path to lesskey configuration file.
diff --git a/nixos/modules/programs/partition-manager.nix b/nixos/modules/programs/partition-manager.nix
new file mode 100644
index 000000000000..1be2f0a69a11
--- /dev/null
+++ b/nixos/modules/programs/partition-manager.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ meta.maintainers = [ maintainers.oxalica ];
+
+ ###### interface
+ options = {
+ programs.partition-manager.enable = mkEnableOption "KDE Partition Manager";
+ };
+
+ ###### implementation
+ config = mkIf config.programs.partition-manager.enable {
+ services.dbus.packages = [ pkgs.libsForQt5.kpmcore ];
+ # `kpmcore` need to be installed to pull in polkit actions.
+ environment.systemPackages = [ pkgs.libsForQt5.kpmcore pkgs.partition-manager ];
+ };
+}
diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 038d76c6c921..107e783c0c21 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -90,7 +90,7 @@ in {
rxvt-unicode # For backward compatibility (old default terminal)
];
defaultText = literalExample ''
- with pkgs; [ swaylock swayidle xwayland rxvt-unicode dmenu ];
+ with pkgs; [ swaylock swayidle rxvt-unicode alacritty dmenu ];
'';
example = literalExample ''
with pkgs; [
diff --git a/nixos/modules/programs/turbovnc.nix b/nixos/modules/programs/turbovnc.nix
new file mode 100644
index 000000000000..e6f8836aa367
--- /dev/null
+++ b/nixos/modules/programs/turbovnc.nix
@@ -0,0 +1,54 @@
+# Global configuration for the SSH client.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.turbovnc;
+in
+{
+ options = {
+
+ programs.turbovnc = {
+
+ ensureHeadlessSoftwareOpenGL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to set up NixOS such that TurboVNC's built-in software OpenGL
+ implementation works.
+
+ This will enable so that OpenGL
+ programs can find Mesa's llvmpipe drivers.
+
+ Setting this option to false does not mean that software
+ OpenGL won't work; it may still work depending on your system
+ configuration.
+
+ This option is also intended to generate warnings if you are using some
+ configuration that's incompatible with using headless software OpenGL
+ in TurboVNC.
+ '';
+ };
+
+ };
+
+ };
+
+ config = mkIf cfg.ensureHeadlessSoftwareOpenGL {
+
+ # TurboVNC has builtin support for Mesa llvmpipe's `swrast`
+ # software rendering to implemnt GLX (OpenGL on Xorg).
+ # However, just building TurboVNC with support for that is not enough
+ # (it only takes care of the X server side part of OpenGL);
+ # the indiviudual applications (e.g. `glxgears`) also need to directly load
+ # the OpenGL libs.
+ # Thus, this creates `/run/opengl-driver` populated by Mesa so that the applications
+ # can find the llvmpipe `swrast.so` software rendering DRI lib via `libglvnd`.
+ # This comment exists to explain why `hardware.` is involved,
+ # even though 100% software rendering is used.
+ hardware.opengl.enable = true;
+
+ };
+}
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index c33a92580d4c..eb3599b924d7 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -24,7 +24,7 @@ let
Type = "oneshot";
User = "acme";
Group = mkDefault "acme";
- UMask = 0023;
+ UMask = 0022;
StateDirectoryMode = 750;
ProtectSystem = "full";
PrivateTmp = true;
@@ -235,7 +235,7 @@ let
# https://github.com/NixOS/nixpkgs/pull/81371#issuecomment-605526099
wantedBy = optionals (!config.boot.isContainer) [ "multi-user.target" ];
- path = with pkgs; [ lego coreutils diffutils ];
+ path = with pkgs; [ lego coreutils diffutils openssl ];
serviceConfig = commonServiceConfig // {
Group = data.group;
@@ -274,10 +274,44 @@ let
script = ''
set -euxo pipefail
+ # This reimplements the expiration date check, but without querying
+ # the acme server first. By doing this offline, we avoid errors
+ # when the network or DNS are unavailable, which can happen during
+ # nixos-rebuild switch.
+ is_expiration_skippable() {
+ pem=$1
+
+ # This function relies on set -e to exit early if any of the
+ # conditions or programs fail.
+
+ [[ -e $pem ]]
+
+ expiration_line="$(
+ set -euxo pipefail
+ openssl x509 -noout -enddate <$pem \
+ | grep notAfter \
+ | sed -e 's/^notAfter=//'
+ )"
+ [[ -n "$expiration_line" ]]
+
+ expiration_date="$(date -d "$expiration_line" +%s)"
+ now="$(date +%s)"
+ expiration_s=$[expiration_date - now]
+ expiration_days=$[expiration_s / (3600 * 24)] # rounds down
+
+ [[ $expiration_days -gt ${toString cfg.validMinDays} ]]
+ }
+
${optionalString (data.webroot != null) ''
- # Ensure the webroot exists
- mkdir -p '${data.webroot}/.well-known/acme-challenge'
- chown 'acme:${data.group}' ${data.webroot}/{.well-known,.well-known/acme-challenge}
+ # Ensure the webroot exists. Fixing group is required in case configuration was changed between runs.
+ # Lego will fail if the webroot does not exist at all.
+ (
+ mkdir -p '${data.webroot}/.well-known/acme-challenge' \
+ && chgrp '${data.group}' ${data.webroot}/.well-known/acme-challenge
+ ) || (
+ echo 'Please ensure ${data.webroot}/.well-known/acme-challenge exists and is writable by acme:${data.group}' \
+ && exit 1
+ )
''}
echo '${domainHash}' > domainhash.txt
@@ -288,8 +322,14 @@ let
# When domains are updated, there's no need to do a full
# Lego run, but it's likely renew won't work if days is too low.
if [ -e certificates/domainhash.txt ] && cmp -s domainhash.txt certificates/domainhash.txt; then
- lego ${renewOpts} --days ${toString cfg.validMinDays}
+ if is_expiration_skippable out/full.pem; then
+ echo 1>&2 "nixos-acme: skipping renewal because expiration isn't within the coming ${toString cfg.validMinDays} days"
+ else
+ echo 1>&2 "nixos-acme: renewing now, because certificate expires within the configured ${toString cfg.validMinDays} days"
+ lego ${renewOpts} --days ${toString cfg.validMinDays}
+ fi
else
+ echo 1>&2 "certificate domain(s) have changed; will renew now"
# Any number > 90 works, but this one is over 9000 ;-)
lego ${renewOpts} --days 9001
fi
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 573f0efa9da4..ac57f271526f 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -93,10 +93,12 @@ in
};
paths = mkOption {
- type = types.listOf types.str;
- default = [];
+ type = types.nullOr (types.listOf types.str);
+ default = null;
description = ''
- Which paths to backup.
+ Which paths to backup. If null or an empty array, no
+ backup command will be run. This can be used to create a
+ prune-only job.
'';
example = [
"/var/lib/postgresql"
@@ -217,7 +219,7 @@ in
resticCmd = "${pkgs.restic}/bin/restic${extraOptions}";
filesFromTmpFile = "/run/restic-backups-${name}/includes";
backupPaths = if (backup.dynamicFilesFrom == null)
- then concatStringsSep " " backup.paths
+ then if (backup.paths != null) then concatStringsSep " " backup.paths else ""
else "--files-from ${filesFromTmpFile}";
pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [
( resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts) )
@@ -243,7 +245,8 @@ in
restartIfChanged = false;
serviceConfig = {
Type = "oneshot";
- ExecStart = [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ] ++ pruneCmd;
+ ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ])
+ ++ pruneCmd;
User = backup.user;
RuntimeDirectory = "restic-backups-${name}";
CacheDirectory = "restic-backups-${name}";
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index ef6da26a024c..7efcf8ac6c59 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -276,9 +276,9 @@ in
${concatMapStrings (img: ''
echo "Seeding container image: ${img}"
${if (lib.hasSuffix "gz" img) then
- ''${pkgs.gzip}/bin/zcat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import -''
+ ''${pkgs.gzip}/bin/zcat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import --all-platforms -''
else
- ''${pkgs.coreutils}/bin/cat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import -''
+ ''${pkgs.coreutils}/bin/cat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import --all-platforms -''
}
'') cfg.seedDockerImages}
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 7363441e5387..0b52f8afed83 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -274,6 +274,15 @@ in
'';
};
+ etcSlurm = mkOption {
+ type = types.path;
+ internal = true;
+ default = etcSlurm;
+ description = ''
+ Path to directory with slurm config files. This option is set by default from the
+ Slurm module and is meant to make the Slurm config file available to other modules.
+ '';
+ };
};
@@ -308,7 +317,7 @@ in
#!/bin/sh
if [ -z "$SLURM_CONF" ]
then
- SLURM_CONF="${etcSlurm}/slurm.conf" "$EXE" "\$@"
+ SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
else
"$EXE" "\$0"
fi
diff --git a/nixos/modules/services/desktops/pipewire/README.md b/nixos/modules/services/desktops/pipewire/README.md
new file mode 100644
index 000000000000..87288a81cfe1
--- /dev/null
+++ b/nixos/modules/services/desktops/pipewire/README.md
@@ -0,0 +1,6 @@
+# Updating
+
+1. Update the version & hash in pkgs/development/libraries/pipewire/default.nix
+2. run `nix build -f /path/to/nixpkgs/checkout pipewire pipewire.mediaSession`
+3. copy all JSON files from result/etc/pipewire and result-mediaSession/etc/pipewire/media-session.d to this directory
+4. add new files to the module config and passthru tests
diff --git a/nixos/modules/services/desktops/pipewire/client-rt.conf.json b/nixos/modules/services/desktops/pipewire/client-rt.conf.json
index d294927b4f64..284d8c394a61 100644
--- a/nixos/modules/services/desktops/pipewire/client-rt.conf.json
+++ b/nixos/modules/services/desktops/pipewire/client-rt.conf.json
@@ -6,21 +6,34 @@
"audio.convert.*": "audioconvert/libspa-audioconvert",
"support.*": "support/libspa-support"
},
- "context.modules": {
- "libpipewire-module-rtkit": {
+ "context.modules": [
+ {
+ "name": "libpipewire-module-rtkit",
"args": {},
"flags": [
"ifexists",
"nofail"
]
},
- "libpipewire-module-protocol-native": null,
- "libpipewire-module-client-node": null,
- "libpipewire-module-client-device": null,
- "libpipewire-module-adapter": null,
- "libpipewire-module-metadata": null,
- "libpipewire-module-session-manager": null
- },
+ {
+ "name": "libpipewire-module-protocol-native"
+ },
+ {
+ "name": "libpipewire-module-client-node"
+ },
+ {
+ "name": "libpipewire-module-client-device"
+ },
+ {
+ "name": "libpipewire-module-adapter"
+ },
+ {
+ "name": "libpipewire-module-metadata"
+ },
+ {
+ "name": "libpipewire-module-session-manager"
+ }
+ ],
"filter.properties": {},
"stream.properties": {}
}
diff --git a/nixos/modules/services/desktops/pipewire/client.conf.json b/nixos/modules/services/desktops/pipewire/client.conf.json
index 224938abbbcf..71294a0e78a2 100644
--- a/nixos/modules/services/desktops/pipewire/client.conf.json
+++ b/nixos/modules/services/desktops/pipewire/client.conf.json
@@ -6,14 +6,26 @@
"audio.convert.*": "audioconvert/libspa-audioconvert",
"support.*": "support/libspa-support"
},
- "context.modules": {
- "libpipewire-module-protocol-native": null,
- "libpipewire-module-client-node": null,
- "libpipewire-module-client-device": null,
- "libpipewire-module-adapter": null,
- "libpipewire-module-metadata": null,
- "libpipewire-module-session-manager": null
- },
+ "context.modules": [
+ {
+ "name": "libpipewire-module-protocol-native"
+ },
+ {
+ "name": "libpipewire-module-client-node"
+ },
+ {
+ "name": "libpipewire-module-client-device"
+ },
+ {
+ "name": "libpipewire-module-adapter"
+ },
+ {
+ "name": "libpipewire-module-metadata"
+ },
+ {
+ "name": "libpipewire-module-session-manager"
+ }
+ ],
"filter.properties": {},
"stream.properties": {}
}
diff --git a/nixos/modules/services/desktops/pipewire/jack.conf.json b/nixos/modules/services/desktops/pipewire/jack.conf.json
index 2de04036b312..a6bd34917851 100644
--- a/nixos/modules/services/desktops/pipewire/jack.conf.json
+++ b/nixos/modules/services/desktops/pipewire/jack.conf.json
@@ -5,17 +5,24 @@
"context.spa-libs": {
"support.*": "support/libspa-support"
},
- "context.modules": {
- "libpipewire-module-rtkit": {
+ "context.modules": [
+ {
+ "name": "libpipewire-module-rtkit",
"args": {},
"flags": [
"ifexists",
"nofail"
]
},
- "libpipewire-module-protocol-native": null,
- "libpipewire-module-client-node": null,
- "libpipewire-module-metadata": null
- },
+ {
+ "name": "libpipewire-module-protocol-native"
+ },
+ {
+ "name": "libpipewire-module-client-node"
+ },
+ {
+ "name": "libpipewire-module-metadata"
+ }
+ ],
"jack.properties": {}
}
diff --git a/nixos/modules/services/desktops/pipewire/media-session.conf.json b/nixos/modules/services/desktops/pipewire/media-session.conf.json
index 4b2505ff8164..62e59935dbe5 100644
--- a/nixos/modules/services/desktops/pipewire/media-session.conf.json
+++ b/nixos/modules/services/desktops/pipewire/media-session.conf.json
@@ -6,21 +6,34 @@
"api.v4l2.*": "v4l2/libspa-v4l2",
"api.libcamera.*": "libcamera/libspa-libcamera"
},
- "context.modules": {
- "libpipewire-module-rtkit": {
+ "context.modules": [
+ {
+ "name": "libpipewire-module-rtkit",
"args": {},
"flags": [
"ifexists",
"nofail"
]
},
- "libpipewire-module-protocol-native": null,
- "libpipewire-module-client-node": null,
- "libpipewire-module-client-device": null,
- "libpipewire-module-adapter": null,
- "libpipewire-module-metadata": null,
- "libpipewire-module-session-manager": null
- },
+ {
+ "name": "libpipewire-module-protocol-native"
+ },
+ {
+ "name": "libpipewire-module-client-node"
+ },
+ {
+ "name": "libpipewire-module-client-device"
+ },
+ {
+ "name": "libpipewire-module-adapter"
+ },
+ {
+ "name": "libpipewire-module-metadata"
+ },
+ {
+ "name": "libpipewire-module-session-manager"
+ }
+ ],
"session.modules": {
"default": [
"flatpak",
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
index b41ea349fb8d..539a4cf44694 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
@@ -9,21 +9,12 @@ let
&& pkgs.stdenv.isx86_64
&& pkgs.pkgsi686Linux.pipewire != null;
- prioritizeNativeProtocol = {
- "context.modules" = {
- "libpipewire-module-protocol-native" = {
- _priority = -100;
- _content = null;
- };
- };
- };
-
# Use upstream config files passed through spa-json-dump as the base
# Patched here as necessary for them to work with this module
defaults = {
alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json));
bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json));
- media-session = recursiveUpdate (builtins.fromJSON (builtins.readFile ./media-session.conf.json)) prioritizeNativeProtocol;
+ media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json));
v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));
};
# Helpers for generating the pipewire JSON config file
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
index da08bcea2c90..3e776fe75a2c 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
+++ b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
@@ -4,25 +4,35 @@
"audio.convert.*": "audioconvert/libspa-audioconvert",
"support.*": "support/libspa-support"
},
- "context.modules": {
- "libpipewire-module-rtkit": {
+ "context.modules": [
+ {
+ "name": "libpipewire-module-rtkit",
"args": {},
"flags": [
"ifexists",
"nofail"
]
},
- "libpipewire-module-protocol-native": null,
- "libpipewire-module-client-node": null,
- "libpipewire-module-adapter": null,
- "libpipewire-module-metadata": null,
- "libpipewire-module-protocol-pulse": {
+ {
+ "name": "libpipewire-module-protocol-native"
+ },
+ {
+ "name": "libpipewire-module-client-node"
+ },
+ {
+ "name": "libpipewire-module-adapter"
+ },
+ {
+ "name": "libpipewire-module-metadata"
+ },
+ {
+ "name": "libpipewire-module-protocol-pulse",
"args": {
"server.address": [
"unix:native"
]
}
}
- },
+ ],
"stream.properties": {}
}
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/pipewire.conf.json
index 59e2afca0939..bae87dd66377 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.conf.json
+++ b/nixos/modules/services/desktops/pipewire/pipewire.conf.json
@@ -14,42 +14,66 @@
"api.jack.*": "jack/libspa-jack",
"support.*": "support/libspa-support"
},
- "context.modules": {
- "libpipewire-module-rtkit": {
+ "context.modules": [
+ {
+ "name": "libpipewire-module-rtkit",
"args": {},
"flags": [
"ifexists",
"nofail"
]
},
- "libpipewire-module-protocol-native": null,
- "libpipewire-module-profiler": null,
- "libpipewire-module-metadata": null,
- "libpipewire-module-spa-device-factory": null,
- "libpipewire-module-spa-node-factory": null,
- "libpipewire-module-client-node": null,
- "libpipewire-module-client-device": null,
- "libpipewire-module-portal": {
+ {
+ "name": "libpipewire-module-protocol-native"
+ },
+ {
+ "name": "libpipewire-module-profiler"
+ },
+ {
+ "name": "libpipewire-module-metadata"
+ },
+ {
+ "name": "libpipewire-module-spa-device-factory"
+ },
+ {
+ "name": "libpipewire-module-spa-node-factory"
+ },
+ {
+ "name": "libpipewire-module-client-node"
+ },
+ {
+ "name": "libpipewire-module-client-device"
+ },
+ {
+ "name": "libpipewire-module-portal",
"flags": [
"ifexists",
"nofail"
]
},
- "libpipewire-module-access": {
+ {
+ "name": "libpipewire-module-access",
"args": {}
},
- "libpipewire-module-adapter": null,
- "libpipewire-module-link-factory": null,
- "libpipewire-module-session-manager": null
- },
- "context.objects": {
- "spa-node-factory": {
+ {
+ "name": "libpipewire-module-adapter"
+ },
+ {
+ "name": "libpipewire-module-link-factory"
+ },
+ {
+ "name": "libpipewire-module-session-manager"
+ }
+ ],
+ "context.objects": [
+ {
+ "factory": "spa-node-factory",
"args": {
"factory.name": "support.node.driver",
"node.name": "Dummy-Driver",
"priority.driver": 8000
}
}
- },
- "context.exec": {}
+ ],
+ "context.exec": []
}
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix
index 2577e77c4a1f..7cf19706a633 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@@ -18,45 +18,15 @@ let
ln -s "${cfg.package.jack}/lib" "$out/lib/pipewire"
'';
- prioritizeNativeProtocol = {
- "context.modules" = {
- # Most other modules depend on this, so put it first
- "libpipewire-module-protocol-native" = {
- _priority = -100;
- _content = null;
- };
- };
- };
-
- fixDaemonModulePriorities = {
- "context.modules" = {
- # Most other modules depend on thism so put it first
- "libpipewire-module-protocol-native" = {
- _priority = -100;
- _content = null;
- };
- # Needs to be before libpipewire-module-access
- "libpipewire-module-portal" = {
- _priority = -50;
- _content = {
- flags = [
- "ifexists"
- "nofail"
- ];
- };
- };
- };
- };
-
# Use upstream config files passed through spa-json-dump as the base
# Patched here as necessary for them to work with this module
defaults = {
- client = recursiveUpdate (builtins.fromJSON (builtins.readFile ./client.conf.json)) prioritizeNativeProtocol;
- client-rt = recursiveUpdate (builtins.fromJSON (builtins.readFile ./client-rt.conf.json)) prioritizeNativeProtocol;
- jack = recursiveUpdate (builtins.fromJSON (builtins.readFile ./jack.conf.json)) prioritizeNativeProtocol;
+ client = builtins.fromJSON (builtins.readFile ./client.conf.json);
+ client-rt = builtins.fromJSON (builtins.readFile ./client-rt.conf.json);
+ jack = builtins.fromJSON (builtins.readFile ./jack.conf.json);
# Remove session manager invocation from the upstream generated file, it points to the wrong path
- pipewire = recursiveUpdate (builtins.fromJSON (builtins.readFile ./pipewire.conf.json)) fixDaemonModulePriorities;
- pipewire-pulse = recursiveUpdate (builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json)) prioritizeNativeProtocol;
+ pipewire = builtins.fromJSON (builtins.readFile ./pipewire.conf.json);
+ pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
};
# Helpers for generating the pipewire JSON config file
diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index 73099ae33634..a1aa5739d06b 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -36,6 +36,7 @@ let
only_admins_can_pause_the_game = true;
autosave_only_on_server = true;
admins = [];
+ non_blocking_saving = cfg.nonBlockingSaving;
} // cfg.extraSettings;
serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings));
modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods;
@@ -193,6 +194,15 @@ in
Autosave interval in minutes.
'';
};
+ nonBlockingSaving = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Highly experimental feature, enable only at your own risk of losing your saves.
+ On UNIX systems, server will fork itself to create an autosave.
+ Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option.
+ '';
+ };
};
};
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 03070a8f9e7c..29e5fbaee6bc 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -4,9 +4,7 @@ with lib;
let
- pkg = if config.hardware.sane.snapshot
- then pkgs.sane-backends-git
- else pkgs.sane-backends;
+ pkg = pkgs.sane-backends;
sanedConf = pkgs.writeTextFile {
name = "saned.conf";
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 1d45af36349c..c9dd10ec5572 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -196,6 +196,7 @@ let
domain: "${cfg.smtp.domain}",
${optionalString (cfg.smtp.authentication != null) "authentication: :${cfg.smtp.authentication},"}
enable_starttls_auto: ${boolToString cfg.smtp.enableStartTLSAuto},
+ tls: ${boolToString cfg.smtp.tls},
ca_file: "/etc/ssl/certs/ca-certificates.crt",
openssl_verify_mode: '${cfg.smtp.opensslVerifyMode}'
}
@@ -463,6 +464,12 @@ in {
description = "Whether to try to use StartTLS.";
};
+ tls = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to use TLS wrapper-mode.";
+ };
+
opensslVerifyMode = mkOption {
type = types.str;
default = "peer";
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 8b53eb471db6..e0055576d6f6 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -28,7 +28,7 @@ let
unpack = id: (name: source:
pkgs.stdenv.mkDerivation {
name = "redmine-${id}-${name}";
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
buildCommand = ''
mkdir -p $out
cd $out
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix b/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
index 1ece73a1159a..dd3bec8ec16c 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
@@ -30,12 +30,49 @@ in
Whether to run the exporter as the local 'postgres' super user.
'';
};
+
+ # TODO perhaps LoadCredential would be more appropriate
+ environmentFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/root/prometheus-postgres-exporter.env";
+ description = ''
+ Environment file as defined in
+ systemd.exec5
+ .
+
+ Secrets may be passed to the service without adding them to the
+ world-readable Nix store, by specifying placeholder variables as
+ the option value in Nix and setting these variables accordingly in the
+ environment file.
+
+ Environment variables from this file will be interpolated into the
+ config file using envsubst with this syntax:
+ $ENVIRONMENT ''${VARIABLE}
+
+ The main use is to set the DATA_SOURCE_NAME that contains the
+ postgres password
+
+ note that contents from this file will override dataSourceName
+ if you have set it from nix.
+
+
+ # Content of the environment file
+ DATA_SOURCE_NAME=postgresql://username:password@localhost:5432/postgres?sslmode=disable
+
+
+ Note that this file needs to be available on the host on which
+ this exporter is running.
+ '';
+ };
+
};
serviceOpts = {
environment.DATA_SOURCE_NAME = cfg.dataSourceName;
serviceConfig = {
DynamicUser = false;
User = mkIf cfg.runAsLocalSuperUser (mkForce "postgres");
+ EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
ExecStart = ''
${pkgs.prometheus-postgres-exporter}/bin/postgres_exporter \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix
index 4ae35875c0f0..6d7e7760d94e 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
- inherit (lib) mkEnableOption mkIf mkOption types;
+ inherit (lib) mkEnableOption mkIf mkOption optionalString types;
generic = variant:
let
@@ -26,6 +26,14 @@ let
'';
};
+ checkConfig = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether the config should be checked at build time.
+ Disabling this might become necessary if the config includes files not present during build time.
+ '';
+ };
};
};
@@ -36,7 +44,7 @@ let
environment.etc."bird/${variant}.conf".source = pkgs.writeTextFile {
name = "${variant}.conf";
text = cfg.config;
- checkPhase = ''
+ checkPhase = optionalString cfg.checkConfig ''
${pkg}/bin/${birdBin} -d -p -c $out
'';
};
@@ -50,7 +58,7 @@ let
Type = "forking";
Restart = "on-failure";
ExecStart = "${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -u ${variant} -g ${variant}";
- ExecReload = "${pkg}/bin/${birdc} configure";
+ ExecReload = "/bin/sh -c '${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -p && ${pkg}/bin/${birdc} configure'";
ExecStop = "${pkg}/bin/${birdc} down";
CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID"
# see bird/sysdep/linux/syspriv.h
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index f116d6392ea7..e9a0e5af1a47 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -245,7 +245,7 @@ in
fi
if [ -z "$CJDNS_ADMIN_PASSWORD" ]; then
- echo "CJDNS_ADMIN_PASSWORD=$(tr -dc A-Za-z0-9 > /etc/cjdns.keys
fi
'';
diff --git a/nixos/modules/services/networking/inspircd.nix b/nixos/modules/services/networking/inspircd.nix
new file mode 100644
index 000000000000..8cb2b406ee28
--- /dev/null
+++ b/nixos/modules/services/networking/inspircd.nix
@@ -0,0 +1,62 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.services.inspircd;
+
+ configFile = pkgs.writeText "inspircd.conf" cfg.config;
+
+in {
+ meta = {
+ maintainers = [ lib.maintainers.sternenseemann ];
+ };
+
+ options = {
+ services.inspircd = {
+ enable = lib.mkEnableOption "InspIRCd";
+
+ package = lib.mkOption {
+ type = lib.types.package;
+ default = pkgs.inspircd;
+ defaultText = lib.literalExample "pkgs.inspircd";
+ example = lib.literalExample "pkgs.inspircdMinimal";
+ description = ''
+ The InspIRCd package to use. This is mainly useful
+ to specify an overridden version of the
+ pkgs.inspircd dervivation, for
+ example if you want to use a more minimal InspIRCd
+ distribution with less modules enabled or with
+ modules enabled which can't be distributed in binary
+ form due to licensing issues.
+ '';
+ };
+
+ config = lib.mkOption {
+ type = lib.types.lines;
+ description = ''
+ Verbatim inspircd.conf file.
+ For a list of options, consult the
+ InspIRCd documentation, the
+ Module documentation
+ and the example configuration files distributed
+ with pkgs.inspircd.doc
+ '';
+ };
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ systemd.services.inspircd = {
+ description = "InspIRCd - the stable, high-performance and modular Internet Relay Chat Daemon";
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "network.target" ];
+
+ serviceConfig = {
+ Type = "simple";
+ ExecStart = ''
+ ${lib.getBin cfg.package}/bin/inspircd start --config ${configFile} --nofork --nopid
+ '';
+ DynamicUser = true;
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index e07020349cf4..9f76f7f7cd0a 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -238,7 +238,7 @@ let
wantedBy = [ "wireguard-${name}.service" ];
requiredBy = [ "wireguard-${name}.service" ];
before = [ "wireguard-${name}.service" ];
- path = with pkgs; [ wireguard ];
+ path = with pkgs; [ wireguard-tools ];
serviceConfig = {
Type = "oneshot";
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index b19cd0732526..d2b36d9e7541 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -104,7 +104,7 @@ let
ignoreCollisions = true;
};
- filterGutenprint = pkgs: filter (pkg: pkg.meta.isGutenprint or false == true) pkgs;
+ filterGutenprint = filter (pkg: pkg.meta.isGutenprint or false == true);
containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;
getGutenprint = pkgs: head (filterGutenprint pkgs);
diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix
index 8f8e2e2e9339..bb99e5e36ff8 100644
--- a/nixos/modules/services/system/localtime.nix
+++ b/nixos/modules/services/system/localtime.nix
@@ -29,15 +29,14 @@ in {
};
};
- # We use the 'out' output, since localtime has its 'bin' output
- # first, so that is what we get if we use the derivation bare.
# Install the polkit rules.
- environment.systemPackages = [ pkgs.localtime.out ];
+ environment.systemPackages = [ pkgs.localtime ];
# Install the systemd unit.
- systemd.packages = [ pkgs.localtime.out ];
+ systemd.packages = [ pkgs.localtime ];
users.users.localtimed = {
- description = "Taskserver user";
+ description = "localtime daemon";
+ isSystemUser = true;
};
systemd.services.localtime = {
diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix
new file mode 100644
index 000000000000..83d05ffbad9a
--- /dev/null
+++ b/nixos/modules/services/web-apps/bookstack.nix
@@ -0,0 +1,365 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.bookstack;
+ bookstack = pkgs.bookstack.override {
+ dataDir = cfg.dataDir;
+ };
+ db = cfg.database;
+ mail = cfg.mail;
+
+ user = cfg.user;
+ group = cfg.group;
+
+ # shell script for local administration
+ artisan = pkgs.writeScriptBin "bookstack" ''
+ #! ${pkgs.runtimeShell}
+ cd ${bookstack}
+ sudo=exec
+ if [[ "$USER" != ${user} ]]; then
+ sudo='exec /run/wrappers/bin/sudo -u ${user}'
+ fi
+ $sudo ${pkgs.php}/bin/php artisan $*
+ '';
+
+
+in {
+ options.services.bookstack = {
+
+ enable = mkEnableOption "BookStack";
+
+ user = mkOption {
+ default = "bookstack";
+ description = "User bookstack runs as.";
+ type = types.str;
+ };
+
+ group = mkOption {
+ default = "bookstack";
+ description = "Group bookstack runs as.";
+ type = types.str;
+ };
+
+ appKeyFile = mkOption {
+ description = ''
+ A file containing the AppKey.
+ Used for encryption where needed. Can be generated with head -c 32 /dev/urandom| base64 and must be prefixed with base64:.
+ '';
+ example = "/run/keys/bookstack-appkey";
+ type = types.path;
+ };
+
+ appURL = mkOption {
+ description = ''
+ The root URL that you want to host BookStack on. All URLs in BookStack will be generated using this value.
+ If you change this in the future you may need to run a command to update stored URLs in the database. Command example: php artisan bookstack:update-url https://old.example.com https://new.example.com
+ '';
+ example = "https://example.com";
+ type = types.str;
+ };
+
+ cacheDir = mkOption {
+ description = "BookStack cache directory";
+ default = "/var/cache/bookstack";
+ type = types.path;
+ };
+
+ dataDir = mkOption {
+ description = "BookStack data directory";
+ default = "/var/lib/bookstack";
+ type = types.path;
+ };
+
+ database = {
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Database host address.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 3306;
+ description = "Database host port.";
+ };
+ name = mkOption {
+ type = types.str;
+ default = "bookstack";
+ description = "Database name.";
+ };
+ user = mkOption {
+ type = types.str;
+ default = user;
+ defaultText = "\${user}";
+ description = "Database username.";
+ };
+ passwordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ example = "/run/keys/bookstack-dbpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+ createLocally = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Create the database and database user locally.";
+ };
+ };
+
+ mail = {
+ driver = mkOption {
+ type = types.enum [ "smtp" "sendmail" ];
+ default = "smtp";
+ description = "Mail driver to use.";
+ };
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Mail host address.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 1025;
+ description = "Mail host port.";
+ };
+ fromName = mkOption {
+ type = types.str;
+ default = "BookStack";
+ description = "Mail \"from\" name.";
+ };
+ from = mkOption {
+ type = types.str;
+ default = "mail@bookstackapp.com";
+ description = "Mail \"from\" email.";
+ };
+ user = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "bookstack";
+ description = "Mail username.";
+ };
+ passwordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ example = "/run/keys/bookstack-mailpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+ encryption = mkOption {
+ type = with types; nullOr (enum [ "tls" ]);
+ default = null;
+ description = "SMTP encryption mechanism to use.";
+ };
+ };
+
+ maxUploadSize = mkOption {
+ type = types.str;
+ default = "18M";
+ example = "1G";
+ description = "The maximum size for uploads (e.g. images).";
+ };
+
+ poolConfig = mkOption {
+ type = with types; attrsOf (oneOf [ str int bool ]);
+ default = {
+ "pm" = "dynamic";
+ "pm.max_children" = 32;
+ "pm.start_servers" = 2;
+ "pm.min_spare_servers" = 2;
+ "pm.max_spare_servers" = 4;
+ "pm.max_requests" = 500;
+ };
+ description = ''
+ Options for the bookstack PHP pool. See the documentation on php-fpm.conf
+ for details on configuration directives.
+ '';
+ };
+
+ nginx = mkOption {
+ type = types.submodule (
+ recursiveUpdate
+ (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {}
+ );
+ default = {};
+ example = {
+ serverAliases = [
+ "bookstack.\${config.networking.domain}"
+ ];
+ # To enable encryption and let let's encrypt take care of certificate
+ forceSSL = true;
+ enableACME = true;
+ };
+ description = ''
+ With this option, you can customize the nginx virtualHost settings.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ example = ''
+ ALLOWED_IFRAME_HOSTS="https://example.com"
+ WKHTMLTOPDF=/home/user/bins/wkhtmltopdf
+ '';
+ description = ''
+ Lines to be appended verbatim to the BookStack configuration.
+ Refer to for details on supported values.
+ '';
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ assertions = [
+ { assertion = db.createLocally -> db.user == user;
+ message = "services.bookstack.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true.";
+ }
+ { assertion = db.createLocally -> db.passwordFile == null;
+ message = "services.bookstack.database.passwordFile cannot be specified if services.bookstack.database.createLocally is set to true.";
+ }
+ ];
+
+ environment.systemPackages = [ artisan ];
+
+ services.mysql = mkIf db.createLocally {
+ enable = true;
+ package = mkDefault pkgs.mariadb;
+ ensureDatabases = [ db.name ];
+ ensureUsers = [
+ { name = db.user;
+ ensurePermissions = { "${db.name}.*" = "ALL PRIVILEGES"; };
+ }
+ ];
+ };
+
+ services.phpfpm.pools.bookstack = {
+ inherit user;
+ inherit group;
+ phpOptions = ''
+ log_errors = on
+ post_max_size = ${cfg.maxUploadSize}
+ upload_max_filesize = ${cfg.maxUploadSize}
+ '';
+ settings = {
+ "listen.mode" = "0660";
+ "listen.owner" = user;
+ "listen.group" = group;
+ } // cfg.poolConfig;
+ };
+
+ services.nginx = {
+ enable = mkDefault true;
+ virtualHosts.bookstack = mkMerge [ cfg.nginx {
+ root = mkForce "${bookstack}/public";
+ extraConfig = optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;";
+ locations = {
+ "/" = {
+ index = "index.php";
+ extraConfig = ''try_files $uri $uri/ /index.php?$query_string;'';
+ };
+ "~ \.php$" = {
+ extraConfig = ''
+ try_files $uri $uri/ /index.php?$query_string;
+ include ${pkgs.nginx}/conf/fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param REDIRECT_STATUS 200;
+ fastcgi_pass unix:${config.services.phpfpm.pools."bookstack".socket};
+ ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"}
+ '';
+ };
+ "~ \.(js|css|gif|png|ico|jpg|jpeg)$" = {
+ extraConfig = "expires 365d;";
+ };
+ };
+ }];
+ };
+
+ systemd.services.bookstack-setup = {
+ description = "Preperation tasks for BookStack";
+ before = [ "phpfpm-bookstack.service" ];
+ after = optional db.createLocally "mysql.service";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "oneshot";
+ User = user;
+ WorkingDirectory = "${bookstack}";
+ };
+ script = ''
+ # create .env file
+ echo "
+ APP_KEY=base64:$(head -n1 ${cfg.appKeyFile})
+ APP_URL=${cfg.appURL}
+ DB_HOST=${db.host}
+ DB_PORT=${toString db.port}
+ DB_DATABASE=${db.name}
+ DB_USERNAME=${db.user}
+ MAIL_DRIVER=${mail.driver}
+ MAIL_FROM_NAME=\"${mail.fromName}\"
+ MAIL_FROM=${mail.from}
+ MAIL_HOST=${mail.host}
+ MAIL_PORT=${toString mail.port}
+ ${optionalString (mail.user != null) "MAIL_USERNAME=${mail.user};"}
+ ${optionalString (mail.encryption != null) "MAIL_ENCRYPTION=${mail.encryption};"}
+ ${optionalString (db.passwordFile != null) "DB_PASSWORD=$(head -n1 ${db.passwordFile})"}
+ ${optionalString (mail.passwordFile != null) "MAIL_PASSWORD=$(head -n1 ${mail.passwordFile})"}
+ APP_SERVICES_CACHE=${cfg.cacheDir}/services.php
+ APP_PACKAGES_CACHE=${cfg.cacheDir}/packages.php
+ APP_CONFIG_CACHE=${cfg.cacheDir}/config.php
+ APP_ROUTES_CACHE=${cfg.cacheDir}/routes-v7.php
+ APP_EVENTS_CACHE=${cfg.cacheDir}/events.php
+ ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "SESSION_SECURE_COOKIE=true"}
+ ${toString cfg.extraConfig}
+ " > "${cfg.dataDir}/.env"
+ # set permissions
+ chmod 700 "${cfg.dataDir}/.env"
+
+ # migrate db
+ ${pkgs.php}/bin/php artisan migrate --force
+
+ # create caches
+ ${pkgs.php}/bin/php artisan config:cache
+ ${pkgs.php}/bin/php artisan route:cache
+ ${pkgs.php}/bin/php artisan view:cache
+ '';
+ };
+
+ systemd.tmpfiles.rules = [
+ "d ${cfg.cacheDir} 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir} 0710 ${user} ${group} - -"
+ "d ${cfg.dataDir}/public 0750 ${user} ${group} - -"
+ "d ${cfg.dataDir}/public/uploads 0750 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/app 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/fonts 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/cache 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/sessions 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/views 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/logs 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/uploads 0700 ${user} ${group} - -"
+ ];
+
+ users = {
+ users = mkIf (user == "bookstack") {
+ bookstack = {
+ inherit group;
+ isSystemUser = true;
+ };
+ "${config.services.nginx.user}".extraGroups = [ group ];
+ };
+ groups = mkIf (group == "bookstack") {
+ bookstack = {};
+ };
+ };
+
+ };
+
+ meta.maintainers = with maintainers; [ ymarkus ];
+}
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix
index 1ce584c6a46d..685cb4967030 100644
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -193,7 +193,7 @@ let
};
sourceRoot = ".";
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
@@ -220,7 +220,7 @@ let
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix
index 769490e915ac..dd63857a55c8 100644
--- a/nixos/modules/services/web-apps/galene.nix
+++ b/nixos/modules/services/web-apps/galene.nix
@@ -133,8 +133,10 @@ in
wantedBy = [ "multi-user.target" ];
preStart = ''
- install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem
- install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem
+ ${optionalString (cfg.insecure != true) ''
+ install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem
+ install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem
+ ''}
'';
serviceConfig = mkMerge [
diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index ea7aebc3b12d..16e8ae2ec0b2 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -43,8 +43,32 @@ let
LogsDirectoryMode = "0750";
# Access write directories
UMask = "0027";
+ # Capabilities
+ CapabilityBoundingSet = "";
+ # Security
+ NoNewPrivileges = true;
# Sandboxing
+ ProtectSystem = "strict";
+ ProtectHome = true;
PrivateTmp = true;
+ PrivateDevices = true;
+ PrivateUsers = true;
+ ProtectClock = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectControlGroups = true;
+ RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ];
+ RestrictNamespaces = true;
+ LockPersonality = true;
+ MemoryDenyWriteExecute = false;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ PrivateMounts = true;
+ # System Call Filtering
+ SystemCallArchitectures = "native";
+ SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @reboot @resources @setuid @swap";
};
envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") (
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index 5fbe53221ae8..f251cfe32db6 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -109,7 +109,7 @@ let
sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
@@ -136,7 +136,7 @@ let
sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index f3175793ebef..6c8341c1115f 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -804,7 +804,7 @@ in
ProtectControlGroups = true;
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
LockPersonality = true;
- MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules);
+ MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) (optionals (cfg.package ? modules) cfg.package.modules));
RestrictRealtime = true;
RestrictSUIDSGID = true;
PrivateMounts = true;
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index 6bee900c6830..2ea191426ce9 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -15,12 +15,15 @@ import re
import datetime
import glob
import os.path
+from typing import Tuple, List, Optional
-def copy_if_not_exists(source, dest):
+
+def copy_if_not_exists(source: str, dest: str) -> None:
if not os.path.exists(dest):
shutil.copyfile(source, dest)
-def system_dir(profile, generation):
+
+def system_dir(profile: Optional[str], generation: int) -> str:
if profile:
return "/nix/var/nix/profiles/system-profiles/%s-%d-link" % (profile, generation)
else:
@@ -42,7 +45,8 @@ MEMTEST_BOOT_ENTRY = """title MemTest86
efi /efi/memtest86/BOOTX64.efi
"""
-def write_loader_conf(profile, generation):
+
+def write_loader_conf(profile: Optional[str], generation: int) -> None:
with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f:
if "@timeout@" != "":
f.write("timeout @timeout@\n")
@@ -55,10 +59,12 @@ def write_loader_conf(profile, generation):
f.write("console-mode @consoleMode@\n");
os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")
-def profile_path(profile, generation, name):
+
+def profile_path(profile: Optional[str], generation: int, name: str) -> str:
return os.readlink("%s/%s" % (system_dir(profile, generation), name))
-def copy_from_profile(profile, generation, name, dry_run=False):
+
+def copy_from_profile(profile: Optional[str], generation: int, name: str, dry_run: bool = False) -> str:
store_file_path = profile_path(profile, generation, name)
suffix = os.path.basename(store_file_path)
store_dir = os.path.basename(os.path.dirname(store_file_path))
@@ -67,7 +73,8 @@ def copy_from_profile(profile, generation, name, dry_run=False):
copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
return efi_file_path
-def describe_generation(generation_dir):
+
+def describe_generation(generation_dir: str) -> str:
try:
with open("%s/nixos-version" % generation_dir) as f:
nixos_version = f.read()
@@ -87,7 +94,8 @@ def describe_generation(generation_dir):
return description
-def write_entry(profile, generation, machine_id):
+
+def write_entry(profile: Optional[str], generation: int, machine_id: str) -> None:
kernel = copy_from_profile(profile, generation, "kernel")
initrd = copy_from_profile(profile, generation, "initrd")
try:
@@ -116,14 +124,16 @@ def write_entry(profile, generation, machine_id):
f.write("machine-id %s\n" % machine_id)
os.rename(tmp_path, entry_file)
-def mkdir_p(path):
+
+def mkdir_p(path: str) -> None:
try:
os.makedirs(path)
except OSError as e:
if e.errno != errno.EEXIST or not os.path.isdir(path):
raise
-def get_generations(profile=None):
+
+def get_generations(profile: Optional[str] = None) -> List[Tuple[Optional[str], int]]:
gen_list = subprocess.check_output([
"@nix@/bin/nix-env",
"--list-generations",
@@ -137,7 +147,8 @@ def get_generations(profile=None):
configurationLimit = @configurationLimit@
return [ (profile, int(line.split()[0])) for line in gen_lines ][-configurationLimit:]
-def remove_old_entries(gens):
+
+def remove_old_entries(gens: List[Tuple[Optional[str], int]]) -> None:
rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$")
rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-(.*)\.conf$")
known_paths = []
@@ -150,8 +161,8 @@ def remove_old_entries(gens):
prof = rex_profile.sub(r"\1", path)
else:
prof = "system"
- gen = int(rex_generation.sub(r"\1", path))
- if not (prof, gen) in gens:
+ gen_number = int(rex_generation.sub(r"\1", path))
+ if not (prof, gen_number) in gens:
os.unlink(path)
except ValueError:
pass
@@ -159,7 +170,8 @@ def remove_old_entries(gens):
if not path in known_paths and not os.path.isdir(path):
os.unlink(path)
-def get_profiles():
+
+def get_profiles() -> List[str]:
if os.path.isdir("/nix/var/nix/profiles/system-profiles/"):
return [x
for x in os.listdir("/nix/var/nix/profiles/system-profiles/")
@@ -167,7 +179,8 @@ def get_profiles():
else:
return []
-def main():
+
+def main() -> None:
parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files')
parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot')
args = parser.parse_args()
@@ -182,7 +195,9 @@ def main():
# be there on newly installed systems, so let's generate one so that
# bootctl can find it and we can also pass it to write_entry() later.
cmd = ["@systemd@/bin/systemd-machine-id-setup", "--print"]
- machine_id = subprocess.check_output(cmd).rstrip()
+ machine_id = subprocess.run(
+ cmd, text=True, check=True, stdout=subprocess.PIPE
+ ).stdout.rstrip()
if os.getenv("NIXOS_INSTALL_GRUB") == "1":
warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning)
@@ -213,7 +228,6 @@ def main():
print("updating systemd-boot from %s to %s" % (sdboot_version, systemd_version))
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])
-
mkdir_p("@efiSysMountPoint@/efi/nixos")
mkdir_p("@efiSysMountPoint@/loader/entries")
@@ -252,5 +266,6 @@ def main():
if rc != 0:
print("could not sync @efiSysMountPoint@: {}".format(os.strerror(rc)), file=sys.stderr)
+
if __name__ == '__main__':
main()
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index f0bd76a3c1d2..ff304f570d35 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -7,7 +7,7 @@ let
efi = config.boot.loader.efi;
- gummibootBuilder = pkgs.substituteAll {
+ systemdBootBuilder = pkgs.substituteAll {
src = ./systemd-boot-builder.py;
isExecutable = true;
@@ -30,6 +30,17 @@ let
memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else "";
};
+
+ checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" {
+ nativeBuildInputs = [ pkgs.mypy ];
+ } ''
+ install -m755 ${systemdBootBuilder} $out
+ mypy \
+ --no-implicit-optional \
+ --disallow-untyped-calls \
+ --disallow-untyped-defs \
+ $out
+ '';
in {
imports =
@@ -131,7 +142,7 @@ in {
boot.loader.supportsInitrdSecrets = true;
system = {
- build.installBootLoader = gummibootBuilder;
+ build.installBootLoader = checkedSystemdBootBuilder;
boot.loader.id = "systemd-boot";
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 936077b9df1e..50ee0b8841e5 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -167,6 +167,7 @@ exec {logOutFd}>&- {logErrFd}>&-
# Start systemd.
echo "starting systemd..."
+
PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \
- LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \
+ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive @systemdUnitPathEnvVar@ \
exec @systemdExecutable@
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 94bc34fea0db..f6b6a8e4b0b4 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -10,7 +10,7 @@ let
src = ./stage-2-init.sh;
shellDebug = "${pkgs.bashInteractive}/bin/bash";
shell = "${pkgs.bash}/bin/bash";
- inherit (config.boot) systemdExecutable;
+ inherit (config.boot) systemdExecutable extraSystemdUnitPaths;
isExecutable = true;
inherit (config.nix) readOnlyStore;
inherit useHostResolvConf;
@@ -20,6 +20,10 @@ let
pkgs.util-linux
] ++ lib.optional useHostResolvConf pkgs.openresolv);
fsPackagesPath = lib.makeBinPath config.system.fsPackages;
+ systemdUnitPathEnvVar = lib.optionalString (config.boot.extraSystemdUnitPaths != [])
+ ("SYSTEMD_UNIT_PATH="
+ + builtins.concatStringsSep ":" config.boot.extraSystemdUnitPaths
+ + ":"); # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable
postBootCommands = pkgs.writeText "local-cmds"
''
${config.boot.postBootCommands}
@@ -82,6 +86,15 @@ in
PATH.
'';
};
+
+ extraSystemdUnitPaths = mkOption {
+ default = [];
+ type = types.listOf types.str;
+ description = ''
+ Additional paths that get appended to the SYSTEMD_UNIT_PATH environment variable
+ that can contain mutable unit files.
+ '';
+ };
};
};
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6b672c7b2eb4..45febb27bfd7 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -175,8 +175,10 @@ let
"timers.target.wants"
];
- upstreamUserUnits =
- [ "basic.target"
+ upstreamUserUnits = [
+ "app.slice"
+ "background.slice"
+ "basic.target"
"bluetooth.target"
"default.target"
"exit.target"
@@ -184,6 +186,7 @@ let
"graphical-session.target"
"paths.target"
"printer.target"
+ "session.slice"
"shutdown.target"
"smartcard.target"
"sockets.target"
@@ -193,6 +196,7 @@ let
"systemd-tmpfiles-clean.timer"
"systemd-tmpfiles-setup.service"
"timers.target"
+ "xdg-desktop-autostart.target"
];
makeJobScript = name: text:
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 997edf77ba99..148d0221998f 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -118,8 +118,9 @@ in
[network]
cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"]
- ${lib.optionalString (cfg.ociSeccompBpfHook.enable == true) ''
[engine]
+ init_path = "${pkgs.catatonit}/bin/catatonit"
+ ${lib.optionalString (cfg.ociSeccompBpfHook.enable) ''
hooks_dir = [
"${config.boot.kernelPackages.oci-seccomp-bpf-hook}",
]
diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix
index 5354d91deb93..7b027619a443 100644
--- a/nixos/modules/virtualisation/gce-images.nix
+++ b/nixos/modules/virtualisation/gce-images.nix
@@ -5,5 +5,13 @@ let self = {
"17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz";
"18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz";
"18.09" = "gs://nixos-cloud-images/nixos-image-18.09.1228.a4c4cbb613c-x86_64-linux.raw.tar.gz";
- latest = self."18.09";
+
+ # This format will be handled by the upcoming NixOPS 2.0 release.
+ # The old images based on a GS object are deprecated.
+ "20.09" = {
+ project = "nixos-cloud";
+ name = "nixos-image-20-09-3531-3858fbc08e6-x86-64-linux";
+ };
+
+ latest = self."20.09";
}; in self
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index c6d393d91963..99dd8ec6fd3c 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -253,7 +253,7 @@ in import ./make-test-python.nix ({ lib, ... }: {
def check_connection(node, domain, retries=3):
- assert retries >= 0
+ assert retries >= 0, f"Failed to connect to https://{domain}"
result = node.succeed(
"openssl s_client -brief -verify 2 -CAfile /tmp/ca.crt"
@@ -262,12 +262,12 @@ in import ./make-test-python.nix ({ lib, ... }: {
for line in result.lower().split("\n"):
if "verification" in line and "error" in line:
- time.sleep(1)
+ time.sleep(3)
return check_connection(node, domain, retries - 1)
def check_connection_key_bits(node, domain, bits, retries=3):
- assert retries >= 0
+ assert retries >= 0, f"Did not find expected number of bits ({bits}) in key"
result = node.succeed(
"openssl s_client -CAfile /tmp/ca.crt"
@@ -277,12 +277,12 @@ in import ./make-test-python.nix ({ lib, ... }: {
print("Key type:", result)
if bits not in result:
- time.sleep(1)
+ time.sleep(3)
return check_connection_key_bits(node, domain, bits, retries - 1)
def check_stapling(node, domain, retries=3):
- assert retries >= 0
+ assert retries >= 0, "OCSP Stapling check failed"
# Pebble doesn't provide a full OCSP responder, so just check the URL
result = node.succeed(
@@ -293,10 +293,23 @@ in import ./make-test-python.nix ({ lib, ... }: {
print("OCSP Responder URL:", result)
if "${caDomain}:4002" not in result.lower():
- time.sleep(1)
+ time.sleep(3)
return check_stapling(node, domain, retries - 1)
+ def download_ca_certs(node, retries=5):
+ assert retries >= 0, "Failed to connect to pebble to download root CA certs"
+
+ exit_code, _ = node.execute("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt")
+ exit_code_2, _ = node.execute(
+ "curl https://${caDomain}:15000/intermediate-keys/0 >> /tmp/ca.crt"
+ )
+
+ if exit_code + exit_code_2 > 0:
+ time.sleep(3)
+ return download_ca_certs(node, retries - 1)
+
+
client.start()
dnsserver.start()
@@ -313,8 +326,7 @@ in import ./make-test-python.nix ({ lib, ... }: {
acme.wait_for_unit("network-online.target")
acme.wait_for_unit("pebble.service")
- client.succeed("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt")
- client.succeed("curl https://${caDomain}:15000/intermediate-keys/0 >> /tmp/ca.crt")
+ download_ca_certs(client)
with subtest("Can request certificate with HTTPS-01 challenge"):
webserver.wait_for_unit("acme-finished-a.example.test.target")
@@ -322,6 +334,21 @@ in import ./make-test-python.nix ({ lib, ... }: {
check_issuer(webserver, "a.example.test", "pebble")
check_connection(client, "a.example.test")
+ with subtest("Certificates and accounts have safe + valid permissions"):
+ group = "${nodes.webserver.config.security.acme.certs."a.example.test".group}"
+ webserver.succeed(
+ f"test $(stat -L -c \"%a %U %G\" /var/lib/acme/a.example.test/* | tee /dev/stderr | grep '640 acme {group}' | wc -l) -eq 5"
+ )
+ webserver.succeed(
+ f"test $(stat -L -c \"%a %U %G\" /var/lib/acme/.lego/a.example.test/**/* | tee /dev/stderr | grep '640 acme {group}' | wc -l) -eq 5"
+ )
+ webserver.succeed(
+ f"test $(stat -L -c \"%a %U %G\" /var/lib/acme/a.example.test | tee /dev/stderr | grep '750 acme {group}' | wc -l) -eq 1"
+ )
+ webserver.succeed(
+ f"test $(find /var/lib/acme/accounts -type f -exec stat -L -c \"%a %U %G\" {{}} \\; | tee /dev/stderr | grep -v '600 acme {group}' | wc -l) -eq 0"
+ )
+
with subtest("Can generate valid selfsigned certs"):
webserver.succeed("systemctl clean acme-a.example.test.service --what=state")
webserver.succeed("systemctl start acme-selfsigned-a.example.test.service")
@@ -375,8 +402,15 @@ in import ./make-test-python.nix ({ lib, ... }: {
assert keyhash_old == keyhash_new
with subtest("Can request certificates for vhost + aliases (apache-httpd)"):
- switch_to(webserver, "httpd-aliases")
- webserver.wait_for_unit("acme-finished-c.example.test.target")
+ try:
+ switch_to(webserver, "httpd-aliases")
+ webserver.wait_for_unit("acme-finished-c.example.test.target")
+ except Exception as err:
+ _, output = webserver.execute(
+ "cat /var/log/httpd/*.log && ls -al /var/lib/acme/acme-challenge"
+ )
+ print(output)
+ raise err
check_issuer(webserver, "c.example.test", "pebble")
check_connection(client, "c.example.test")
check_connection(client, "d.example.test")
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 251f24a9a089..fb45ec1a310c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -176,6 +176,7 @@ in
initrd-network-ssh = handleTest ./initrd-network-ssh {};
initrdNetwork = handleTest ./initrd-network.nix {};
initrd-secrets = handleTest ./initrd-secrets.nix {};
+ inspircd = handleTest ./inspircd.nix {};
installer = handleTest ./installer.nix {};
iodine = handleTest ./iodine.nix {};
ipfs = handleTest ./ipfs.nix {};
@@ -393,6 +394,7 @@ in
systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};
systemd-nspawn = handleTest ./systemd-nspawn.nix {};
systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
+ systemd-unit-path = handleTest ./systemd-unit-path.nix {};
taskserver = handleTest ./taskserver.nix {};
telegraf = handleTest ./telegraf.nix {};
tiddlywiki = handleTest ./tiddlywiki.nix {};
@@ -408,6 +410,7 @@ in
trickster = handleTest ./trickster.nix {};
trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
tuptime = handleTest ./tuptime.nix {};
+ turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
ucg = handleTest ./ucg.nix {};
udisks2 = handleTest ./udisks2.nix {};
unbound = handleTest ./unbound.nix {};
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 1cc554d002b2..a0e81b613ce8 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -161,12 +161,18 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker run --rm ${examples.layered-image.imageName} cat extraCommands",
)
- with subtest("Ensure building an image on top of a layered Docker images work"):
+ with subtest("Ensure images built on top of layered Docker images work"):
docker.succeed(
"docker load --input='${examples.layered-on-top}'",
"docker run --rm ${examples.layered-on-top.imageName}",
)
+ with subtest("Ensure layered images built on top of layered Docker images work"):
+ docker.succeed(
+ "docker load --input='${examples.layered-on-top-layered}'",
+ "docker run --rm ${examples.layered-on-top-layered.imageName}",
+ )
+
def set_of_layers(image_name):
return set(
@@ -205,6 +211,31 @@ import ./make-test-python.nix ({ pkgs, ... }: {
assert "FROM_CHILD=true" in env, "envvars from the child should be preserved"
assert "LAST_LAYER=child" in env, "envvars from the child should take priority"
+ with subtest("Ensure environment variables of layered images are correctly inherited"):
+ docker.succeed(
+ "docker load --input='${examples.environmentVariablesLayered}'"
+ )
+ out = docker.succeed("docker run --rm ${examples.environmentVariablesLayered.imageName} env")
+ env = out.splitlines()
+ assert "FROM_PARENT=true" in env, "envvars from the parent should be preserved"
+ assert "FROM_CHILD=true" in env, "envvars from the child should be preserved"
+ assert "LAST_LAYER=child" in env, "envvars from the child should take priority"
+
+ with subtest(
+ "Ensure inherited environment variables of layered images are correctly resolved"
+ ):
+ # Read environment variables as stored in image config
+ config = docker.succeed(
+ "tar -xOf ${examples.environmentVariablesLayered} manifest.json | ${pkgs.jq}/bin/jq -r .[].Config"
+ ).strip()
+ out = docker.succeed(
+ f"tar -xOf ${examples.environmentVariablesLayered} {config} | ${pkgs.jq}/bin/jq -r '.config.Env | .[]'"
+ )
+ env = out.splitlines()
+ assert (
+ sum(entry.startswith("LAST_LAYER") for entry in env) == 1
+ ), "envvars overridden by child should be unique"
+
with subtest("Ensure image with only 2 layers can be loaded"):
docker.succeed(
"docker load --input='${examples.two-layered-image}'"
@@ -219,6 +250,18 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker run bulk-layer ls /bin/hello",
)
+ with subtest(
+ "Ensure the bulk layer with a base image respects the number of maxLayers"
+ ):
+ docker.succeed(
+ "docker load --input='${pkgs.dockerTools.examples.layered-bulk-layer}'",
+ # Ensure the image runs correctly
+ "docker run layered-bulk-layer ls /bin/hello",
+ )
+
+ # Ensure the image has the correct number of layers
+ assert len(set_of_layers("layered-bulk-layer")) == 4
+
with subtest("Ensure correct behavior when no store is needed"):
# This check tests that buildLayeredImage can build images that don't need a store.
docker.succeed(
diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix
index 40475d789d47..2664e1500ea4 100644
--- a/nixos/tests/dokuwiki.nix
+++ b/nixos/tests/dokuwiki.nix
@@ -9,7 +9,7 @@ let
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
@@ -24,7 +24,7 @@ let
sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
sourceRoot = ".";
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
diff --git a/nixos/tests/inspircd.nix b/nixos/tests/inspircd.nix
new file mode 100644
index 000000000000..f4d82054011c
--- /dev/null
+++ b/nixos/tests/inspircd.nix
@@ -0,0 +1,93 @@
+let
+ clients = [
+ "ircclient1"
+ "ircclient2"
+ ];
+ server = "inspircd";
+ ircPort = 6667;
+ channel = "nixos-cat";
+ iiDir = "/tmp/irc";
+in
+
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ name = "inspircd";
+ nodes = {
+ "${server}" = {
+ networking.firewall.allowedTCPPorts = [ ircPort ];
+ services.inspircd = {
+ enable = true;
+ package = pkgs.inspircdMinimal;
+ config = ''
+
+
+ '';
+ };
+ };
+ } // lib.listToAttrs (builtins.map (client: lib.nameValuePair client {
+ imports = [
+ ./common/user-account.nix
+ ];
+
+ systemd.services.ii = {
+ requires = [ "network.target" ];
+ wantedBy = [ "default.target" ];
+
+ serviceConfig = {
+ Type = "simple";
+ ExecPreStartPre = "mkdir -p ${iiDir}";
+ ExecStart = ''
+ ${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir}
+ '';
+ User = "alice";
+ };
+ };
+ }) clients);
+
+ testScript =
+ let
+ msg = client: "Hello, my name is ${client}";
+ clientScript = client: [
+ ''
+ ${client}.wait_for_unit("network.target")
+ ${client}.systemctl("start ii")
+ ${client}.wait_for_unit("ii")
+ ${client}.wait_for_file("${iiDir}/${server}/out")
+ ''
+ # wait until first PING from server arrives before joining,
+ # so we don't try it too early
+ ''
+ ${client}.wait_until_succeeds("grep 'PING' ${iiDir}/${server}/out")
+ ''
+ # join ${channel}
+ ''
+ ${client}.succeed("echo '/j #${channel}' > ${iiDir}/${server}/in")
+ ${client}.wait_for_file("${iiDir}/${server}/#${channel}/in")
+ ''
+ # send a greeting
+ ''
+ ${client}.succeed(
+ "echo '${msg client}' > ${iiDir}/${server}/#${channel}/in"
+ )
+ ''
+ # check that all greetings arrived on all clients
+ ] ++ builtins.map (other: ''
+ ${client}.succeed(
+ "grep '${msg other}$' ${iiDir}/${server}/#${channel}/out"
+ )
+ '') clients;
+
+ # foldl', but requires a non-empty list instead of a start value
+ reduce = f: list:
+ builtins.foldl' f (builtins.head list) (builtins.tail list);
+ in ''
+ start_all()
+ ${server}.wait_for_open_port(${toString ircPort})
+
+ # run clientScript for all clients so that every list
+ # entry is executed by every client before advancing
+ # to the next one.
+ '' + lib.concatStrings
+ (reduce
+ (lib.zipListsWith (cs: c: cs + c))
+ (builtins.map clientScript clients));
+})
diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix
index 4985ff60365c..6078a936edea 100644
--- a/nixos/tests/podman.nix
+++ b/nixos/tests/podman.nix
@@ -96,6 +96,15 @@ import ./make-test-python.nix (
podman.succeed(su_cmd("podman ps | grep sleeping"))
podman.succeed(su_cmd("podman stop sleeping"))
podman.succeed(su_cmd("podman rm sleeping"))
+
+ with subtest("Run container with init"):
+ podman.succeed(
+ "tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - busybox"
+ )
+ pid = podman.succeed("podman run --rm busybox readlink /proc/self").strip()
+ assert pid == "1"
+ pid = podman.succeed("podman run --rm --init busybox readlink /proc/self").strip()
+ assert pid == "2"
'';
}
)
diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix
index 0cc8bd39afbb..16979eab8217 100644
--- a/nixos/tests/restic.nix
+++ b/nixos/tests/restic.nix
@@ -45,6 +45,10 @@ import ./make-test-python.nix (
'';
inherit passwordFile initialize paths pruneOpts;
};
+ remoteprune = {
+ inherit repository passwordFile;
+ pruneOpts = [ "--keep-last 1" ];
+ };
};
environment.sessionVariables.RCLONE_CONFIG_LOCAL_TYPE = "local";
@@ -84,6 +88,8 @@ import ./make-test-python.nix (
"systemctl start restic-backups-rclonebackup.service",
'${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"',
'${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"',
+ "systemctl start restic-backups-remoteprune.service",
+ '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
)
'';
}
diff --git a/nixos/tests/spike.nix b/nixos/tests/spike.nix
index cb89df73877b..09035a156418 100644
--- a/nixos/tests/spike.nix
+++ b/nixos/tests/spike.nix
@@ -17,6 +17,6 @@ in
''
machine.wait_for_unit("multi-user.target")
output = machine.succeed("spike -m64 $(which pk) $(which hello)")
- assert output == "Hello, world!\n"
+ assert "Hello, world!" in output
'';
})
diff --git a/nixos/tests/systemd-unit-path.nix b/nixos/tests/systemd-unit-path.nix
new file mode 100644
index 000000000000..5998a187188a
--- /dev/null
+++ b/nixos/tests/systemd-unit-path.nix
@@ -0,0 +1,47 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+let
+ exampleScript = pkgs.writeTextFile {
+ name = "example.sh";
+ text = ''
+ #! ${pkgs.runtimeShell} -e
+
+ while true; do
+ echo "Example script running" >&2
+ ${pkgs.coreutils}/bin/sleep 1
+ done
+ '';
+ executable = true;
+ };
+
+ unitFile = pkgs.writeTextFile {
+ name = "example.service";
+ text = ''
+ [Unit]
+ Description=Example systemd service unit file
+
+ [Service]
+ ExecStart=${exampleScript}
+
+ [Install]
+ WantedBy=multi-user.target
+ '';
+ };
+in
+{
+ name = "systemd-unit-path";
+
+ machine = { pkgs, lib, ... }: {
+ boot.extraSystemdUnitPaths = [ "/etc/systemd-rw/system" ];
+ };
+
+ testScript = ''
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed("mkdir -p /etc/systemd-rw/system")
+ machine.succeed(
+ "cp ${unitFile} /etc/systemd-rw/system/example.service"
+ )
+ machine.succeed("systemctl start example.service")
+ machine.succeed("systemctl status example.service | grep 'Active: active'")
+ '';
+})
diff --git a/nixos/tests/turbovnc-headless-server.nix b/nixos/tests/turbovnc-headless-server.nix
new file mode 100644
index 000000000000..35da9a53d2db
--- /dev/null
+++ b/nixos/tests/turbovnc-headless-server.nix
@@ -0,0 +1,171 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ name = "turbovnc-headless-server";
+ meta = {
+ maintainers = with lib.maintainers; [ nh2 ];
+ };
+
+ machine = { pkgs, ... }: {
+
+ environment.systemPackages = with pkgs; [
+ glxinfo
+ procps # for `pkill`, `pidof` in the test
+ scrot # for screenshotting Xorg
+ turbovnc
+ ];
+
+ programs.turbovnc.ensureHeadlessSoftwareOpenGL = true;
+
+ networking.firewall = {
+ # Reject instead of drop, for failures instead of hangs.
+ rejectPackets = true;
+ allowedTCPPorts = [
+ 5900 # VNC :0, for seeing what's going on in the server
+ ];
+ };
+
+ # So that we can ssh into the VM, see e.g.
+ # http://blog.patapon.info/nixos-local-vm/#accessing-the-vm-with-ssh
+ services.openssh.enable = true;
+ services.openssh.permitRootLogin = "yes";
+ users.extraUsers.root.password = "";
+ users.mutableUsers = false;
+ };
+
+ testScript = ''
+ def wait_until_terminated_or_succeeds(
+ termination_check_shell_command,
+ success_check_shell_command,
+ get_detail_message_fn,
+ retries=60,
+ retry_sleep=0.5,
+ ):
+ def check_success():
+ command_exit_code, _output = machine.execute(success_check_shell_command)
+ return command_exit_code == 0
+
+ for _ in range(retries):
+ exit_check_exit_code, _output = machine.execute(termination_check_shell_command)
+ is_terminated = exit_check_exit_code != 0
+ if is_terminated:
+ if check_success():
+ return
+ else:
+ details = get_detail_message_fn()
+ raise Exception(
+ f"termination check ({termination_check_shell_command}) triggered without command succeeding ({success_check_shell_command}); details: {details}"
+ )
+ else:
+ if check_success():
+ return
+ time.sleep(retry_sleep)
+
+ if not check_success():
+ details = get_detail_message_fn()
+ raise Exception(
+ f"action timed out ({success_check_shell_command}); details: {details}"
+ )
+
+
+ # Below we use the pattern:
+ # (cmd | tee stdout.log) 3>&1 1>&2 2>&3 | tee stderr.log
+ # to capture both stderr and stdout while also teeing them, see:
+ # https://unix.stackexchange.com/questions/6430/how-to-redirect-stderr-and-stdout-to-different-files-and-also-display-in-termina/6431#6431
+
+
+ # Starts headless VNC server, backgrounding it.
+ def start_xvnc():
+ xvnc_command = " ".join(
+ [
+ "Xvnc",
+ ":0",
+ "-iglx",
+ "-auth /root/.Xauthority",
+ "-geometry 1240x900",
+ "-depth 24",
+ "-rfbwait 5000",
+ "-deferupdate 1",
+ "-verbose",
+ "-securitytypes none",
+ # We don't enforce localhost listening such that we
+ # can connect from outside the VM using
+ # env QEMU_NET_OPTS=hostfwd=tcp::5900-:5900 $(nix-build nixos/tests/turbovnc-headless-server.nix -A driver)/bin/nixos-test-driver
+ # for testing purposes, and so that we can in the future
+ # add another test case that connects the TurboVNC client.
+ # "-localhost",
+ ]
+ )
+ machine.execute(
+ # Note trailing & for backgrounding.
+ f"({xvnc_command} | tee /tmp/Xvnc.stdout) 3>&1 1>&2 2>&3 | tee /tmp/Xvnc.stderr &",
+ )
+
+
+ # Waits until the server log message that tells us that GLX is ready
+ # (requires `-verbose` above), avoiding screenshoting racing below.
+ def wait_until_xvnc_glx_ready():
+ machine.wait_until_succeeds("test -f /tmp/Xvnc.stderr")
+ wait_until_terminated_or_succeeds(
+ termination_check_shell_command="pidof Xvnc",
+ success_check_shell_command="grep 'GLX: Initialized DRISWRAST' /tmp/Xvnc.stderr",
+ get_detail_message_fn=lambda: "Contents of /tmp/Xvnc.stderr:\n"
+ + machine.succeed("cat /tmp/Xvnc.stderr"),
+ )
+
+
+ # Checks that we detect glxgears failing when
+ # `LIBGL_DRIVERS_PATH=/nonexistent` is set
+ # (in which case software rendering should not work).
+ def test_glxgears_failing_with_bad_driver_path():
+ machine.execute(
+ # Note trailing & for backgrounding.
+ "(env DISPLAY=:0 LIBGL_DRIVERS_PATH=/nonexistent glxgears -info | tee /tmp/glxgears-should-fail.stdout) 3>&1 1>&2 2>&3 | tee /tmp/glxgears-should-fail.stderr &"
+ )
+ machine.wait_until_succeeds("test -f /tmp/glxgears-should-fail.stderr")
+ wait_until_terminated_or_succeeds(
+ termination_check_shell_command="pidof glxgears",
+ success_check_shell_command="grep 'libGL error: failed to load driver: swrast' /tmp/glxgears-should-fail.stderr",
+ get_detail_message_fn=lambda: "Contents of /tmp/glxgears-should-fail.stderr:\n"
+ + machine.succeed("cat /tmp/glxgears-should-fail.stderr"),
+ )
+ machine.wait_until_fails("pidof glxgears")
+
+
+ # Starts glxgears, backgrounding it. Waits until it prints the `GL_RENDERER`.
+ # Does not quit glxgears.
+ def test_glxgears_prints_renderer():
+ machine.execute(
+ # Note trailing & for backgrounding.
+ "(env DISPLAY=:0 glxgears -info | tee /tmp/glxgears.stdout) 3>&1 1>&2 2>&3 | tee /tmp/glxgears.stderr &"
+ )
+ machine.wait_until_succeeds("test -f /tmp/glxgears.stderr")
+ wait_until_terminated_or_succeeds(
+ termination_check_shell_command="pidof glxgears",
+ success_check_shell_command="grep 'GL_RENDERER' /tmp/glxgears.stdout",
+ get_detail_message_fn=lambda: "Contents of /tmp/glxgears.stderr:\n"
+ + machine.succeed("cat /tmp/glxgears.stderr"),
+ )
+
+
+ with subtest("Start Xvnc"):
+ start_xvnc()
+ wait_until_xvnc_glx_ready()
+
+ with subtest("Ensure bad driver path makes glxgears fail"):
+ test_glxgears_failing_with_bad_driver_path()
+
+ with subtest("Run 3D application (glxgears)"):
+ test_glxgears_prints_renderer()
+
+ # Take screenshot; should display the glxgears.
+ machine.succeed("scrot --display :0 /tmp/glxgears.png")
+
+ # Copy files down.
+ machine.copy_from_vm("/tmp/glxgears.png")
+ machine.copy_from_vm("/tmp/glxgears.stdout")
+ machine.copy_from_vm("/tmp/glxgears-should-fail.stdout")
+ machine.copy_from_vm("/tmp/glxgears-should-fail.stderr")
+ machine.copy_from_vm("/tmp/Xvnc.stdout")
+ machine.copy_from_vm("/tmp/Xvnc.stderr")
+ '';
+
+})
diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix
index 689ad2735752..44bee86880a7 100644
--- a/pkgs/applications/accessibility/contrast/default.nix
+++ b/pkgs/applications/accessibility/contrast/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, fetchFromGitLab
, cairo
, dbus
@@ -7,17 +8,17 @@
, glib
, gtk3
, libhandy_0
+, libsass
, meson
, ninja
, pango
, pkg-config
, python3
-, rustc
, rustPlatform
, wrapGAppsHook
}:
-rustPlatform.buildRustPackage rec {
+stdenv.mkDerivation rec {
pname = "contrast";
version = "0.0.3";
@@ -30,7 +31,11 @@ rustPlatform.buildRustPackage rec {
sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy";
};
- cargoSha256 = "0vi8nv4hkhsgqgz36xacwkk5cxirg6li44nbmk3x7vx7c64hzybq";
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-ePkPiWGn79PHrMsSEql5OXZW5uRMdTP+w0/DCcm2KG4=";
+ };
nativeBuildInputs = [
desktop-file-utils
@@ -39,6 +44,9 @@ rustPlatform.buildRustPackage rec {
ninja
pkg-config
python3
+ rustPlatform.rust.cargo
+ rustPlatform.cargoSetupHook
+ rustPlatform.rust.rustc
wrapGAppsHook
glib # for glib-compile-resources
];
@@ -49,6 +57,7 @@ rustPlatform.buildRustPackage rec {
glib
gtk3
libhandy_0
+ libsass
pango
];
@@ -56,12 +65,6 @@ rustPlatform.buildRustPackage rec {
patchShebangs build-aux/meson_post_install.py
'';
- # Don't use buildRustPackage phases, only use it for rust deps setup
- configurePhase = null;
- buildPhase = null;
- checkPhase = null;
- installPhase = null;
-
meta = with lib; {
description = "Checks whether the contrast between two colors meet the WCAG requirements";
homepage = "https://gitlab.gnome.org/World/design/contrast";
diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix
new file mode 100644
index 000000000000..08042a7701b9
--- /dev/null
+++ b/pkgs/applications/accessibility/squeekboard/default.nix
@@ -0,0 +1,70 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkg-config
+, gnome3
+, glib
+, gtk3
+, wayland
+, wayland-protocols
+, libxml2
+, libxkbcommon
+, rustPlatform
+, feedbackd
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "squeekboard";
+ version = "unstable-2021-03-09";
+
+ src = fetchFromGitLab {
+ domain = "source.puri.sm";
+ owner = "Librem5";
+ repo = pname;
+ rev = "bffd212e102bf71a94c599aac0359a8d30d19008";
+ sha256 = "1j10zhyb8wyrcbryfj6f3drn9b0l9x0l7hnhy2imnjbfbnwwm4w7";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ cargoUpdateHook = ''
+ cat Cargo.toml.in Cargo.deps > Cargo.toml
+ '';
+ name = "${pname}-${version}";
+ sha256 = "1qaqiaxqc4x2x5bd31na4c49vbjwrmz5clmgli7733dv55rxxias";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ glib
+ wayland
+ wrapGAppsHook
+ ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
+
+ buildInputs = [
+ gtk3
+ gnome3.gnome-desktop
+ wayland
+ wayland-protocols
+ libxml2
+ libxkbcommon
+ feedbackd
+ ];
+
+ meta = with lib; {
+ description = "A virtual keyboard supporting Wayland";
+ homepage = "https://source.puri.sm/Librem5/squeekboard";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ artturin ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 063cfcaa9fae..be984e7e98a6 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchgit, lib
+{ mkDerivation, fetchurl, lib
, extra-cmake-modules, kdoctools
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
@@ -7,17 +7,12 @@
}:
mkDerivation rec {
- pname = "amarok-unstable";
- version = "2020-06-12";
+ pname = "amarok";
+ version = "2.9.71";
- src = fetchgit {
- # master has the Qt5 version as of April 2018 but a formal release has not
- # yet been made so change this back to the proper upstream when such a
- # release is out
- url = "https://invent.kde.org/multimedia/amarok.git";
- # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- rev = "fece39b0e81db310b6a6e08f93d83b0d498cd02b";
- sha256 = "12casnq6w5yp2jlvnr466pjpkn0vriry8jzfq2qkjl564y0vhy9x";
+ src = fetchurl {
+ url = "mirror://kde/unstable/${pname}/${version}/${pname}-${version}.tar.xz";
+ sha256 = "0kz8wixjmy4yxq2gk11ybswryxb6alfymd3bzcar9xinscllhh3a";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
@@ -35,7 +30,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://amarok.kde.org";
description = "A powerful music player with an intuitive interface";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ peterhoeg ];
};
}
diff --git a/pkgs/applications/audio/apple-music-electron/default.nix b/pkgs/applications/audio/apple-music-electron/default.nix
index 1c6180ac2119..5d0cb68edb73 100644
--- a/pkgs/applications/audio/apple-music-electron/default.nix
+++ b/pkgs/applications/audio/apple-music-electron/default.nix
@@ -1,12 +1,12 @@
{ appimageTools, lib, fetchurl }:
let
pname = "apple-music-electron";
- version = "1.5.2";
+ version = "1.5.5";
name = "Apple.Music-${version}";
src = fetchurl {
- url = "https://github.com/iiFir3z/Apple-Music-Electron/releases/download/${version}/${name}.AppImage";
- sha256 = "1jl0wgwy6ajmfkzygwb7cm9m49nkhp3x6vd8kwmh6ccs3jy4ayp5";
+ url = "https://github.com/cryptofyre/Apple-Music-Electron/releases/download/v${version}/${name}.AppImage";
+ sha256 = "1gb6j3nvam9fcpsgiv56jccg9a4y14vzsyw11h3hckaigy90knpx";
};
appimageContents = appimageTools.extract { inherit name src; };
diff --git a/pkgs/applications/audio/ardour/5.nix b/pkgs/applications/audio/ardour/5.nix
index 4a0656ed9ce2..9e8c075bfb07 100644
--- a/pkgs/applications/audio/ardour/5.nix
+++ b/pkgs/applications/audio/ardour/5.nix
@@ -8,7 +8,6 @@
, doxygen
, fftwSinglePrec
, flac
-, glibc
, glibmm
, graphviz
, gtkmm2
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 26e25c687e77..b66432640710 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -16,6 +16,7 @@
, glibmm
, graphviz
, gtkmm2
+, harvid
, itstool
, libarchive
, libjack2
@@ -35,6 +36,7 @@
, lilv
, lrdf
, lv2
+, makeWrapper
, pango
, perl
, pkg-config
@@ -49,6 +51,8 @@
, taglib
, vamp-plugin-sdk
, wafHook
+, xjadeo
+, videoSupport ? false
}:
stdenv.mkDerivation rec {
pname = "ardour";
@@ -70,6 +74,7 @@ stdenv.mkDerivation rec {
doxygen
graphviz # for dot
itstool
+ makeWrapper
perl
pkg-config
python3
@@ -121,7 +126,7 @@ stdenv.mkDerivation rec {
suil
taglib
vamp-plugin-sdk
- ];
+ ] ++ lib.optionals videoSupport [ harvid xjadeo ];
wafConfigureFlags = [
"--cxx11"
@@ -158,6 +163,10 @@ stdenv.mkDerivation rec {
"$out/share/icons/hicolor/''${size}x''${size}/apps/ardour6.png"
done
install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
+ '' + lib.optionalString videoSupport ''
+ # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
+ wrapProgram "$out/bin/ardour6" \
+ --prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}"
'';
LINKFLAGS = "-lpthread";
@@ -174,8 +183,8 @@ stdenv.mkDerivation rec {
https://community.ardour.org/donate
'';
homepage = "https://ardour.org/";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ goibhniu magnetophon ];
+ maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ];
};
}
diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix
index ac405cde644f..09be8faa8a0f 100644
--- a/pkgs/applications/audio/bambootracker/default.nix
+++ b/pkgs/applications/audio/bambootracker/default.nix
@@ -1,4 +1,5 @@
{ mkDerivation
+, stdenv
, lib
, fetchFromGitHub
, fetchpatch
@@ -39,6 +40,14 @@ mkDerivation rec {
postConfigure = "make qmake_all";
+ # installs app bundle on darwin, re-extract the binary
+ # wrapQtAppsHook fails to wrap mach-o binaries, manually call wrapper (https://github.com/NixOS/nixpkgs/issues/102044)
+ postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+ mv $out/bin/BambooTracker{.app/Contents/MacOS/BambooTracker,}
+ rm -r $out/bin/BambooTracker.app
+ wrapQtApp $out/bin/BambooTracker
+ '';
+
meta = with lib; {
description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
homepage = "https://rerrahkr.github.io/BambooTracker";
diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix
index d742961939f6..6529cd860c8a 100644
--- a/pkgs/applications/audio/callaudiod/default.nix
+++ b/pkgs/applications/audio/callaudiod/default.nix
@@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "callaudiod";
- version = "0.0.4";
+ version = "0.1.0";
src = fetchFromGitLab {
domain = "gitlab.com";
owner = "mobian1";
repo = pname;
rev = version;
- sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj";
+ sha256 = "087589z45xvldn2m1g79y0xbwzylwkjmfk83s5xjixyq0wqmfppd";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/applications/audio/cheesecutter/default.nix
index 84f6b183033e..6c14cc67f81f 100644
--- a/pkgs/applications/audio/cheesecutter/default.nix
+++ b/pkgs/applications/audio/cheesecutter/default.nix
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation rec {
pname = "cheesecutter";
- version = "unstable-2020-04-03";
+ version = "unstable-2021-02-27";
src = fetchFromGitHub {
owner = "theyamo";
repo = "CheeseCutter";
- rev = "68d6518f0e6249a2a5d122fc80201578337c1277";
- sha256 = "0xspzjhc6cp3m0yd0mwxncg8n1wklizamxvidrnn21jgj3mnaq2q";
+ rev = "84450d3614b8fb2cabda87033baab7bedd5a5c98";
+ sha256 = "sha256:0q4a791nayya6n01l0f4kk497rdq6kiq0n72fqdpwqy138pfwydn";
};
patches = [
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index e665edabd074..b84b4e6aa9a4 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -10,7 +10,7 @@ let
withCD = config.clementine.cd or true;
withCloud = config.clementine.cloud or true;
- # On the update after all 1.4rc, qt5.15 will be supported.
+ # On the update after all 1.4rc, qt5.15 and protobuf 3.15 will be supported.
version = "1.4.0rc1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix
index a2e71b955ec4..ebcd09ca6adf 100644
--- a/pkgs/applications/audio/clerk/default.nix
+++ b/pkgs/applications/audio/clerk/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl,
-util-linux, pythonPackages, libnotify }:
+util-linux, python3Packages, libnotify }:
stdenv.mkDerivation {
name = "clerk-2016-10-14";
@@ -12,10 +12,12 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ pythonPackages.mpd2 ];
+ buildInputs = [ python3Packages.mpd2 ];
dontBuild = true;
+ strictDeps = true;
+
installPhase = ''
DESTDIR=$out PREFIX=/ make install
wrapProgram $out/bin/clerk \
diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix
index b155c1c41b60..675f31b478ce 100644
--- a/pkgs/applications/audio/espeak/default.nix
+++ b/pkgs/applications/audio/espeak/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz";
};
- buildInputs = [ unzip portaudio ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ portaudio ];
patches = [
./gcc6.patch
diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix
index aa0dc90adf58..0b9fa3dfbe54 100644
--- a/pkgs/applications/audio/espeak/edit.nix
+++ b/pkgs/applications/audio/espeak/edit.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ unzip portaudio wxGTK ];
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ portaudio wxGTK ];
# TODO:
# Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index fbd94ebd3d16..6524700ae156 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -1,11 +1,10 @@
-{ lib
+{ stdenv
+, lib
, rustPlatform
, fetchFromGitLab
, meson
, ninja
, gettext
-, cargo
-, rustc
, python3
, pkg-config
, glib
@@ -18,9 +17,9 @@
, wrapGAppsHook
}:
-rustPlatform.buildRustPackage rec {
- version = "0.4.8";
+stdenv.mkDerivation rec {
pname = "gnome-podcasts";
+ version = "0.4.8";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@@ -30,16 +29,21 @@ rustPlatform.buildRustPackage rec {
sha256 = "0y2332zjq7vf1v38wzwz98fs19vpzy9kl7y0xbdzqr303l59hjb1";
};
- cargoSha256 = "1jbii9k4bkrivdk1ffr6556q1sgk9j4jbzwnn8vbxmksyl1x328q";
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-GInRA/V61r42spb/JYlM8+mATSkmOxdm2zHPRWaKcck=";
+ };
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
- cargo
- rustc
python3
+ rustPlatform.rust.cargo
+ rustPlatform.cargoSetupHook
+ rustPlatform.rust.rustc
wrapGAppsHook
glib
];
@@ -57,12 +61,6 @@ rustPlatform.buildRustPackage rec {
gst_all_1.gst-plugins-good
];
- # use Meson/Ninja phases
- configurePhase = null;
- buildPhase = null;
- checkPhase = null;
- installPhase = null;
-
# tests require network
doCheck = false;
@@ -74,7 +72,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Listen to your favorite podcasts";
homepage = "https://wiki.gnome.org/Apps/Podcasts";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.unix;
};
diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix
index e2c19ac156d4..bb92682b141f 100644
--- a/pkgs/applications/audio/helio-workstation/default.nix
+++ b/pkgs/applications/audio/helio-workstation/default.nix
@@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "helio-workstation";
- version = "3.3";
+ version = "3.4";
src = fetchFromGitHub {
owner = "helio-fm";
repo = pname;
rev = version;
fetchSubmodules = true;
- sha256 = "sha256-meeNqV1jKUwWc7P3p/LicPsbpzpKKFmQ1wP9DuXc9NY=";
+ sha256 = "sha256-zXsDu/xi7OV6VtnZK9ZJ8uwPeA5uTgNpAQsqe90iwG4=";
};
buildInputs = [
diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix
index 13b488ce7d78..bf054b118e1b 100644
--- a/pkgs/applications/audio/jamulus/default.nix
+++ b/pkgs/applications/audio/jamulus/default.nix
@@ -1,14 +1,14 @@
-{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2
+{ mkDerivation, lib, fetchFromGitHub, pkg-config, qtscript, qmake, libjack2
}:
mkDerivation rec {
pname = "jamulus";
- version = "3.6.2";
+ version = "3.7.0";
src = fetchFromGitHub {
- owner = "corrados";
+ owner = "jamulussoftware";
repo = "jamulus";
rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
- sha256 = "sha256-b187Q8KXcU32C2hGFqs6R2CqWgmieq6ewQDx+elEgP4=";
+ sha256 = "sha256-8zCPT0jo4ExgmZWxGinumv3JauH4csM9DtuHmOiJQAM=";
};
nativeBuildInputs = [ pkg-config qmake ];
@@ -20,7 +20,7 @@ mkDerivation rec {
description = "Enables musicians to perform real-time jam sessions over the internet";
longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details";
homepage = "https://github.com/corrados/jamulus/wiki";
- license = lib.licenses.gpl2; # linked in git repo, at least
+ license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.seb314 ];
};
diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix
index 638f54da5150..4d7d70aebd66 100644
--- a/pkgs/applications/audio/littlegptracker/default.nix
+++ b/pkgs/applications/audio/littlegptracker/default.nix
@@ -43,7 +43,9 @@ 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 { };
+ passthru.updateScript = unstableGitUpdater {
+ url = "https://github.com/Mdashdotdashn/littlegptracker.git";
+ };
meta = with lib; {
description = "A music tracker similar to lsdj optimised to run on portable game consoles";
diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
index f951486e3fa3..32f43eaed9cb 100644
--- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "MBdistortion";
version = "1.1.1";
@@ -10,6 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "0mdzaqmxzgspfgx9w1hdip18y17hwpdcgjyq1rrfm843vkascwip";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/magnetophon/MBdistortion/commit/10e35084b88c559f1b63760cf40fd5ef5a6745a5.patch";
+ sha256 = "0hwjl3rzvn3id0sr0qs8f37jdmr915mdan8miaf78ra0ir3wnk76";
+ })
+ ];
+
buildInputs = [ faust2jaqt faust2lv2 ];
buildPhase = ''
diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix
index ec6fd4d8ed93..37cfd0fac40d 100644
--- a/pkgs/applications/audio/midi-visualizer/default.nix
+++ b/pkgs/applications/audio/midi-visualizer/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "MIDIVisualizer";
- version = "6.2";
+ version = "6.3";
src = fetchFromGitHub {
owner = "kosua20";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-t7DRPV0FSg6v81GzHLK2O++sfjr2aFT+xg3+wFd0UFg=";
+ sha256 = "sha256-U/YmxHD6e13I++aW+z1Y5xtZ+MN0KUJLSskrF4+UgTE=";
};
nativeBuildInputs = [ cmake pkg-config makeWrapper];
diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix
index fb774476a2e2..bf0a347d14bd 100644
--- a/pkgs/applications/audio/mp3gain/default.nix
+++ b/pkgs/applications/audio/mp3gain/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w";
};
- buildInputs = [ unzip mpg123 ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ mpg123 ];
sourceRoot = ".";
diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix
new file mode 100644
index 000000000000..09256911f872
--- /dev/null
+++ b/pkgs/applications/audio/mpdevil/default.nix
@@ -0,0 +1,52 @@
+{ lib, fetchFromGitHub
+, python3Packages
+, gdk-pixbuf, glib, gobject-introspection, gtk3
+, intltool
+, wrapGAppsHook }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "mpdevil";
+ version = "1.1.1";
+
+ src = fetchFromGitHub {
+ owner = "SoongNoonien";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0l7mqv7ys05al2hds4icb32hf14fqi3n7b0f5v1yx54cbl9cqfap";
+ };
+
+ nativeBuildInputs = [
+ glib.dev gobject-introspection gtk3 intltool wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gdk-pixbuf glib
+ ];
+
+ propagatedBuildInputs = with python3Packages; [
+ beautifulsoup4 distutils_extra mpd2 notify-py pygobject3 requests
+ ];
+
+ postInstall = ''
+ glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
+ # Prevent double wrapping.
+ dontWrapGApps = true;
+ # Otherwise wrapGAppsHook do not pick up the dependencies correctly.
+ strictDeps = false;
+ # There aren't any checks.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A simple music browser for MPD";
+ homepage = "https://github.com/SoongNoonien/mpdevil";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ bloomvdomino ];
+ };
+}
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 0b46cffd19c8..5c7eb6b88cf1 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
- name = "mpg123-1.26.3";
+ name = "mpg123-1.26.4";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
- sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h";
+ sha256 = "sha256-CBmRVA33pmaykEmthw8pPPoohjs2SIq01Yzqp7WEZFQ=";
};
outputs = [ "out" "conplay" ];
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 6a5dbebeca01..b43b770b24f9 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -8,13 +8,13 @@
mkDerivation rec {
pname = "musescore";
- version = "3.6.1";
+ version = "3.6.2";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${version}";
- sha256 = "sha256-21ZI5rsc05ZWEyM0LeFr+212YViLYveZZBvVpskh8iA=";
+ sha256 = "sha256-GBGAD/qdOhoNfDzI+O0EiKgeb86GFJxpci35T6tZ+2s=";
};
patches = [
diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix
index 2fd1aeccd7a2..d770396a6ad3 100644
--- a/pkgs/applications/audio/ocenaudio/default.nix
+++ b/pkgs/applications/audio/ocenaudio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
- version = "3.9.6";
+ version = "3.10.2";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
- sha256 = "07r49133kk99ya4grwby3admy892mkk9cfxz3wh0v81aznhpw4jg";
+ sha256 = "sha256-mmo6/zc/3R8ptXfY01RKUOLgmDhWTHiYBMlGqpdMTAo=";
};
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index 8e6113a716d2..7f412d528db0 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.5";
+ version = "0.5.6";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
- sha256 = "sha256-8eAUg+vxpoDZ7AMMmvIPXypawPHgZCwYvVWTz6qc62s=";
+ sha256 = "sha256-F96ngrM0wUb0rNlIx8Mf/dKvyJnrNH6+Ab4WBup59Lg=";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
index 9b50b40a5bb5..feaf9ed70cfb 100644
--- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
+++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs";
};
- buildInputs = [ unzip puredata ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ puredata ];
unpackPhase = ''
unzip $src
diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
index 1eb6eb389317..811b8c2ee9aa 100644
--- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix
+++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7";
};
- buildInputs = [ unzip puredata ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ puredata ];
unpackPhase = ''
unzip $src
diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
index e5e67ec44dd4..7fd2adefce07 100644
--- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b";
};
- buildInputs = [ unzip puredata fftw ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ puredata fftw ];
unpackPhase = ''
mkdir source
diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix
index a26af9023a81..cb682f91b6d3 100644
--- a/pkgs/applications/audio/plexamp/default.nix
+++ b/pkgs/applications/audio/plexamp/default.nix
@@ -2,13 +2,13 @@
let
pname = "plexamp";
- version = "3.4.3";
+ version = "3.4.4";
name = "${pname}-${version}";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
- sha256 = "1rzhrc5yr5f6bxydgmcjwrg85vkbkn6lqj72512lyhq5gg7zmm1w";
+ sha256 = "1iz6qi12ljafb49l73rba5rwi5sdbd8ck5h2r6jiy260lgr2iiyk";
};
appimageContents = appimageTools.extractType2 {
@@ -32,7 +32,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
- changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/25";
+ changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/26";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index 71b05aabf524..6ca8d55bb249 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/pkgs/applications/audio/projectm/default.nix
@@ -13,13 +13,13 @@
mkDerivation rec {
pname = "projectm";
- version = "3.1.11";
+ version = "3.1.12";
src = fetchFromGitHub {
owner = "projectM-visualizer";
repo = "projectM";
rev = "v${version}";
- sha256 = "sha256-0aIaT+pzwPjI1nSo6C5SrHBXcrxIpSi6TFV2mgK5GvU=";
+ sha256 = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index 6a093c91daf8..72e8ba135dd3 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
- version = "1.28";
+ version = "1.29";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
- sha256 = "1c2x43f46l7556kl9y9qign0g6ywdkh7ywkzv6c9y63n68ph20x2";
+ sha256 = "sha256-xnw4UL30nUv/Ru6x/7d05gC0X9nREMdXO9QWBjVoIvo=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index b75af645bb38..25263f2a2cbd 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
# handle that.
mkDerivation rec {
- name = "qmmp-1.4.2";
+ name = "qmmp-1.4.4";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
- sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa";
+ sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 45f4e76bf5e7..fd9a9f00502d 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
}
else
releasePath
- else throw "Platform is not supported by Renoise";
+ else throw "Platform is not supported. Use instalation native to your platform https://www.renoise.com/";
buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ];
@@ -47,6 +47,16 @@ stdenv.mkDerivation rec {
mkdir $out/bin
ln -s $out/renoise $out/bin/renoise
+
+ # Desktop item
+ mkdir -p $out/share/applications
+ cp -r Installer/renoise.desktop $out/share/applications/renoise.desktop
+
+ # Desktop item icons
+ mkdir -p $out/share/icons/hicolor/{48x48,64x64,128x128}/apps
+ cp Installer/renoise-48.png $out/share/icons/hicolor/48x48/apps/renoise.png
+ cp Installer/renoise-64.png $out/share/icons/hicolor/64x64/apps/renoise.png
+ cp Installer/renoise-128.png $out/share/icons/hicolor/128x128/apps/renoise.png
'';
postFixup = ''
@@ -61,6 +71,9 @@ stdenv.mkDerivation rec {
--set-rpath $out/lib \
$path
done
+
+ substituteInPlace $out/share/applications/renoise.desktop \
+ --replace Exec=renoise Exec=$out/bin/renoise
'';
meta = {
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 4b06a99d4735..8f0a48081215 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -5,11 +5,11 @@
mkDerivation rec {
pname = "samplv1";
- version = "0.9.18";
+ version = "0.9.20";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
- sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4=";
+ sha256 = "sha256-9tm72lV9i/155TVweNwO2jpPsCJkh6r82g7Z1wCI1ho=";
};
nativeBuildInputs = [ qttools pkg-config ];
diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix
index 96433221e932..36ee6c12eef9 100644
--- a/pkgs/applications/audio/shortwave/default.nix
+++ b/pkgs/applications/audio/shortwave/default.nix
@@ -1,10 +1,11 @@
-{ lib
+{ stdenv
+, lib
, fetchFromGitLab
-, cargo
, dbus
, desktop-file-utils
, gdk-pixbuf
, gettext
+, gitMinimal
, glib
, gst_all_1
, gtk3
@@ -14,13 +15,12 @@
, openssl
, pkg-config
, python3
-, rustc
, rustPlatform
, sqlite
, wrapGAppsHook
}:
-rustPlatform.buildRustPackage rec {
+stdenv.mkDerivation rec {
pname = "shortwave";
version = "1.1.1";
@@ -32,18 +32,24 @@ rustPlatform.buildRustPackage rec {
sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld";
};
- cargoSha256 = "181699rlpr5dszc18wg0kbss3gfskxaz9lpxpgsc4yfb6ip89qnk";
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-0+KEbjTLecL0u/3S9FWf2r2h9ZrgcRTY163kS3NKJqA=";
+ };
nativeBuildInputs = [
- cargo
desktop-file-utils
gettext
+ gitMinimal
glib # for glib-compile-schemas
meson
ninja
pkg-config
python3
- rustc
+ rustPlatform.rust.cargo
+ rustPlatform.cargoSetupHook
+ rustPlatform.rust.rustc
wrapGAppsHook
];
@@ -62,12 +68,6 @@ rustPlatform.buildRustPackage rec {
gst-plugins-bad
]);
- # Don't use buildRustPackage phases, only use it for rust deps setup
- configurePhase = null;
- buildPhase = null;
- checkPhase = null;
- installPhase = null;
-
postPatch = ''
patchShebangs build-aux/meson/postinstall.py
'';
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 655a047a3a63..69aae9d6433d 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
-, glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
+, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
-, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa
+, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
}:
let
@@ -10,14 +10,14 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
- version = "1.1.46.916.g416cacf1";
+ version = "1.1.55.494.gca75f788";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "43";
+ rev = "45";
deps = [
alsaLib
@@ -34,12 +34,13 @@ let
freetype
gdk-pixbuf
glib
- gtk2
+ gtk3
libdrm
libgcrypt
libnotify
libpng
libpulseaudio
+ libxkbcommon
mesa
nss
pango
@@ -78,11 +79,10 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";
+ sha512 = "5d61a2d5b26be651620ab5d18d3a204d8d7b09dcec8a733ddc176c44cb43e9176c4350933ebe4498b065ba219113f3226c13bea9659da738fe635f41d01db303";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ squashfsTools ];
+ nativeBuildInputs = [ makeWrapper squashfsTools ];
dontStrip = true;
dontPatchELF = true;
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index eb7aac16c64a..fc13c8862cb3 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -35,13 +35,13 @@
mkDerivation rec {
pname = "strawberry";
- version = "0.8.5";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- sha256 = "sha256-+ZQ80J94Teqt4Gy6fw/pS7FwILK/TPehtJDy72Bdy1E=";
+ sha256 = "sha256-1aXHMvjLK5WiE0mut/a3ynuMfNHgPbUzAZdmaVJBDXQ=";
};
buildInputs = [
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index abc31d9f1801..ef7133630b5e 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = "unzip $src";
@@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.warmplace.ru/soft/sunvox/";
maintainers = with maintainers; [ puffnfresh ];
platforms = [ "i686-linux" "x86_64-linux" ];
+ # hash mismatch
+ broken = true;
};
}
diff --git a/pkgs/applications/audio/surge/default.nix b/pkgs/applications/audio/surge/default.nix
index 831253246947..ed15d49cfe03 100644
--- a/pkgs/applications/audio/surge/default.nix
+++ b/pkgs/applications/audio/surge/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "surge";
- version = "1.7.1";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "surge-synthesizer";
repo = pname;
rev = "release_${version}";
- sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s";
+ sha256 = "0lla860g7zgn9n1zgy14g4j72d5n5y7isyxz2w5xy2fzdpdg24ql";
leaveDotGit = true; # for SURGE_VERSION
fetchSubmodules = true;
};
@@ -20,9 +20,10 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge"
- substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace '"zenity' '"${zenity}/bin/zenity'
substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity'
substituteInPlace vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp --replace /usr/bin/zenity ${zenity}/bin/zenity
+ patchShebangs scripts/linux/emit-vector-piggy
+ patchShebangs scripts/linux/generate-lv2-ttl
'';
installPhase = ''
diff --git a/pkgs/applications/backup/pika-backup/borg-path.patch b/pkgs/applications/backup/pika-backup/borg-path.patch
new file mode 100644
index 000000000000..c4ed649ffc92
--- /dev/null
+++ b/pkgs/applications/backup/pika-backup/borg-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/borg/utils.rs b/src/borg/utils.rs
+index 4e30913..30d7d6f 100644
+--- a/src/borg/utils.rs
++++ b/src/borg/utils.rs
+@@ -223,7 +223,7 @@ impl BorgCall {
+ }
+
+ pub fn cmd(&self) -> Command {
+- let mut cmd = Command::new("borg");
++ let mut cmd = Command::new("@borg@");
+
+ cmd.args(self.args())
+ .stderr(Stdio::piped())
diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix
new file mode 100644
index 000000000000..7f7be99f9a24
--- /dev/null
+++ b/pkgs/applications/backup/pika-backup/default.nix
@@ -0,0 +1,77 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, rustPlatform
+, substituteAll
+, desktop-file-utils
+, meson
+, ninja
+, pkg-config
+, python3
+, wrapGAppsHook
+, borgbackup
+, dbus
+, gdk-pixbuf
+, glib
+, gtk3
+, libhandy
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pika-backup";
+ version = "0.2.2";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "World";
+ repo = "pika-backup";
+ rev = "v${version}";
+ sha256 = "16284gv31wdwmb99056962d1gh6xz26ami6synr47nsbbp5l0s6k";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ sha256 = "12ymjwpxx3sdna8w5j9fnwwfk8ynk9ziwl0lkpq68y0vyllln5an";
+ };
+
+ patches = [
+ (substituteAll {
+ src = ./borg-path.patch;
+ borg = "${borgbackup}/bin/borg";
+ })
+ ];
+
+ postPatch = ''
+ patchShebangs build-aux
+ '';
+
+ nativeBuildInputs = [
+ desktop-file-utils
+ meson
+ ninja
+ pkg-config
+ python3
+ wrapGAppsHook
+ ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
+
+ buildInputs = [
+ dbus
+ gdk-pixbuf
+ glib
+ gtk3
+ libhandy
+ ];
+
+ meta = with lib; {
+ description = "Simple backups based on borg";
+ homepage = "https://wiki.gnome.org/Apps/PikaBackup";
+ changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix
index 52914c1128a5..61ce54beec24 100644
--- a/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/pkgs/applications/blockchains/btcpayserver/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper,
- dotnetPackages, dotnetCorePackages, writeScript, bash
+ dotnetPackages, dotnetCorePackages
}:
let
@@ -15,13 +15,13 @@ in
stdenv.mkDerivation rec {
pname = "btcpayserver";
- version = "1.0.6.8";
+ version = "1.0.7.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1znmix9w7ahzyb933lxzqv6j8j5qycknq3gmnkakj749ksshql1b";
+ sha256 = "1pbq0kik29sx1lwlic7fvhnjhrpnlk94w53wmywqnlpgjscx8x8a";
};
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix
index 9065ff49cf85..b579fc8f7f89 100644
--- a/pkgs/applications/blockchains/btcpayserver/deps.nix
+++ b/pkgs/applications/blockchains/btcpayserver/deps.nix
@@ -19,6 +19,11 @@
version = "3.3.110.10";
sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38";
})
+ (fetchNuGet {
+ name = "BIP78.Sender";
+ version = "0.2.0";
+ sha256 = "0gyynn15rc1x9p2703ffi4jnbpbd0k3wvg839xrk2skmaw8nxamf";
+ })
(fetchNuGet {
name = "BTCPayServer.Hwi";
version = "1.1.3";
@@ -26,38 +31,43 @@
})
(fetchNuGet {
name = "BTCPayServer.Lightning.All";
- version = "1.2.4";
- sha256 = "1f4wgs8ijk1wmppz5lmas7l6m83szz57jyk6ak0dxhccdld9rdaj";
+ version = "1.2.7";
+ sha256 = "0jzmzvlpf6iba2fsc6cyi69vlaim9slqm2sapknmd7drl3gcn2zj";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.Charge";
- version = "1.2.1";
- sha256 = "0iv9frbr6xfxif3pnfd7c87y8mv31nqkdrnhvnaswrx43nv6s272";
+ version = "1.2.3";
+ sha256 = "1rdrwmijx0v4z0xsq4acyvdcj7hv6arfh3hwjy89rqnkkznrzgwv";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.CLightning";
- version = "1.2.1";
- sha256 = "14km69jzmnyqg19w27g6znml4z0xkm8l4j7rj0x36bw67cjmgahv";
+ version = "1.2.3";
+ sha256 = "02197rh03q8d0mv40zf67wp1rd2gbxi5l8krd2rzj84n267bcfvc";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.Common";
version = "1.2.0";
sha256 = "17di8ndkw8z0ci0zk15mcrqpmganwkz9ys2snr2rqpw5mrlhpwa0";
})
+ (fetchNuGet {
+ name = "BTCPayServer.Lightning.Common";
+ version = "1.2.2";
+ sha256 = "07xb7fsqvfjmcawxylriw60i73h0cvfb765aznhp9ffyrmjaql7z";
+ })
(fetchNuGet {
name = "BTCPayServer.Lightning.Eclair";
- version = "1.2.0";
- sha256 = "0w7nwsr0n2hrqak023xa294palsk3r96wlgw2ks8d3p5kxm8kskp";
+ version = "1.2.2";
+ sha256 = "03dymhwxb5s28kb187g5h4aysnz2xzml89p47nmwz9lkg2h4s73h";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.LND";
- version = "1.2.1";
- sha256 = "0ql4qyvz0rms6ls46pi3bgak3r6hj2c5ivnzahiq6cb84pbl61cr";
+ version = "1.2.4";
+ sha256 = "0qnj5rsp6hnybsr58zny9dfbsxksg1674q0z9944jwkzm7pcqyg4";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.Ptarmigan";
- version = "1.2.0";
- sha256 = "1yd6nhlssb9k08p5491knlwwjij9324ildir99sa9cp24rlq5nis";
+ version = "1.2.2";
+ sha256 = "17yl85vqfp7l12bv3f3w1b861hm41i7cfhs78gaq04s4drvcnj6k";
})
(fetchNuGet {
name = "BuildBundlerMinifier";
@@ -79,11 +89,6 @@
version = "15.0.5";
sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma";
})
- (fetchNuGet {
- name = "DBriize";
- version = "1.0.1.3";
- sha256 = "0rsm68hwq2ky8i6mv3ckdjkj4vjygnkgk3disva0skl3apk833dc";
- })
(fetchNuGet {
name = "DigitalRuby.ExchangeSharp";
version = "0.6.3";
@@ -666,13 +671,8 @@
})
(fetchNuGet {
name = "NBitcoin.Altcoins";
- version = "2.0.21";
- sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1";
- })
- (fetchNuGet {
- name = "NBitcoin";
- version = "5.0.33";
- sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a";
+ version = "2.0.28";
+ sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4";
})
(fetchNuGet {
name = "NBitcoin";
@@ -686,13 +686,13 @@
})
(fetchNuGet {
name = "NBitcoin";
- version = "5.0.60";
- sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v";
+ version = "5.0.67";
+ sha256 = "049marx1jwr7srlpqspimrqqgahh53gi2iyp7bpzn5npsbzh9v3h";
})
(fetchNuGet {
name = "NBitcoin";
- version = "5.0.68";
- sha256 = "0k275mbp9wannm10pqj4nv8agjc1f6hsrfhl0m6ax1apv81sfxcd";
+ version = "5.0.73";
+ sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1";
})
(fetchNuGet {
name = "NBitpayClient";
@@ -701,8 +701,8 @@
})
(fetchNuGet {
name = "NBXplorer.Client";
- version = "3.0.19";
- sha256 = "0nahfxdsryf5snjy87770m51v2jcry02lmb10ilsg4h2ig4pjdk4";
+ version = "3.0.20";
+ sha256 = "1mwa6ncmg5r6q7yn6skm9dgqm631c7r7nadcg9mvbw81113h0xxy";
})
(fetchNuGet {
name = "NETStandard.Library";
@@ -729,11 +729,6 @@
version = "10.0.3";
sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq";
})
- (fetchNuGet {
- name = "Newtonsoft.Json";
- version = "11.0.1";
- sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m";
- })
(fetchNuGet {
name = "Newtonsoft.Json";
version = "11.0.2";
@@ -921,8 +916,8 @@
})
(fetchNuGet {
name = "Selenium.WebDriver.ChromeDriver";
- version = "87.0.4280.8800";
- sha256 = "1zrizydlhjv81r1fa5g8wzxrx1cxly3ip7pargj48hdx419iblfr";
+ version = "88.0.4324.9600";
+ sha256 = "0jm8dpfp329xsrg69lzq2m6x9yin1m43qgrhs15cz2qx9f02pdx9";
})
(fetchNuGet {
name = "Selenium.WebDriver";
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 8c928cafa52a..2dea189dca40 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
- version = "2.23.0";
+ version = "2.24.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "0id9zbpfq3knv8qwkhplbl9pwrvdkn212pafwh4vpjbbp4yimhq5";
+ sha256 = "1xdqj825vwh3kg35v7568zr1jhvldb4wcazzgzcaawkr4qzfdb2n";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 9bf1ca586c26..5f430bc8869e 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -10,15 +10,13 @@
, randomx, zeromq, libgcrypt, libgpgerror
, hidapi, rapidjson, quirc
, trezorSupport ? true
-, libusb1 ? null
-, protobuf ? null
-, python3 ? null
+, libusb1
+, protobuf
+, python3
}:
with lib;
-assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
-
let
arch = if stdenv.isx86_64 then "x86-64"
else if stdenv.isi686 then "i686"
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index 41931bc9ec3d..3be8b908c7a2 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
homepage = "https://getmonero.org/";
license = licenses.bsd3;
platforms = platforms.all;
- maintainers = with maintainers; [ ehmry rnhmjoj ];
+ maintainers = with maintainers; [ rnhmjoj ];
};
}
diff --git a/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
deleted file mode 100644
index 5bbec1d39bea..000000000000
--- a/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b43f02f6..4470abbf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC)
-
- include_directories (${CMAKE_SOURCE_DIR})
-
--set(Boost_USE_STATIC_LIBS ON)
-+add_definitions(-DBOOST_LOG_DYN_LINK)
- set(Boost_USE_MULTITHREADED ON)
-
- if (BOOST_CUSTOM)
diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix
index 60ad51152f69..0e39587fabb3 100644
--- a/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/pkgs/applications/blockchains/nano-wallet/default.nix
@@ -1,28 +1,24 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL
-, qtbase}:
+, qtbase, python }:
stdenv.mkDerivation rec {
pname = "nano-wallet";
- version = "20.0";
+ version = "21.3";
src = fetchFromGitHub {
owner = "nanocurrency";
- repo = "raiblocks";
+ repo = "nano-node";
rev = "V${version}";
- sha256 = "12nrjjd89yjzx20d85ccmp395pl0djpx0x0qb8dgka8xfy11k7xn";
+ sha256 = "0f6chl5vrzdr4w8g3nivfxk3qm6m11js401998afnhz0xaysm4pm";
fetchSubmodules = true;
};
- # Use a patch to force dynamic linking
- patches = [
- ./CMakeLists.txt.patch
- ];
-
cmakeFlags = let
options = {
+ PYTHON_EXECUTABLE = "${python}/bin/python";
+ NANO_SHARED_BOOST = "ON";
BOOST_ROOT = boost;
- Boost_USE_STATIC_LIBS = "OFF";
RAIBLOCKS_GUI = "ON";
RAIBLOCKS_TEST = "ON";
Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
@@ -37,17 +33,15 @@ stdenv.mkDerivation rec {
buildInputs = [ boost libGL qtbase ];
buildPhase = ''
+ runHook preBuild
make nano_wallet
- '';
-
- # Move executables under bin directory
- postInstall = ''
- mkdir -p $out/bin
- mv $out/nano* $out/bin/
+ runHook postBuild
'';
checkPhase = ''
+ runHook preCheck
./core_test
+ runHook postCheck
'';
meta = {
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index 6a8bebf6178e..77601aa3d563 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -1,23 +1,25 @@
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper
-, cargo, pkg-config
-, bash, curl, coreutils, boost17x, db62, libsodium, libevent, utf8cpp, util-linux
+, fetchpatch, cargo, pkg-config, curl, coreutils, boost174, db62, hexdump
+, libsodium, libevent, utf8cpp, util-linux, withWallet ? true, withDaemon ? true
+, withUtils ? true
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
pname = "zcash";
- version = "4.1.1";
+ version = "4.3.0";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
- sha256 = "185zrw276g545np0niw5hlhlppkjbf5a1r4rwhnbaimdjdii2dil";
+ sha256 = "00pn1jw8j90y7i8nc92b51znz4gczphvdzbkbcjx63cf6vk7v4ks";
};
- cargoSha256 = "0qxr6asf8zsya0f1ri39z2cnfpjk96hgwjchz2c7j87vibbvg6dc";
+ cargoSha256 = "1rl9sjbvpfrv1mlyb04vw1935qx0kz9cs177xl7izdva1ixk9blr";
- nativeBuildInputs = [ autoreconfHook cargo makeWrapper pkg-config ];
- buildInputs = [ bash boost17x db62 libevent libsodium utf8cpp ];
+ nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];
+ buildInputs = [ boost174 libevent libsodium utf8cpp ]
+ ++ lib.optional withWallet db62;
# Use the stdenv default phases (./configure; make) instead of the
# ones from buildRustPackage.
@@ -26,6 +28,14 @@ rustPlatform.buildRustPackage rec {
checkPhase = "checkPhase";
installPhase = "installPhase";
+ patches = [
+ # See https://github.com/zcash/zcash/pull/5015
+ (fetchpatch {
+ url = "https://github.com/zcash/zcash/commit/a0ac27ec6ed434a233c7ad2468258f6e6e7e9688.patch";
+ sha256 = "0pmx1spql9p8vvpjgw7qf3qy46f4mh9ni16bq4ss1xz1z9zgjc4k";
+ })
+ ];
+
postPatch = ''
# Have to do this here instead of in preConfigure because
# cargoDepsCopy gets unset after postPatch.
@@ -34,10 +44,12 @@ rustPlatform.buildRustPackage rec {
configureFlags = [
"--disable-tests"
- "--with-boost-libdir=${lib.getLib boost17x}/lib"
+ "--with-boost-libdir=${lib.getLib boost174}/lib"
"CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp"
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
- ];
+ ] ++ lib.optional (!withWallet) "--disable-wallet"
+ ++ lib.optional (!withDaemon) "--without-daemon"
+ ++ lib.optional (!withUtils) "--without-utils";
enableParallelBuilding = true;
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index f43d3ca9be38..029501c7787a 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub
+{ mkDerivation, lib, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs
, libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd
}:
@@ -19,6 +19,12 @@ in mkDerivation {
patches = [
./sddm-ignore-config-mtime.patch
+ # Load `/etc/profile` for `environment.variables` with zsh default shell.
+ # See: https://github.com/sddm/sddm/pull/1382
+ (fetchpatch {
+ url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch";
+ sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58=";
+ })
];
postPatch =
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 6be6defd1982..678d6a0a3532 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -65,9 +65,9 @@ let
sha256 = sha256Hash;
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
makeWrapper
- unzip
];
installPhase = ''
cp -r . $out
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index fa4f7a40d96a..466dfb2516e1 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -9,18 +9,18 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
- version = "4.1.2.0"; # "Android Studio 4.1.2"
- build = "201.7042882";
- sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9";
+ version = "4.1.3.0"; # "Android Studio 4.1.3"
+ build = "201.7199119";
+ sha256Hash = "06xwgk7bwcmljka8xa56cfwwg858r0bl0xp2jb9hdnkwljf796gm";
};
betaVersion = {
- version = "4.2.0.21"; # "Android Studio 4.2 Beta 5"
- build = "202.7141121";
- sha256Hash = "05610xf9zz3yxarx6fv83fynlvqw9jl7h2a40yj3xx5kb7mzdnf2";
+ version = "4.2.0.22"; # "Android Studio 4.2 Beta 6"
+ build = "202.7188722";
+ sha256Hash = "0mzwkx1csx194wzg7dc1cii3c16wbmlbq1jdv9ly4nmdxlvc2rxb";
};
latestVersion = { # canary & dev
- version = "2020.3.1.7"; # "Android Studio Arctic Fox (2020.3.1) Canary 7"
- sha256Hash = "03gq4s8rmg7si0r2y1w26v9bjwhj6gzmrdny5z3j5pq8xsfjfqiw";
+ version = "2020.3.1.10"; # "Android Studio Arctic Fox (2020.3.1) Canary 10"
+ sha256Hash = "15xxyjjjy5pnimc66dcwnqb7z4lq7ll4fl401a3br5ca4d1hpgsj";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix
index dd8757d0c17b..5d435fa68231 100644
--- a/pkgs/applications/editors/apostrophe/default.nix
+++ b/pkgs/applications/editors/apostrophe/default.nix
@@ -13,14 +13,14 @@ let
in stdenv.mkDerivation rec {
pname = "apostrophe";
- version = "2.3";
+ version = "2.4";
src = fetchFromGitLab {
owner = "somas";
repo = pname;
domain = "gitlab.gnome.org";
rev = "v${version}";
- sha256 = "1ggrbbnhbnf6p3hs72dww3c9m1rvr4znggmvwcpj6i8v1a3kycnb";
+ sha256 = "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz";
};
nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils
@@ -32,9 +32,6 @@ in stdenv.mkDerivation rec {
postPatch = ''
patchShebangs --build build-aux/meson_post_install.py
-
- # get rid of unused distributed dependencies
- rm -r ${pname}/pylocales
'';
preFixup = ''
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index 5e3c1070ad2b..3c0f348ebd52 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
-, at-spi2-core
+, at-spi2-core, libdbusmenu
}:
let
@@ -11,7 +11,7 @@ let
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
- xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core
+ xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu
];
libPathNative = lib.makeLibraryPath packages;
diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix
index 2507cb13d7a1..59d1f11312dc 100644
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/pkgs/applications/editors/bluefish/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2
-, enchant, gucharmap, python, gnome3
+, enchant, gucharmap, python3, gnome3
}:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ];
buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2
- enchant gucharmap python ];
+ enchant gucharmap python3 ];
meta = with lib; {
description = "A powerful editor targeted towards programmers and webdevelopers";
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 2d9138bc32e3..efb3adaaa28a 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
- version = "1.122.3";
+ version = "1.129.3";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
- sha256 = "1h56hj433z0n4l97zl1cwkjv0qvz4qmvf469zzjzf1nj4zj8px2b";
+ sha256 = "1sg9wg6w3w0phrnnzpj7h2g22y0x7a3dl57djzydayxmg8fnn2ys";
};
postPatch = ''
@@ -91,7 +91,12 @@ stdenv.mkDerivation rec {
install -Dm644 setup/debfiles/cudatext-512.png -t $out/share/pixmaps
install -Dm644 setup/debfiles/cudatext.desktop -t $out/share/applications
'' + lib.concatMapStringsSep "\n" (lexer: ''
- install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib
+ if [ -d "CudaText-lexers/${lexer}" ]; then
+ install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib
+ else
+ echo "${lexer} lexer not found"
+ exit 1
+ fi
'') additionalLexers;
meta = with lib; {
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json
index 89f6dbc75fa8..a0044aaf833a 100644
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@@ -6,38 +6,38 @@
},
"ATBinHex-Lazarus": {
"owner": "Alexey-T",
- "rev": "2020.11.22",
- "sha256": "0dkvzm32ls03pfp40fxvsyrkfmyznc5yrj65cp4a8pp9kpkvzlz7"
+ "rev": "2021.02.13",
+ "sha256": "1p2r2q1al6rcsdbbg8ilm4xn6w48bj348khxdmpak7vfwx9741h8"
},
"ATFlatControls": {
"owner": "Alexey-T",
- "rev": "2021.01.12",
- "sha256": "1mavv3krs4srdp362prf4sncssxjh11la5j4lkx0wk5csrmd1pc9"
+ "rev": "2021.03.05",
+ "sha256": "1p2pzha5dd4p23j2bv6jxphj596dlb5v8ixjzg4x2zglz2hir6yz"
},
"ATSynEdit": {
"owner": "Alexey-T",
- "rev": "2021.01.19",
- "sha256": "0lpgfwljwh9mypscbpj5c7fivhza0hizjgqypval3v0209cx38d1"
+ "rev": "2021.03.16",
+ "sha256": "1sq9j2zaif019gl6nf391lyp8k9s38f5s6ci7k3z5v90hkz1dcql"
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
- "rev": "2021.01.17",
- "sha256": "14i4jdpbmh6sjpvbwipdvvmmqqw8wg592b34a9wdf2f9qxq2p4ly"
+ "rev": "2021.03.08",
+ "sha256": "0xvnvx4qzp6nxi912i4zlnal91k6vbcsyfbz05ib73sz68xqd5qv"
},
"EControl": {
"owner": "Alexey-T",
- "rev": "2021.01.12",
- "sha256": "107zyd65vc72fl4mvyirhv2a9m47l9bs6gwqiwar7hrn02zns6bq"
+ "rev": "2021.03.16",
+ "sha256": "159s1rpl829bmaa4bllqhjm8z0vji1ncsd6hw2s8z8hz28n905k8"
},
"ATSynEdit_Ex": {
"owner": "Alexey-T",
- "rev": "2020.10.04",
- "sha256": "0z66cm9pgdi7whqaim6hva4aa08zrr1881n1fal7lnz6wlla824k"
+ "rev": "2021.03.16",
+ "sha256": "1a4mxcwjm9naxh4piqm5y93w2xd5rgl0vcn108wy1pkr221agg2q"
},
"Python-for-Lazarus": {
"owner": "Alexey-T",
- "rev": "2021.01.16",
- "sha256": "07qv3x1cm3r12gxfnqzxly6nff39bghwwgxzl2lxi1qbpqhcs2l5"
+ "rev": "2021.02.18",
+ "sha256": "0fy6bmpdcl2aa8pb7zban6midkfwdj99x14hdghrv7cp8l4gcsg5"
},
"Emmet-Pascal": {
"owner": "Alexey-T",
@@ -46,8 +46,8 @@
},
"CudaText-lexers": {
"owner": "Alexey-T",
- "rev": "2021.01.16",
- "sha256": "13zyg0cm1c1662l3f7sy462pbc39l1cwm5214nx8ijngf8kgn2zh"
+ "rev": "2021.02.01",
+ "sha256": "051jnrhfpl9n5pgrssf68lj732zxhvjbvna4746ngmdyxvw6dqfd"
},
"bgrabitmap": {
"owner": "bgrabitmap",
diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix
index 25e620c51e4e..7ef81a4ebc04 100644
--- a/pkgs/applications/editors/edit/default.nix
+++ b/pkgs/applications/editors/edit/default.nix
@@ -2,39 +2,39 @@
stdenv.mkDerivation {
pname = "edit-nightly";
- version = "20160425";
+ version = "20180228";
src = fetchgit {
url = "git://c9x.me/ed.git";
- rev = "323d49b68c5e804ed3b8cada0e2274f1589b3484";
- sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v";
+ rev = "77d96145b163d79186c722a7ffccfff57601157c";
+ sha256 = "0rsmp7ydmrq3xx5q19566is9a2v2w5yfsphivfc7j4ljp32jlyyy";
};
- buildInputs = [
- unzip
- pkg-config
- ncurses
- libX11
- libXft
- cwebbin
+ nativeBuildInputs = [
+ unzip
+ pkg-config
+ cwebbin
];
- buildPhase = ''
+ buildInputs = [
+ ncurses
+ libX11
+ libXft
+ ];
+
+ preBuild = ''
ctangle *.w
- make
'';
installPhase = ''
- mkdir -p $out/bin/
- cp obj/edit $out/bin/edit
+ install -Dm755 obj/edit -t $out/bin
'';
meta = with lib; {
description = "A relaxing mix of Vi and ACME";
- homepage = "http://c9x.me/edit";
+ homepage = "https://c9x.me/edit";
license = licenses.publicDomain;
maintainers = [ maintainers.vrthra ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
-
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 1cc47d5ca856..a389cf539a91 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -4,10 +4,10 @@
elpaBuild {
pname = "ace-window";
ename = "ace-window";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ace-window-0.9.0.el";
- sha256 = "1m7fc4arcxn7fp0hnzyp20czjp4zx3rjaspfzpxzgc8sbghi81a3";
+ url = "https://elpa.gnu.org/packages/ace-window-0.10.0.tar";
+ sha256 = "1kfyf7za4zc41gf0k3rq8byvwkw7q5pxnyynh5i0gv686zrzak1i";
};
packageRequires = [ avy ];
meta = {
@@ -343,10 +343,10 @@
elpaBuild {
pname = "bnf-mode";
ename = "bnf-mode";
- version = "0.4.4";
+ version = "0.4.5";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/bnf-mode-0.4.4.tar";
- sha256 = "0acr3x96zknxs90dc9mpnrwiaa81883h36lx5q1lxfn78vjfw14x";
+ url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar";
+ sha256 = "0bj5ffqi54cdrraj5bp4v2cpbxjzly1p467dx1hzrlwv2b1svy2y";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -497,10 +497,10 @@
elpaBuild {
pname = "clipboard-collector";
ename = "clipboard-collector";
- version = "0.2";
+ version = "0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/clipboard-collector-0.2.el";
- sha256 = "19scspkxgm3b1jkv10jy6nw9gv1q6sfjys09l37mvsva3djxa1dl";
+ url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar";
+ sha256 = "09zxbivmc1zhcj8ksac2a0qpqh74rrx2slnj6cwz1n1nixn19743";
};
packageRequires = [ emacs ];
meta = {
@@ -591,10 +591,10 @@
elpaBuild {
pname = "company-math";
ename = "company-math";
- version = "1.3";
+ version = "1.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/company-math-1.3.tar";
- sha256 = "0fc9ms0s9w81sxp3qcfva3n3d2qys0pj19pnm621a6v1xdsc7i1l";
+ url = "https://elpa.gnu.org/packages/company-math-1.4.tar";
+ sha256 = "17p5ib65lg8lj2gwip5qgsznww96pch16pr16b41lls5dx4k6d6z";
};
packageRequires = [ company math-symbol-lists ];
meta = {
@@ -636,16 +636,16 @@
license = lib.licenses.free;
};
}) {};
- counsel = callPackage ({ elpaBuild, emacs, fetchurl, lib, swiper }:
+ counsel = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib, swiper }:
elpaBuild {
pname = "counsel";
ename = "counsel";
- version = "0.13.1";
+ version = "0.13.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/counsel-0.13.1.tar";
- sha256 = "0m4dmhj33cxaapn9lf7bj1r680gi2wd7cw9xlssjklzvic29a6db";
+ url = "https://elpa.gnu.org/packages/counsel-0.13.4.tar";
+ sha256 = "094zfapfn1l8wjf3djkipk0d9nks0g77sbk107pfsbr3skkzh031";
};
- packageRequires = [ emacs swiper ];
+ packageRequires = [ emacs ivy swiper ];
meta = {
homepage = "https://elpa.gnu.org/packages/counsel.html";
license = lib.licenses.free;
@@ -940,10 +940,10 @@
elpaBuild {
pname = "easy-kill";
ename = "easy-kill";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/easy-kill-0.9.3.tar";
- sha256 = "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb";
+ url = "https://elpa.gnu.org/packages/easy-kill-0.9.4.tar";
+ sha256 = "1pqqv4dhfm00wqch4wy3n2illsvxlz9r6r64925cvq3i7wq4la1x";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -1118,10 +1118,10 @@
elpaBuild {
pname = "elisp-benchmarks";
ename = "elisp-benchmarks";
- version = "1.9";
+ version = "1.11";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar";
- sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2";
+ url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.11.tar";
+ sha256 = "0s1mpapvcivy25zbhw6ghpg0ym23vb4dsrz876rl4z2rfyckxral";
};
packageRequires = [];
meta = {
@@ -1295,10 +1295,10 @@
elpaBuild {
pname = "flymake";
ename = "flymake";
- version = "1.0.9";
+ version = "1.1.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/flymake-1.0.9.el";
- sha256 = "0xm1crhjcs14iqkf481igbf40wj2ib3hjzinw1gn8w1n0462ymp6";
+ url = "https://elpa.gnu.org/packages/flymake-1.1.1.tar";
+ sha256 = "0lk2v34b59b24j3hsmi8d0v7fgpwcipv7ka9i88cdgjmjjmzgz5q";
};
packageRequires = [ eldoc emacs ];
meta = {
@@ -1714,10 +1714,10 @@
elpaBuild {
pname = "ivy";
ename = "ivy";
- version = "0.13.1";
+ version = "0.13.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ivy-0.13.1.tar";
- sha256 = "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx";
+ url = "https://elpa.gnu.org/packages/ivy-0.13.4.tar";
+ sha256 = "0qpza1c45mr8fcpnm32cck4v22fnzz1yb7kww05rzgq1k9iivx5v";
};
packageRequires = [ emacs ];
meta = {
@@ -1725,6 +1725,21 @@
license = lib.licenses.free;
};
}) {};
+ ivy-avy = callPackage ({ avy, elpaBuild, emacs, fetchurl, ivy, lib }:
+ elpaBuild {
+ pname = "ivy-avy";
+ ename = "ivy-avy";
+ version = "0.13.4";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/ivy-avy-0.13.4.tar";
+ sha256 = "1q5caxm4rnh4jy5n88dhkdbx1afsshmfki5dl8xsqbdb3y0zq7yi";
+ };
+ packageRequires = [ avy emacs ivy ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/ivy-avy.html";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-explorer = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
elpaBuild {
pname = "ivy-explorer";
@@ -1740,6 +1755,21 @@
license = lib.licenses.free;
};
}) {};
+ ivy-hydra = callPackage ({ elpaBuild, emacs, fetchurl, hydra, ivy, lib }:
+ elpaBuild {
+ pname = "ivy-hydra";
+ ename = "ivy-hydra";
+ version = "0.13.5";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/ivy-hydra-0.13.5.tar";
+ sha256 = "06rln9bnq5hli5rqlm47fb68b8llpqrmzwqqv4rn7mx3854i9a5x";
+ };
+ packageRequires = [ emacs hydra ivy ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/ivy-hydra.html";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-posframe = callPackage ({ elpaBuild
, emacs
, fetchurl
@@ -1854,10 +1884,10 @@
elpaBuild {
pname = "kiwix";
ename = "kiwix";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/kiwix-1.0.1.tar";
- sha256 = "1dly6pilf71hq3mra9kc63i6iynzkxjmp9gwy0rhnvhq4b4qr01d";
+ url = "https://elpa.gnu.org/packages/kiwix-1.0.3.tar";
+ sha256 = "061b816xp8ykqd56z0nvc69aql9y4mba42p6x6vc0j6gr9n3c1j6";
};
packageRequires = [ emacs request ];
meta = {
@@ -1899,10 +1929,10 @@
elpaBuild {
pname = "leaf";
ename = "leaf";
- version = "4.3.2";
+ version = "4.4.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/leaf-4.3.2.tar";
- sha256 = "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi";
+ url = "https://elpa.gnu.org/packages/leaf-4.4.4.tar";
+ sha256 = "1npg06zmy21kg2qsqgfm03l7vjib697i96awypcdb0hw5mvmc1a1";
};
packageRequires = [ emacs ];
meta = {
@@ -2019,10 +2049,10 @@
elpaBuild {
pname = "map";
ename = "map";
- version = "2.1";
+ version = "3.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/map-2.1.el";
- sha256 = "0ydz5w1n4vwhhzxxj003s7jv8n1wjijwfryk5z93bwhnr0cak0i0";
+ url = "https://elpa.gnu.org/packages/map-3.0.tar";
+ sha256 = "00wf8lgh1b1i5l838y6di8194rf5gf5djklkhmxj1nlikz66j2ls";
};
packageRequires = [ emacs ];
meta = {
@@ -2165,31 +2195,54 @@
license = lib.licenses.free;
};
}) {};
- modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ modus-operandi-theme = callPackage ({ elpaBuild
+ , emacs
+ , fetchurl
+ , lib
+ , modus-themes }:
elpaBuild {
pname = "modus-operandi-theme";
ename = "modus-operandi-theme";
- version = "0.12.0";
+ version = "0.13.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el";
- sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y";
+ url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.1.tar";
+ sha256 = "08l9qmhvxiscxn4mfb80x57mk4gfm5r0fs2l9c8i3gfzd4i3h091";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs modus-themes ];
meta = {
homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html";
license = lib.licenses.free;
};
}) {};
- modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ modus-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "modus-themes";
+ ename = "modus-themes";
+ version = "1.2.4";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/modus-themes-1.2.4.tar";
+ sha256 = "0wz6dgkrq4ryvj0kxnzqxwh4i8b9lw15d5dsazjpqa7gfwffpzp0";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/modus-themes.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ modus-vivendi-theme = callPackage ({ elpaBuild
+ , emacs
+ , fetchurl
+ , lib
+ , modus-themes }:
elpaBuild {
pname = "modus-vivendi-theme";
ename = "modus-vivendi-theme";
- version = "0.12.0";
+ version = "0.13.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.12.0.el";
- sha256 = "01f6z5xjnmki1k9m83jwva42lxidb31pdpwm4wpxjzxqmb96picn";
+ url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.1.tar";
+ sha256 = "0xz304zcc872c2zwnlm8ky0m18smf7bffiyj21ygghgclr7kgma1";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs modus-themes ];
meta = {
homepage = "https://elpa.gnu.org/packages/modus-vivendi-theme.html";
license = lib.licenses.free;
@@ -2384,6 +2437,21 @@
license = lib.licenses.free;
};
}) {};
+ ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "ob-haxe";
+ ename = "ob-haxe";
+ version = "1.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/ob-haxe-1.0.tar";
+ sha256 = "1x19b3aappv4d3mvpf01r505l1sfndbzbpr5sbid411g9g9k3rwr";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/ob-haxe.html";
+ license = lib.licenses.free;
+ };
+ }) {};
objed = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "objed";
@@ -2613,10 +2681,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/phps-mode-0.4.1.tar";
- sha256 = "11d1gsvvj26h9d7a28v87b022vbi3syzngn1x9v1d2g55iv01x38";
+ url = "https://elpa.gnu.org/packages/phps-mode-0.4.2.tar";
+ sha256 = "0ngh54jdh56563crgvf0r4gd6zfvhbkxs9prp12930gav8mdm3sh";
};
packageRequires = [ emacs ];
meta = {
@@ -2658,10 +2726,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
- version = "0.8.5";
+ version = "0.8.8";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/posframe-0.8.5.tar";
- sha256 = "0rls0rsj9clx4wd0gbdi5jzwyslparlf7phib649637gq6gs90ds";
+ url = "https://elpa.gnu.org/packages/posframe-0.8.8.tar";
+ sha256 = "1ij6brzcxv9viz37qafcinlfx5l20w8x8s6786r1rsda5n1xsmvd";
};
packageRequires = [ emacs ];
meta = {
@@ -2673,10 +2741,10 @@
elpaBuild {
pname = "project";
ename = "project";
- version = "0.5.3";
+ version = "0.5.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/project-0.5.3.el";
- sha256 = "0cpf69m41h8gfcqnq72h11925zdk35b7hw7bfy83xm83xwp12rxx";
+ url = "https://elpa.gnu.org/packages/project-0.5.4.tar";
+ sha256 = "0arjvhzzcf8b80w94yvpgfdlhsjwf5jk1r7vcai5a4dg3bi9cxyb";
};
packageRequires = [ emacs xref ];
meta = {
@@ -2718,10 +2786,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
- version = "3.2";
+ version = "3.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/pyim-3.2.tar";
- sha256 = "1rr9mq334dqf7mx1ii7910zkigw7chl63iws4sw0qsn014kjlb0a";
+ url = "https://elpa.gnu.org/packages/pyim-3.6.tar";
+ sha256 = "1fmbzh33s9xdvrfjhkqr9ydcqbiv8lr04k5idvbpc9vwjjjan5y0";
};
packageRequires = [ async emacs xr ];
meta = {
@@ -2729,6 +2797,21 @@
license = lib.licenses.free;
};
}) {};
+ pyim-basedict = callPackage ({ elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "pyim-basedict";
+ ename = "pyim-basedict";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.0.tar";
+ sha256 = "0h946wsnbbii32kl2kpv0k1kq118ymvpd5q1mphfsf126dz9sv78";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/pyim-basedict.html";
+ license = lib.licenses.free;
+ };
+ }) {};
python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "python";
@@ -3043,10 +3126,10 @@
elpaBuild {
pname = "rich-minority";
ename = "rich-minority";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/rich-minority-1.0.1.el";
- sha256 = "1pr89k3jz044vf582klphl1zf0r7hj2g7ga8j1dwbrpr9ngiicgc";
+ url = "https://elpa.gnu.org/packages/rich-minority-1.0.3.tar";
+ sha256 = "1w61qvx2rw6a6gmrm61080zghil95nzdv4w06c0pvyb62m4rwab0";
};
packageRequires = [ cl-lib ];
meta = {
@@ -3073,10 +3156,10 @@
elpaBuild {
pname = "rt-liberation";
ename = "rt-liberation";
- version = "2.2";
+ version = "2.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/rt-liberation-2.2.tar";
- sha256 = "01nkkrgygq5p5s0pfxpcn794jr6ln65ad809v9mvzz7972xw625s";
+ url = "https://elpa.gnu.org/packages/rt-liberation-2.3.tar";
+ sha256 = "0sqq5zfzx9dir6d6zvg7vj5v629b508bbxsp7j0sp21rr4fw9nn0";
};
packageRequires = [];
meta = {
@@ -3165,6 +3248,21 @@
license = lib.licenses.free;
};
}) {};
+ setup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "setup";
+ ename = "setup";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/setup-0.1.1.tar";
+ sha256 = "0z34m06lxw6xd6bxacm1h5cijamsksk4daf6fbzhd7kqmw3gbgqg";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/setup.html";
+ license = lib.licenses.free;
+ };
+ }) {};
shelisp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "shelisp";
@@ -3469,10 +3567,10 @@
elpaBuild {
pname = "swiper";
ename = "swiper";
- version = "0.13.1";
+ version = "0.13.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/swiper-0.13.1.tar";
- sha256 = "0k39pa89y0bfvdfqg3nc5pjq5mwxwimc4ma3z28vaf14zd38x9m1";
+ url = "https://elpa.gnu.org/packages/swiper-0.13.4.tar";
+ sha256 = "197pq2cvvskib87aky907wv2am55vilr7y5dabmmm07a8vr9py0v";
};
packageRequires = [ emacs ivy ];
meta = {
@@ -3737,10 +3835,10 @@
elpaBuild {
pname = "valign";
ename = "valign";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/valign-3.1.0.tar";
- sha256 = "0zx6p2nlvd4nkffj0myqv4hry8kgnhq45fcivfjzbfn62j2kp293";
+ url = "https://elpa.gnu.org/packages/valign-3.1.1.tar";
+ sha256 = "1nla0zfj0rxwhdjgnsy2c34wzrxfxiwl89cjb6aicyvfxninz7j0";
};
packageRequires = [ emacs ];
meta = {
@@ -3799,10 +3897,10 @@
elpaBuild {
pname = "verilog-mode";
ename = "verilog-mode";
- version = "2020.6.27.14326051";
+ version = "2021.2.2.263931197";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/verilog-mode-2020.6.27.14326051.el";
- sha256 = "194gn8cj01jb9xcl0qq3gq6mzxfdyn459ysb35fnib7pcnafm188";
+ url = "https://elpa.gnu.org/packages/verilog-mode-2021.2.2.263931197.tar";
+ sha256 = "0rizadyzrsprc3mw3h2ag4760wapx5gxzsr11rgrllwzzqwin1ks";
};
packageRequires = [];
meta = {
@@ -3952,10 +4050,10 @@
elpaBuild {
pname = "which-key";
ename = "which-key";
- version = "3.3.2";
+ version = "3.5.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar";
- sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb";
+ url = "https://elpa.gnu.org/packages/which-key-3.5.1.tar";
+ sha256 = "187cssvqpd0wj01rgd19pp1k6aj9m2n5fdqznkga6w1h6cb5cm2b";
};
packageRequires = [ emacs ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 0308f8d976bf..7ed43a82cc36 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "20210301";
+ version = "20210315";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-20210301.tar";
- sha256 = "0930km35lvbw89ifrqmcv96fjmp4fi12yv3spn51q27sfsmzqsrj";
+ url = "https://orgmode.org/elpa/org-20210315.tar";
+ sha256 = "128agds82kfmvxshzrs61802vgwlf2dsm79hq9x2bljrnvf8p14l";
};
packageRequires = [];
meta = {
@@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
- version = "20210301";
+ version = "20210315";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-plus-contrib-20210301.tar";
- sha256 = "11mwar5x848iwc1cdssr3vyx0amji840x6f0dmjpigngpcnj02m8";
+ url = "https://orgmode.org/elpa/org-plus-contrib-20210315.tar";
+ sha256 = "0dih4690pbbnwlphjnv1kgvsw43pkcgk41xjjiphy9sf7w9gr11j";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index a5707370ce04..3b9cb3f5288f 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -198,11 +198,11 @@
"repo": "ymarco/auto-activating-snippets",
"unstable": {
"version": [
- 20210217,
- 1642
+ 20210316,
+ 2027
],
- "commit": "5064c60408c3ab45693c5f516003141d56a57629",
- "sha256": "1m3rfagmwjc13fqcf0ysmzxy11j6b42h9bfc0yvnzchjdqgrm4db"
+ "commit": "af9d405a0f6ea078ae5b6567f664f4166f9f0ab0",
+ "sha256": "0jsnvnpvrrz5b4vh9jf3sjjm0pgh4241zw54bjkqa1ld9vvxwkxn"
},
"stable": {
"version": [
@@ -302,16 +302,16 @@
"repo": "abstools/abs-mode",
"unstable": {
"version": [
- 20201021,
- 958
+ 20210303,
+ 1059
],
"deps": [
"erlang",
"flymake",
"maude-mode"
],
- "commit": "9101779ef8861cb1f46d288946356e600359a4e0",
- "sha256": "08ymmf030gsk7hfvbjp302micnz2fa087i6f44l2i7yz592myhsz"
+ "commit": "5a766c734fcdf3b6c2ad88bbeb5c1cd79cdeaf44",
+ "sha256": "10ywyz0g4nnkap66xc7ynr9lq9z9jpsd0i3qwxs3fqkjwixwylz5"
},
"stable": {
"version": [
@@ -1507,14 +1507,14 @@
"repo": "mrkkrp/ace-popup-menu",
"unstable": {
"version": [
- 20190713,
- 1337
+ 20210318,
+ 1748
],
"deps": [
"avy-menu"
],
- "commit": "390f0711d2a42675980d8b531fd5dc396b85f24b",
- "sha256": "00va4glq9iibrfrnhinv8a7f5q0z7xvfyxnjf1rl4z770drz9j4n"
+ "commit": "9a2056c53faba0bd7b7f44fb3faabf4d34b8497f",
+ "sha256": "0i7a708y9x4xdny3ccqwngn4la5vg0539c7qk87d163gl61mbk7k"
},
"stable": {
"version": [
@@ -1739,11 +1739,11 @@
"repo": "codesuki/add-node-modules-path",
"unstable": {
"version": [
- 20180710,
- 2342
+ 20210305,
+ 312
],
- "commit": "f31e69ccb681f882aebb806ce6e9478e3ac39708",
- "sha256": "0p106bqmvdr8by5iv02bshm339qbrjcch2d15mrm4h3nav03v306"
+ "commit": "7d9be65b3be062842b7ead862dec15d6f25db4a2",
+ "sha256": "0za0jjba2qdpqdkcp5bch6ma8crf0vsi7bxj2rasn2icqgxyn89m"
},
"stable": {
"version": [
@@ -1918,8 +1918,8 @@
"annotation",
"eri"
],
- "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0",
- "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8"
+ "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299",
+ "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08"
},
"stable": {
"version": [
@@ -2378,11 +2378,11 @@
"repo": "domtronn/all-the-icons.el",
"unstable": {
"version": [
- 20210228,
- 1440
+ 20210313,
+ 2205
],
- "commit": "e685f7bc0808e23717637536ccffd79a40f0512d",
- "sha256": "1gbpl6yxb08jlawy4a98bl6ap888f5lx451fvd80z19gjabiad7f"
+ "commit": "a8c84176af7f3b97019423ebf3e02f983f4ebdf9",
+ "sha256": "07vscdf28wjjxsqaich694r94rf9iffjbqsvmqcq8h0qhqzfp2pq"
},
"stable": {
"version": [
@@ -2405,14 +2405,14 @@
"repo": "wyuenho/all-the-icons-dired",
"unstable": {
"version": [
- 20210211,
- 1226
+ 20210302,
+ 1410
],
"deps": [
"all-the-icons"
],
- "commit": "dd685166818b92470bcccb3e398f2d443f513e63",
- "sha256": "0yqcmy61ncybfjmbgyzcak9zn017lx6sd1s792y7g7l0klj1l2va"
+ "commit": "f401fe289cd93936e7747b1541aa98117b7ca96f",
+ "sha256": "1j5vbrsxy6blickkbblagyn6binvpalc2kxr7b438xhx8mgfbapv"
}
},
{
@@ -2504,15 +2504,15 @@
"repo": "seagle0128/all-the-icons-ivy-rich",
"unstable": {
"version": [
- 20210126,
- 1227
+ 20210303,
+ 1747
],
"deps": [
"all-the-icons",
"ivy-rich"
],
- "commit": "f2b48400b2da0bbf64e9c749fa4a5d332ab7c91f",
- "sha256": "1pdxz8arkhjc3sgg13s07fxlxxgq5y6amapg6daxafl1yvh99jrb"
+ "commit": "82877633366139cc858f243b9d7fdff83c1ebe62",
+ "sha256": "0jyqgp9hgxy8qc8hdzr6gi8vwxaw7sz9lg297rmqx6i1hnv247aq"
},
"stable": {
"version": [
@@ -2536,11 +2536,11 @@
"repo": "cryon/almost-mono-themes",
"unstable": {
"version": [
- 20200211,
- 2126
+ 20210306,
+ 1040
],
- "commit": "0b804c3ce21b9045d9b3093ef066d8269ac93990",
- "sha256": "0bp38fwrgw5hr8vyn9shy1am2d224nbyjymdar6i2gh191y43rpm"
+ "commit": "a7dc21078e25dab2b054d64e5b40ecce2878edb2",
+ "sha256": "12q9wddkynl90hl8vcy69hwl2g9flfz7r4fsp81bwc3vv130s7cg"
}
},
{
@@ -2761,25 +2761,25 @@
"repo": "DarwinAwardWinner/amx",
"unstable": {
"version": [
- 20210101,
- 1921
+ 20210305,
+ 118
],
"deps": [
"s"
],
- "commit": "b99149715266b5c2c48f5a0fc43716d36575da5f",
- "sha256": "14k1wrjfhawb18fyrfdv2lv0nwfpliw0f14hrhdb3kmshp5dsb3x"
+ "commit": "37f9c7ae55eb0331b27200fb745206fc58ceffc0",
+ "sha256": "0h1cxqqf0hixh25j679r57bq9dv0b20icf268wbnsim5xp88ngf8"
},
"stable": {
"version": [
3,
- 3
+ 4
],
"deps": [
"s"
],
- "commit": "394734e42aa8c43940df358e77a69248b42f2a9c",
- "sha256": "0ikjzs119g57cwh2v3jmy63lggqc0ib99q5gsl93slkk4y2ihavw"
+ "commit": "37f9c7ae55eb0331b27200fb745206fc58ceffc0",
+ "sha256": "0h1cxqqf0hixh25j679r57bq9dv0b20icf268wbnsim5xp88ngf8"
}
},
{
@@ -2790,8 +2790,8 @@
"repo": "pythonic-emacs/anaconda-mode",
"unstable": {
"version": [
- 20210210,
- 852
+ 20210304,
+ 1723
],
"deps": [
"dash",
@@ -2799,8 +2799,8 @@
"pythonic",
"s"
],
- "commit": "081f9d8f92f5b85b4f4ac01af7ee72582e689ce1",
- "sha256": "01z4npw03rkpjl0gmxgryvpkndwn43bgmda398dyzfv00pl5cdar"
+ "commit": "344727c9e07e108896740c782689bf3588edcce5",
+ "sha256": "020ix7jlzx3k9g9flwcq8ddgplby62gcfj28wxhq0pcngy8fnqjz"
},
"stable": {
"version": [
@@ -3146,8 +3146,8 @@
20200914,
644
],
- "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0",
- "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8"
+ "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299",
+ "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08"
},
"stable": {
"version": [
@@ -3644,11 +3644,11 @@
"repo": "waymondo/apropospriate-theme",
"unstable": {
"version": [
- 20191220,
- 2017
+ 20210316,
+ 2156
],
- "commit": "543341f0836b24e001375c530c4706e9345ec1e3",
- "sha256": "03917db85x4c2a1ba94wmik21wwnwf9xpz6wc0d0ay0zkkvqsn5g"
+ "commit": "22b394e3c9fc8db3a33c0f7fa36263ce44b0dec5",
+ "sha256": "1075f1gp9q210h4varmrj69g35wf8dygamzwsgfp38kqggdqdrxq"
},
"stable": {
"version": [
@@ -4212,8 +4212,8 @@
"let-alist",
"websocket"
],
- "commit": "d0414210c8eea8b80d293e79f2c8991948ab38cb",
- "sha256": "1h4zf81gizi5qf86zxdsm9v0l2rvbsmw6fbr92ggw2r55cnqqrib"
+ "commit": "c73367d8aa660f2b3c3f70ef5c39f5b502d60404",
+ "sha256": "07bw5fjmszxsvvcb0415zfawfmzqwj0qdvaigxrbb5rinazwb0pn"
},
"stable": {
"version": [
@@ -4278,8 +4278,8 @@
"deps": [
"auctex"
],
- "commit": "4e05ad8976f352e67d56d9a479a4a570dfe7ba73",
- "sha256": "0zgd7yascqn2dwjd20f1v962q7b24wibla5fwnbl9df1x36asqhs"
+ "commit": "9a15742a6de1285831329eac93f9e35752472685",
+ "sha256": "1ra2qkr9wadnx5aqg6paxk8w4h9m6c4jrl4b7zb5l6s1csw1llj1"
},
"stable": {
"version": [
@@ -5454,8 +5454,8 @@
"avy",
"embark"
],
- "commit": "0c7323953e628c8797270a37c0f639fe23092175",
- "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l"
+ "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd",
+ "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54"
},
"stable": {
"version": [
@@ -5665,11 +5665,11 @@
"url": "https://bitbucket.org/pdo/axiom-environment",
"unstable": {
"version": [
- 20210131,
- 2053
+ 20210312,
+ 2248
],
- "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f",
- "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218"
+ "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6",
+ "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7"
}
},
{
@@ -6144,14 +6144,26 @@
"repo": "dykstrom/basic-mode",
"unstable": {
"version": [
- 20180919,
- 1752
+ 20210316,
+ 1253
],
"deps": [
"seq"
],
- "commit": "812f078240f9de09491701853569335ba6d9b5ff",
- "sha256": "1492klgbkxb46x02kmhngccx4p9fmjvf6m4ay89j7pyaixvcqj8v"
+ "commit": "eaa5f24d2fb303d9e5d7de2a28c7c18b01532ab6",
+ "sha256": "1qvrf6mdrxzzd66888saddjrg5008rrgk0shg6vsyd39gk2bai22"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 4,
+ 3
+ ],
+ "deps": [
+ "seq"
+ ],
+ "commit": "0f135eb6581dabe69fff07f31082c8f53b4dcc70",
+ "sha256": "13z1b9wqhrx5c87ymc7jikvais7xd1jzx5qsnn03d6wmlm1y027z"
}
},
{
@@ -6502,11 +6514,11 @@
"repo": "DamienCassou/beginend",
"unstable": {
"version": [
- 20200526,
- 2005
+ 20210319,
+ 1039
],
- "commit": "9c7a92779d75f6fd985cf707ff5241bc98ccea6c",
- "sha256": "1r9033zlx2q2dk3bjz004flxdiw79qiswq0zqdjnlzwassvk0f35"
+ "commit": "94465a6c80827e7db9dc2384932b168a0d8254e4",
+ "sha256": "1jnx6fqmj0i4kxpw03znribqj5nlhyprwlmsbi63hjzbd51h83q3"
},
"stable": {
"version": [
@@ -6821,8 +6833,8 @@
"deps": [
"biblio-core"
],
- "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e",
- "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5"
+ "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345",
+ "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00"
},
"stable": {
"version": [
@@ -6862,16 +6874,16 @@
"repo": "cpitclaudel/biblio.el",
"unstable": {
"version": [
- 20200416,
- 307
+ 20210311,
+ 2310
],
"deps": [
"dash",
"let-alist",
"seq"
],
- "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e",
- "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5"
+ "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345",
+ "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00"
},
"stable": {
"version": [
@@ -6902,8 +6914,8 @@
"a",
"pdf-tools"
],
- "commit": "e086c59a14701cd041641b51c952fa704ee963df",
- "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
+ "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
+ "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
}
},
{
@@ -7598,8 +7610,8 @@
"repo": "josteink/bmx-mode",
"unstable": {
"version": [
- 20180929,
- 1132
+ 20210319,
+ 620
],
"deps": [
"cl-lib",
@@ -7607,8 +7619,8 @@
"dash",
"s"
],
- "commit": "30122e2a6bfb00834e18363e7909182b2701ce82",
- "sha256": "1kk98g2zlgz9s7r95986p7f9dch23r8dk78k2dgy07ifnqickvfx"
+ "commit": "6f008707efe0bb5646f0c1b0d6f57f0a8800e200",
+ "sha256": "0v6b8w4hy1yw713mkkh74b7c638hnk24ccbizfsylnk00ynrrza1"
}
},
{
@@ -7761,8 +7773,8 @@
"repo": "boogie-org/boogie-friends",
"unstable": {
"version": [
- 20210131,
- 8
+ 20210311,
+ 620
],
"deps": [
"cl-lib",
@@ -7771,8 +7783,8 @@
"flycheck",
"yasnippet"
],
- "commit": "8e906c41725bada06ff6e296af65cc463b028ea9",
- "sha256": "1cf94hw1b50qkzjc88gxi5qhpf3pkaj2w3glr8dldnh0l5z8vfxg"
+ "commit": "7193bef7d45232bdbd0b42cbd8893c15f68ad0e5",
+ "sha256": "1wj5wak9vwq0jp2kvw78g07h9k48qcx7jn61yfn1n9rzyigaxa8a"
}
},
{
@@ -7807,8 +7819,8 @@
"repo": "jyp/boon",
"unstable": {
"version": [
- 20210228,
- 1839
+ 20210305,
+ 1714
],
"deps": [
"dash",
@@ -7816,8 +7828,8 @@
"multiple-cursors",
"pcre2el"
],
- "commit": "58107055dadb735941537c90457753dbc1ea7005",
- "sha256": "15x29jpfkfizkl3b9ghmd1wclvigcm05y6l7i9c6clclwqzzm5zw"
+ "commit": "948501463dc2c63e133dda3b3ed28f4c81d24d26",
+ "sha256": "05q98rzhmkjmqfkhxy6g7qaybvgc6ypxvz5yiajwm8gcwwch2han"
},
"stable": {
"version": [
@@ -8011,20 +8023,20 @@
"repo": "jadler/brazilian-holidays",
"unstable": {
"version": [
- 20201109,
- 2052
+ 20210302,
+ 107
],
- "commit": "d9e685b21be4d5264cbee0cf74a846af380af4d4",
- "sha256": "10jp4yd2v7p8qg9x1s24z3ldbcf1klbxk1754vf25rrrzsxbb6il"
+ "commit": "68811fd5f3e9d9c0572995c3ca46ead2c35eb421",
+ "sha256": "03p3s5cxyi3dzi4ry9l30dwcs9a3rbg8ijsb595hj56al80k9y3q"
},
"stable": {
"version": [
2,
1,
- 1
+ 2
],
- "commit": "d9e685b21be4d5264cbee0cf74a846af380af4d4",
- "sha256": "10jp4yd2v7p8qg9x1s24z3ldbcf1klbxk1754vf25rrrzsxbb6il"
+ "commit": "68811fd5f3e9d9c0572995c3ca46ead2c35eb421",
+ "sha256": "03p3s5cxyi3dzi4ry9l30dwcs9a3rbg8ijsb595hj56al80k9y3q"
}
},
{
@@ -8792,8 +8804,8 @@
"alert",
"dash"
],
- "commit": "d4b1fc8f6d32eb69c066775558442dcc84208ba0",
- "sha256": "03qrfb2rzx2aqkzn7pm0z97l9sfv13znd1dndjjp5gdga0nr2wjz"
+ "commit": "eed66036d65b0ee26ce02371d14dce16a360acb4",
+ "sha256": "070p6mziljnyqzadbvwwmdv11gdmwi4h6q4rbnlp6dj91yiizksi"
}
},
{
@@ -9430,8 +9442,8 @@
"repo": "beacoder/call-graph",
"unstable": {
"version": [
- 20200402,
- 910
+ 20210311,
+ 831
],
"deps": [
"anaconda-mode",
@@ -9440,8 +9452,8 @@
"ivy",
"tree-mode"
],
- "commit": "2f47dcb65ed8dc5393df846b4175a4872e254c05",
- "sha256": "0xn8xk2x3ih22vlfjvnl6853ddpk57q70z9b0vwhjvwmi4idz7xp"
+ "commit": "3e5c510c51dd8b3491a32a1d67ad6268033348ee",
+ "sha256": "1jj8bj9a05dq0igxd2ddf0p9gc9sbffcn0wy3b26qlcspcvbpm1h"
},
"stable": {
"version": [
@@ -9696,27 +9708,26 @@
"repo": "cask/cask",
"unstable": {
"version": [
- 20210214,
- 1455
+ 20210319,
+ 2155
],
"deps": [
"ansi",
"cl-lib",
- "dash",
"epl",
"f",
"package-build",
"s",
"shut-up"
],
- "commit": "b81a3caa3fa3696fd385aa7072f8dc3a57408c4a",
- "sha256": "18w7kdr140s2km0mphznrlvx5w06q93q6z370wf4spkaflks6cjy"
+ "commit": "d1ee01ba3c06a62e784c3982ad6f50dbabf5c00f",
+ "sha256": "1fbk6b4jpg9sg886dbd66fmmwawrjzdw564d49822s6vnjhgs0wf"
},
"stable": {
"version": [
0,
8,
- 5
+ 6
],
"deps": [
"ansi",
@@ -9728,8 +9739,8 @@
"s",
"shut-up"
],
- "commit": "6fd81cdbe2c4c0a13798a6f2a1e1a6392a4bbc86",
- "sha256": "0wgm0f39diswmp1ccx5a0qwfpcy8hczzp8b2s7bpi5qb49al55d0"
+ "commit": "610894d57f467a55fb146ade4d6f8173e4e9579b",
+ "sha256": "1y12m5sjgws4a4bikr8d1ccysy55j7xx3cp1qii4pw62bkf9y2bq"
}
},
{
@@ -9908,8 +9919,8 @@
20200904,
1431
],
- "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac",
- "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak"
+ "commit": "cec99365fb3ad725c44514b918696ab153596b8d",
+ "sha256": "0q1vxcm163cs0pwnpnbjanpm49hshiyfx4m915i1wxsa7q9vvv67"
}
},
{
@@ -9957,8 +9968,8 @@
20200904,
1431
],
- "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac",
- "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak"
+ "commit": "cec99365fb3ad725c44514b918696ab153596b8d",
+ "sha256": "0q1vxcm163cs0pwnpnbjanpm49hshiyfx4m915i1wxsa7q9vvv67"
}
},
{
@@ -10092,15 +10103,15 @@
"repo": "ema2159/centaur-tabs",
"unstable": {
"version": [
- 20210226,
- 2246
+ 20210309,
+ 1822
],
"deps": [
"cl-lib",
"powerline"
],
- "commit": "5bbcc80778f6fd618f9f9c13dbc2c4f4ae1eef90",
- "sha256": "0clz8d6w9j1pbqd6vk4pkan5mhidxpr802wfkh3sfq77r44hhl8x"
+ "commit": "df972095135de90b47413190f61ec4f5af33f9f1",
+ "sha256": "0is51bc9zd9lr0y59md2ci4ddlfylp5jb9hwyll9r6j8gn3lrzza"
},
"stable": {
"version": [
@@ -10227,8 +10238,8 @@
20171115,
2108
],
- "commit": "79e9fb4d4b2b630f11d09c25fa560a0aacd68e53",
- "sha256": "05ysyvb318ilwamx9v82rv6wrh1xnv74i4flpm4x6db7apkh4kma"
+ "commit": "225c5e0cbd4704606eaafecb908bcd8daed4c54f",
+ "sha256": "1k8lx2s61kynhdv43czasp27vxb3bh6kmpsd0caxklk5n6m804rj"
},
"stable": {
"version": [
@@ -10273,6 +10284,40 @@
"sha256": "1hqyxsnnl6zbbbfbacipd226dvhc9zlfpxvacmn6g9iv7qfc8k53"
}
},
+ {
+ "ename": "cfn-mode",
+ "commit": "3ac23c6e0cceb3dd52519a9946dcd500936d8e97",
+ "sha256": "0yk7zlgbr0s3lc2b05g057g55x3rl767xd317hb162lg0d7d900v",
+ "fetcher": "gitlab",
+ "repo": "worr/cfn-mode",
+ "unstable": {
+ "version": [
+ 20210129,
+ 2037
+ ],
+ "deps": [
+ "f",
+ "s",
+ "yaml-mode"
+ ],
+ "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533",
+ "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 2
+ ],
+ "deps": [
+ "f",
+ "s",
+ "yaml-mode"
+ ],
+ "commit": "f3462930067de8f79c3d2e8da14d1924f609d3ab",
+ "sha256": "15ndphxz1jy4wbk52f6l3hk67b29844ljmmxd8wmahmi6c8nh3si"
+ }
+ },
{
"ename": "cframe",
"commit": "6e39555b2538cc8a955766c5533871396e8fe712",
@@ -10928,8 +10973,8 @@
"repo": "clojure-emacs/cider",
"unstable": {
"version": [
- 20210227,
- 546
+ 20210318,
+ 837
],
"deps": [
"clojure-mode",
@@ -10940,8 +10985,8 @@
"sesman",
"spinner"
],
- "commit": "ae03e85a0adcd301d220e7a500aec4d5a26fbfc7",
- "sha256": "0lv422m1ym6m894mbwcbv1145dnh6xk1fa242cngvlkg7j5xksh6"
+ "commit": "32835ea157212c500756ab625ddba4844b029c14",
+ "sha256": "0h9wwk72gp19fljiv9c18h5qz7ckddqhcvppm9k0vddxy7vhbhv5"
},
"stable": {
"version": [
@@ -11534,26 +11579,26 @@
"repo": "redguardtoo/cliphist",
"unstable": {
"version": [
- 20210129,
- 313
+ 20210301,
+ 748
],
"deps": [
"ivy"
],
- "commit": "3682a114e7651fc53155451afef0026f25f01f64",
- "sha256": "08ih6n6xmnv179z8lfvplgss3xvl9bxppcbj1qiqbvgnf2rqfpb3"
+ "commit": "1ef50459fa6044c4d571cec0009368948bcf5fc5",
+ "sha256": "0xba2gxwy1y8zl9nvga186873icvwfi0yan3qbw2vdkpzry5ifhk"
},
"stable": {
"version": [
0,
5,
- 6
+ 7
],
"deps": [
"ivy"
],
- "commit": "232ab0b3f6d502de61ebe76681a6a04d4223b877",
- "sha256": "0is772r0b7i8rvra9zb94g9aczv8b6q0dmdk67wbli5rv5drfjyq"
+ "commit": "1ef50459fa6044c4d571cec0009368948bcf5fc5",
+ "sha256": "0xba2gxwy1y8zl9nvga186873icvwfi0yan3qbw2vdkpzry5ifhk"
}
},
{
@@ -11639,8 +11684,8 @@
"repo": "clojure-emacs/clj-refactor.el",
"unstable": {
"version": [
- 20210216,
- 928
+ 20210311,
+ 1802
],
"deps": [
"cider",
@@ -11653,8 +11698,8 @@
"seq",
"yasnippet"
],
- "commit": "b24ce76acefe792975f00147c94b4dd784e65b80",
- "sha256": "1pyskl9xcqrk6r2zbp5i9402inngqps7wwb4nbdbrgi4di9b8in7"
+ "commit": "2c700d76d46c92b9bb068230b27047321868b1fe",
+ "sha256": "1rnjxsgm6fsip9njdmpmdmlga2isi6kh41xdnmwi3m34i1fzl6md"
},
"stable": {
"version": [
@@ -11901,11 +11946,11 @@
"repo": "clojure-emacs/clojure-mode",
"unstable": {
"version": [
- 20210226,
- 1336
+ 20210307,
+ 824
],
- "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63",
- "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by"
+ "commit": "b5c913af12ab3f55723fa3f57d373a4984655e8a",
+ "sha256": "1yc9cwibwh8kb97jjg1m46npafyvmss7msgma485829ddlaz8ipm"
},
"stable": {
"version": [
@@ -11931,8 +11976,8 @@
"deps": [
"clojure-mode"
],
- "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63",
- "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by"
+ "commit": "b5c913af12ab3f55723fa3f57d373a4984655e8a",
+ "sha256": "1yc9cwibwh8kb97jjg1m46npafyvmss7msgma485829ddlaz8ipm"
},
"stable": {
"version": [
@@ -12234,8 +12279,8 @@
20210104,
1831
],
- "commit": "569547f0c4931c1ce163146d95375ead258c09d9",
- "sha256": "02iwd0yrz9b9aw2v5vvqf43cscch85wgia386bkp4xaq2dd9h31s"
+ "commit": "9b4390e76be7e46f2031563642f0a1cae5dbf4e8",
+ "sha256": "19h3gf7b63b8xblyqrdlizzsjpjsg6xi0spp4fsymlhvxm5j2g1b"
},
"stable": {
"version": [
@@ -12243,10 +12288,10 @@
20,
0,
-1,
- 2
+ 5
],
- "commit": "498b7da2e471fd8ef5a41433505358df4f117044",
- "sha256": "1j7sray4d5zpfy6mkmhxg83scwjvkvr5q98nlaxsi01nir1ywxla"
+ "commit": "fab7fe7ef5a5462952297611c1dd668a603e3a36",
+ "sha256": "12v6v1hpw0ykkikj4qid3m4m7sb164rgpx6fxin4hvsm20pjcrd4"
}
},
{
@@ -13347,8 +13392,8 @@
"axiom-environment",
"company"
],
- "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f",
- "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218"
+ "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6",
+ "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7"
}
},
{
@@ -13518,8 +13563,8 @@
"repo": "tsukimizake/company-dcd",
"unstable": {
"version": [
- 20201009,
- 1328
+ 20210307,
+ 649
],
"deps": [
"cl-lib",
@@ -13529,8 +13574,8 @@
"popwin",
"yasnippet"
],
- "commit": "26245d79b5ab38314dd3a90877e425b18854bcab",
- "sha256": "1aqcbi99333qdyd27xw3x4n4r2q8yx0pb2wyzlff4qw1z90bpr9f"
+ "commit": "858500115d4f0285f963698ede9492f409a90e52",
+ "sha256": "1b7xcqx297dc5z1rc96gd7y9cx8a7yhgmqh5cpnwfb45hm5s71hs"
}
},
{
@@ -13846,14 +13891,14 @@
"repo": "mguzmann89/company-ipa",
"unstable": {
"version": [
- 20210222,
- 30
+ 20210307,
+ 1838
],
"deps": [
"company"
],
- "commit": "e9d919e0d15d3f986471d9d6cb46b67519f5088f",
- "sha256": "1bg8y35rfyqdbn9y85iriq10iskc3dq0jgv3zqqykp5mriy5y8gd"
+ "commit": "8634021cac885f53f3274ef6dcce7eab19321046",
+ "sha256": "0629my156zxjb3h636iirdd2rr58z3vsdinhq0w0y6f3544i05hx"
}
},
{
@@ -13965,19 +14010,18 @@
"repo": "leanprover/lean-mode",
"unstable": {
"version": [
- 20171102,
- 1454
+ 20210305,
+ 1705
],
"deps": [
"company",
"dash",
- "dash-functional",
"f",
"lean-mode",
"s"
],
- "commit": "15bee87dc4080b87c543964375b7ce162317ab6f",
- "sha256": "127b7ny5mr1y14yg54gy7an3lk3928w4y9a22295i4v4zgj704j4"
+ "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d",
+ "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj"
}
},
{
@@ -13998,42 +14042,6 @@
"sha256": "08cs8vd2vzpzk71wzcrghn48mzvbk6w2fzlb3if63klhfcfpngc8"
}
},
- {
- "ename": "company-lsp",
- "commit": "5125f53307c1af3d9ccf2bae3c25e7d23dfe1932",
- "sha256": "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l",
- "fetcher": "github",
- "repo": "tigersoldier/company-lsp",
- "unstable": {
- "version": [
- 20190612,
- 1553
- ],
- "deps": [
- "company",
- "dash",
- "lsp-mode",
- "s"
- ],
- "commit": "f921ffa0cdc542c21dc3dd85f2c93df4288e83bd",
- "sha256": "0dd2plznnnc2l1gqhsxnvrs8n1scp6zbcd4457wrq9z2f7pb5ig2"
- },
- "stable": {
- "version": [
- 2,
- 1,
- 0
- ],
- "deps": [
- "company",
- "dash",
- "lsp-mode",
- "s"
- ],
- "commit": "4eb6949f19892be7bf682381cde005791a48583a",
- "sha256": "1hy1x2w0yp5brm7714d1hziz3rpkywb5jp3yj78ibmi9ifny9vri"
- }
- },
{
"ename": "company-lua",
"commit": "c8191ab2aaa72041be46091e363d216cf1b73fde",
@@ -14187,8 +14195,8 @@
"company",
"native-complete"
],
- "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52",
- "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd"
+ "commit": "cf142e84eaa4dd91bc75d96a5d26dab5e38eba4c",
+ "sha256": "01li6c271v5j35chg3a8nl9az3bwq4hk1j8lfjq5a27p91iszpc0"
}
},
{
@@ -14325,8 +14333,8 @@
"company",
"phpactor"
],
- "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24",
- "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc"
+ "commit": "80788a817b0257363c1eee11a57cc0f873f0eef1",
+ "sha256": "1w4zxp6j77xd9qcz9skpj8jbl8ink1fgdd5f1dhx0486g882mi2l"
},
"stable": {
"version": [
@@ -14465,8 +14473,8 @@
"company",
"prescient"
],
- "commit": "b6da466e552a710a9362c73a3c1c265984de9790",
- "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall"
+ "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b",
+ "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n"
},
"stable": {
"version": [
@@ -14862,8 +14870,8 @@
"repo": "TommyX12/company-tabnine",
"unstable": {
"version": [
- 20210228,
- 435
+ 20210310,
+ 2247
],
"deps": [
"cl-lib",
@@ -14872,8 +14880,8 @@
"s",
"unicode-escape"
],
- "commit": "9226f887e6b5e86599283a3b0f0b1774eb34fd7e",
- "sha256": "0ljswlm745459grkp9dvdb49z5j53ki8xp2nxz7szcqa7xgpfs64"
+ "commit": "98e9e8b38b6ca289fbe265b0a7b62c7fe38ed0e2",
+ "sha256": "162ca70xwmdd8lsdawzpykd6kaqfljflaxy2nwjn8f89f80ih3fg"
}
},
{
@@ -15438,19 +15446,19 @@
"repo": "minad/consult",
"unstable": {
"version": [
- 20210228,
- 133
+ 20210318,
+ 1440
],
- "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b",
- "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9"
+ "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb",
+ "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9"
},
"stable": {
"version": [
0,
- 5
+ 6
],
- "commit": "947fa7067cb9a171251972f74b608d58df88faf5",
- "sha256": "0840hm6nk6yzz8yp8xqzdrycf7wwklxaxp10q0d30wpxwcrsw5c2"
+ "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe",
+ "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd"
}
},
{
@@ -15461,27 +15469,27 @@
"repo": "minad/consult",
"unstable": {
"version": [
- 20210226,
- 1214
+ 20210301,
+ 2310
],
"deps": [
"consult",
"flycheck"
],
- "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b",
- "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9"
+ "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb",
+ "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9"
},
"stable": {
"version": [
0,
- 5
+ 6
],
"deps": [
"consult",
"flycheck"
],
- "commit": "947fa7067cb9a171251972f74b608d58df88faf5",
- "sha256": "0840hm6nk6yzz8yp8xqzdrycf7wwklxaxp10q0d30wpxwcrsw5c2"
+ "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe",
+ "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd"
}
},
{
@@ -15492,15 +15500,15 @@
"url": "https://codeberg.org/jao/consult-notmuch.git",
"unstable": {
"version": [
- 20210220,
- 411
+ 20210312,
+ 2201
],
"deps": [
"consult",
"notmuch"
],
- "commit": "823c1fefc4a393039bced29d6b4c9a9d2aa720fe",
- "sha256": "0rhn1ha65xnrv03sn94ii5hl7ycpiz97xz13sxzchla64bwjqy75"
+ "commit": "67cf219fcce211237347a783ce6982402341d5fd",
+ "sha256": "03amdvzj09dsdjc7y6xvxn429by9vzyv5wghyairn9n0rf8c3r1m"
},
"stable": {
"version": [
@@ -15531,8 +15539,8 @@
"espotify",
"marginalia"
],
- "commit": "e714905b71993b6234a4aee6138d5b659605fe57",
- "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw"
+ "commit": "031e0e63a214dd089478d60e6d900c1a65851678",
+ "sha256": "0lmcihysjwmk22yhqmiby1sbj9f67lr6wpdzyz9df8wsmziva26v"
}
},
{
@@ -15848,28 +15856,28 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210226,
- 1256
+ 20210313,
+ 1108
],
"deps": [
"ivy",
"swiper"
],
- "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
- "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
0,
13,
- 2
+ 4
],
"deps": [
"ivy",
"swiper"
],
- "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
- "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
+ "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
+ "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
}
},
{
@@ -15949,15 +15957,15 @@
"repo": "hlissner/emacs-counsel-css",
"unstable": {
"version": [
- 20200331,
- 632
+ 20210310,
+ 452
],
"deps": [
"cl-lib",
"counsel"
],
- "commit": "6427dfcbda0d2bbd81db03f9d6b56b06c260ac02",
- "sha256": "1g8gz5mz2qclia64qmgw02h5ivywgn46d6djlr7vcdfyp774cf64"
+ "commit": "f7647b4195b9b4e97f1ee1acede6054ae38df630",
+ "sha256": "06xvyf9cnyq9zlp7rkq0a0h85yk967icifhg1pfhsz17za97yg94"
},
"stable": {
"version": [
@@ -16854,14 +16862,14 @@
"repo": "bbatsov/crux",
"unstable": {
"version": [
- 20210224,
- 910
+ 20210309,
+ 838
],
"deps": [
"seq"
],
- "commit": "a471cbed343dc5ff3a7150214726fe4ea0d3cf9e",
- "sha256": "152c7x1zj4rwq9bj9d8xw4znspfik2g7aigazq9smv12fkmzvzrr"
+ "commit": "20c07848049716a0e1aa2560e23b5f4149f2a74f",
+ "sha256": "0v65zy9f5wsq9vpibfccyyv6ww4fwgyx3vc38vz83j0c5b2c9r6n"
},
"stable": {
"version": [
@@ -16965,16 +16973,16 @@
"repo": "emacs-csharp/csharp-mode",
"unstable": {
"version": [
- 20210128,
- 841
+ 20210319,
+ 846
],
"deps": [
"tree-sitter",
"tree-sitter-indent",
"tree-sitter-langs"
],
- "commit": "09b4d57d020a97e1696e89baa6d9855ff5c86014",
- "sha256": "1k8qz7fivwr8jli5xid156m0cb00mszfxskblylh2rs2fswpg3la"
+ "commit": "d942b2762c72a0112f564af173fa66d2e63903cf",
+ "sha256": "0g6x85mayjd7cf9b19bsnrbmv32kf75318qx76csa3bqgq309whx"
},
"stable": {
"version": [
@@ -17211,11 +17219,11 @@
"repo": "raxod502/ctrlf",
"unstable": {
"version": [
- 20210227,
- 552
+ 20210308,
+ 25
],
- "commit": "4fd7d9dffbbf91dfcaccccb54c571f53c279e94f",
- "sha256": "076xjd8aia8q96hakcw861a4hmkfdx0aafhnkwww4fk7vv50b7qx"
+ "commit": "f9ef7a5e1b53f5ea9d486c93d47806e7d7f432ef",
+ "sha256": "0b5kyfr7qyv5id61d16r07k37yn690sx42rjnj2jk6q2rwib5zj7"
},
"stable": {
"version": [
@@ -17423,6 +17431,45 @@
"sha256": "0abpkcn2mcg0c4nycannwz9skvl6w7zgvbh1rx30qw0wl0i5svdm"
}
},
+ {
+ "ename": "current-word-highlight",
+ "commit": "02d60c15b4624735ba7e62f7c27a27487f1c7caf",
+ "sha256": "0jrcgvc60hzcnd66b0na4rd0lnr92pgfrkwwfvih2qjzxf5lpl72",
+ "fetcher": "github",
+ "repo": "kijimaD/current-word-highlight",
+ "unstable": {
+ "version": [
+ 20210228,
+ 1644
+ ],
+ "commit": "1d185f88ffe8d5ddc788772c40d37cf7e99a03ba",
+ "sha256": "1da11j754pgshfibj7w9wixhbzcjzn1iqifblflz2mqgny3nsisd"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 3
+ ],
+ "commit": "2d7c5547e4b0da361b1533d2ff30e3f62f4b682c",
+ "sha256": "1d1mz0j51i09g2fn25iik7wk0cc9i6ps8qviik73fy7ivvxjn0vp"
+ }
+ },
+ {
+ "ename": "curry-on-theme",
+ "commit": "a87da8c1522b826252193faa67c933a0eb3a3266",
+ "sha256": "08nfpzpg4q46p62l3kfxnfcmnmzjbi35vfgvlwl1aan29sw0ciid",
+ "fetcher": "github",
+ "repo": "mvarela/Curry-On-theme",
+ "unstable": {
+ "version": [
+ 20210308,
+ 1244
+ ],
+ "commit": "316fad72466cc5bd120a26cf235e9357117230a0",
+ "sha256": "11gkfccrynq3bk8qcbibinai9l497sij4b4zlizdf8qicjymmkd1"
+ }
+ },
{
"ename": "cursor-test",
"commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e",
@@ -17562,11 +17609,11 @@
"repo": "mrkkrp/cyphejor",
"unstable": {
"version": [
- 20210111,
- 841
+ 20210319,
+ 1423
],
- "commit": "037c0f2d0cd0e23acd2aacb621d7694080f5eef6",
- "sha256": "16jca2abc66vcf92js5m5489np7a4ymb27i78rkqwsrwcniz178j"
+ "commit": "cf580995f891e339a9485ba91d6cb81a2abd61e4",
+ "sha256": "1k0zwgr80figw0xkni2ih87bi566q3j4009dhicq4ldv2lyaybl9"
},
"stable": {
"version": [
@@ -17604,8 +17651,8 @@
20190111,
2150
],
- "commit": "9a761a637fce6a7b70735ae2248963d63e569e14",
- "sha256": "1f7zk28ywx47ig5fa6plq4415lbvd4972j4jjgb05qrg853zpca5"
+ "commit": "0ec9be57f5770869cb2fbe36e00bbde405b3b855",
+ "sha256": "16qiazp9p24nwaspdyi04jjlvpjpw291c40nvzlnqa2afdk5zwxn"
},
"stable": {
"version": [
@@ -17643,8 +17690,8 @@
20210119,
1853
],
- "commit": "80fad305784b21a818683010bc27d48302ec7110",
- "sha256": "0xz29ac8mpqkzgzdvhdv98aa4mrd6br4sr5fxwpb3kpidmqpa9h8"
+ "commit": "199743df55c6bfce3cdb08405bd8519768c8dfa9",
+ "sha256": "18jzrql5g2sd322w25phws7d1v8906lyc0ipn6cknlrv4pjmdazv"
},
"stable": {
"version": [
@@ -17771,8 +17818,8 @@
"repo": "jyp/dante",
"unstable": {
"version": [
- 20210221,
- 1947
+ 20210301,
+ 1738
],
"deps": [
"company",
@@ -17783,8 +17830,8 @@
"lcr",
"s"
],
- "commit": "7b1ab644214e03b86dcf7436fd22a65cce2fa858",
- "sha256": "177d9gk2fayx1nmd1gs6cf3mi35jakxn2di785qlhk7h5alai9hc"
+ "commit": "8741419333fb85ed2c1d71f5902688f5201b0a40",
+ "sha256": "1i4rz1lp78wzn8x9xgjar8h66csdkf5836ny8lwd68m7z5gh0w21"
},
"stable": {
"version": [
@@ -17812,8 +17859,8 @@
"repo": "emacs-lsp/dap-mode",
"unstable": {
"version": [
- 20210222,
- 419
+ 20210317,
+ 151
],
"deps": [
"bui",
@@ -17825,8 +17872,8 @@
"posframe",
"s"
],
- "commit": "aa15b9c49b7e09bb23f9a4ff7855122f0eb19976",
- "sha256": "02gws113c95567qp2zvxzqdhzapkcx9qnf00k2l0j52f7i0kz49b"
+ "commit": "ae395aa991d55eaddb2d2b80cd469089b9d19bb7",
+ "sha256": "1bxpnaj466n6sw00zc4fbw7i7nmkr0b6g8qvai6vql503lmm5f89"
},
"stable": {
"version": [
@@ -18013,11 +18060,11 @@
"repo": "bradyt/dart-mode",
"unstable": {
"version": [
- 20190827,
- 2102
+ 20210301,
+ 0
],
- "commit": "04fcd649f19d49390079fbf2920a10bf37f6a634",
- "sha256": "1rpdrq8w8vishjpakxvj20dgnnp2qksi1nrd0qllllb5sjyih56d"
+ "commit": "43975c92080e307c4bc14a4773a61195d2062fd9",
+ "sha256": "0zpjrq3cra6q6pd52skm11wj0j75v8cnamv504hlq4rgd87vkz2p"
},
"stable": {
"version": [
@@ -18079,11 +18126,11 @@
"repo": "magnars/dash.el",
"unstable": {
"version": [
- 20210228,
- 2221
+ 20210308,
+ 2109
],
- "commit": "6a086fccc95e96db2a819346d1eaf504654d9713",
- "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p"
+ "commit": "a17b6b5409825891423b3867cd7bea84852d6ddd",
+ "sha256": "0swjqkz5bq1f9vphjc6a1mwr7b3rlr8j9jg56f9gwj9gcv9mgjab"
},
"stable": {
"version": [
@@ -18158,8 +18205,8 @@
"deps": [
"dash"
],
- "commit": "6a086fccc95e96db2a819346d1eaf504654d9713",
- "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p"
+ "commit": "a17b6b5409825891423b3867cd7bea84852d6ddd",
+ "sha256": "0swjqkz5bq1f9vphjc6a1mwr7b3rlr8j9jg56f9gwj9gcv9mgjab"
},
"stable": {
"version": [
@@ -18182,14 +18229,14 @@
"repo": "emacs-dashboard/emacs-dashboard",
"unstable": {
"version": [
- 20210218,
- 1550
+ 20210306,
+ 1508
],
"deps": [
"page-break-lines"
],
- "commit": "411ff9ff9368f03d09097ad1d395d632fd4d9f40",
- "sha256": "0db8h1004ndn1b9cvh27fj5w5r6p83nmskcy983cw5qris02vrkx"
+ "commit": "1327fc36a0ba3136c7ffd3f1a1dda27f196631e6",
+ "sha256": "1zq3h3zgssvydxb9lmlcjn6wb2kri4jk96w43cl48myq27nsj5ri"
},
"stable": {
"version": [
@@ -18369,26 +18416,25 @@
"repo": "doublep/datetime",
"unstable": {
"version": [
- 20200621,
- 2103
+ 20210307,
+ 2203
],
"deps": [
"extmap"
],
- "commit": "c51eeb6df180f6c7d1676d1c0af78255bb0fdf95",
- "sha256": "11w32jnkc596ybbhqih5d4rbvqk50cc6yyc9759acnzlqfd188xs"
+ "commit": "276f9d4304180301edabc160d5d17f46532489a1",
+ "sha256": "0g6qgp6zvrbiaq6yfzqs3bmnry43xspp3ra3hm17x80b6izdsn90"
},
"stable": {
"version": [
0,
- 6,
- 6
+ 7
],
"deps": [
"extmap"
],
- "commit": "55297bf409f35dbc4bcd26b458b83e349ed11452",
- "sha256": "0a3q667pybpmsjkbgf6287jwgpnx8brp5314wb8zbczw6ncygnbi"
+ "commit": "276f9d4304180301edabc160d5d17f46532489a1",
+ "sha256": "0g6qgp6zvrbiaq6yfzqs3bmnry43xspp3ra3hm17x80b6izdsn90"
}
},
{
@@ -18529,8 +18575,8 @@
"ccc",
"cdb"
],
- "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac",
- "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak"
+ "commit": "cec99365fb3ad725c44514b918696ab153596b8d",
+ "sha256": "0q1vxcm163cs0pwnpnbjanpm49hshiyfx4m915i1wxsa7q9vvv67"
}
},
{
@@ -19128,11 +19174,19 @@
"repo": "lassik/emacs-desktop-mail-user-agent",
"unstable": {
"version": [
- 20210228,
- 1335
+ 20210309,
+ 1355
],
- "commit": "cf45bbbdd77b105df8d2a51e27b46d480ef992c8",
- "sha256": "0a18sfy9diwcrzhcykd7pnw990kmlfb60zdxbi0nmkyqzx5gj1hi"
+ "commit": "64d0a75491414b119e044ea8fdf771753491a8cc",
+ "sha256": "0gkx1sdplnnihfvqj2cwnfdcd08s13zxv3in3a68fi8w2l6cn7ki"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "commit": "6b665208bd9471cd8e4b4a81237b22c93a734528",
+ "sha256": "0i2j4i6xv3nrkc0v9ch2f6vw9hfg54ghwb1yqmdg2j7wqh3mm0hq"
}
},
{
@@ -19399,14 +19453,14 @@
"repo": "dgutov/diff-hl",
"unstable": {
"version": [
- 20210223,
- 2303
+ 20210318,
+ 1413
],
"deps": [
"cl-lib"
],
- "commit": "738c5d6a6bffe46b18249c77d59ae1d9e2d4d126",
- "sha256": "1dn77ysxi9h1yz7f3lpw2gv4jsbwgjqbci5b6blgk5zaqpkj8nrd"
+ "commit": "1af31fe1c177646ef7419c95b5d9c25655187ceb",
+ "sha256": "10gh6fl0j41ga612kk2yh82zh67hbd86rg640r1fk6gc0lcmwqih"
},
"stable": {
"version": [
@@ -19455,6 +19509,35 @@
"sha256": "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"
}
},
+ {
+ "ename": "diffpdf",
+ "commit": "6a084a863fa9c680997efc02fdf69c95bfc3fed3",
+ "sha256": "0bd7aj4fxb7rg88mlwxryli54p5mxrzir7zj23d7xcvf82wb4aqa",
+ "fetcher": "github",
+ "repo": "ShuguangSun/diffpdf.el",
+ "unstable": {
+ "version": [
+ 20210307,
+ 932
+ ],
+ "deps": [
+ "transient"
+ ],
+ "commit": "fdb37bb696aaec6cb2bcece3760866760e68edc4",
+ "sha256": "1ig7hk9vhlym91gzk4s6h2a6aj425nln29m6f2hpq9jh3qicgh9i"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
+ ],
+ "deps": [
+ "transient"
+ ],
+ "commit": "fdb37bb696aaec6cb2bcece3760866760e68edc4",
+ "sha256": "1ig7hk9vhlym91gzk4s6h2a6aj425nln29m6f2hpq9jh3qicgh9i"
+ }
+ },
{
"ename": "diffscuss-mode",
"commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
@@ -19619,6 +19702,24 @@
"sha256": "0k9m57zrdpabb6b34j9xy3cmcpzni89wq71pzzwgdi47p1n4r4vd"
}
},
+ {
+ "ename": "dime",
+ "commit": "227c61618e491c4da2b2b48daf7f1bebd2271558",
+ "sha256": "1pd464l4rj1nychdhmi23m98cfxkhvdpxhzni33j275jqin335mp",
+ "fetcher": "github",
+ "repo": "dylan-lang/dylan-emacs-support",
+ "unstable": {
+ "version": [
+ 20210319,
+ 1414
+ ],
+ "deps": [
+ "dylan"
+ ],
+ "commit": "c51cdb2d947494d8161a429134f9e9d23070a173",
+ "sha256": "0p4kp2gp27xgs4fw0cfd4qz06yp6kvn0k1pq902arzcxkrqz6lj3"
+ }
+ },
{
"ename": "diminish",
"commit": "1bfb4acb381cada46458cf60eae9b88d007294d5",
@@ -20282,11 +20383,11 @@
"repo": "vifon/dired-rifle.el",
"unstable": {
"version": [
- 20200308,
- 2358
+ 20210316,
+ 1452
],
- "commit": "99e4110c80d65ca43e2b0ec078e3202995e392d7",
- "sha256": "034qak8kdp7laz1ylqy9np5ajhwf741mdl0bj5kb7rrrsijxada6"
+ "commit": "cc1af692bbac651f5e5111d9ab1c0805989d65e5",
+ "sha256": "08csqjpwlqln2yk5by9zwh6jsl5kn33jy240d7a1py1d892b7xy8"
}
},
{
@@ -20351,26 +20452,26 @@
"repo": "jojojames/dired-sidebar",
"unstable": {
"version": [
- 20210227,
- 1046
+ 20210301,
+ 2158
],
"deps": [
"dired-subtree"
],
- "commit": "beea35753bc7b0df86f1a966989d626e0aa20481",
- "sha256": "16yi9k1lmmfyys2vgfjxpq3mh82g208c54b1nvm6cm8kqxy1x10q"
+ "commit": "92e7f77ec65c2089d75edb63ca312f55e3033be0",
+ "sha256": "0ad9r63jp257z95jb5537nbw64q6shdg4m5cmlx8asb7fp2wgsf8"
},
"stable": {
"version": [
0,
- 1,
+ 2,
0
],
"deps": [
"dired-subtree"
],
- "commit": "347f56480228c2aac97e14f4f5a762c4582d1323",
- "sha256": "1ahmvbwwdnjddn8qk6gq5gjfkvi1mvm13a968n7zpcpnphk6ygzb"
+ "commit": "cfc70763131ae668ff7b4884651f894fd102ffb6",
+ "sha256": "090dqaqyjmkzrz4szjpk1iip0bdvb0frp4l79393f8ki8w7c16c1"
}
},
{
@@ -20471,11 +20572,11 @@
"repo": "Boruch-Baum/emacs-diredc",
"unstable": {
"version": [
- 20210113,
- 1
+ 20210316,
+ 1841
],
- "commit": "491308566832a38c0c49a894f7b12b8ff62e7aa6",
- "sha256": "1pa9k4y74rihh8d4ij6pdnpybs0ib2vcxvjp7ldlndxqpfzxaxxd"
+ "commit": "dd945de3e0c66a164f003a96d473376b58fc6dc7",
+ "sha256": "1d4rdrc827nnb9p56la1sd9nzwjbxbnr8fgmcgardlz3qw97j3q1"
},
"stable": {
"version": [
@@ -20873,11 +20974,11 @@
"repo": "mnp/dispwatch",
"unstable": {
"version": [
- 20191130,
- 52
+ 20210305,
+ 342
],
- "commit": "6abf276b8d66df4996c7e98e7a40cbad8747beb7",
- "sha256": "17163bncxf11295bxzbmji09qy0klxzb0w8vxaazij6sxlk90mnm"
+ "commit": "03abbac89a9f625aaa1a808dd49ae4906f466421",
+ "sha256": "0wf3cyf5clkmh620q83x361nsnh60jhyfp90iqmabk3qs9x8amgs"
}
},
{
@@ -20952,14 +21053,14 @@
"repo": "unhammer/dix",
"unstable": {
"version": [
- 20200108,
- 1057
+ 20210312,
+ 1850
],
"deps": [
"cl-lib"
],
- "commit": "391832823f3f9835d957bc0224e122b376e5d825",
- "sha256": "1h7wxi1nk6051arzx8671sf3m178ci9gs3a78h4hp8z0jrz364kz"
+ "commit": "17f33f9a8bb50156261e10c045d54eb866ea84fa",
+ "sha256": "1aajxj4xvi8jpskfhh52n6388w1skj1y9aq2xdvwj7cizy57lqn2"
},
"stable": {
"version": [
@@ -20989,8 +21090,8 @@
"dix",
"evil"
],
- "commit": "391832823f3f9835d957bc0224e122b376e5d825",
- "sha256": "1h7wxi1nk6051arzx8671sf3m178ci9gs3a78h4hp8z0jrz364kz"
+ "commit": "17f33f9a8bb50156261e10c045d54eb866ea84fa",
+ "sha256": "1aajxj4xvi8jpskfhh52n6388w1skj1y9aq2xdvwj7cizy57lqn2"
},
"stable": {
"version": [
@@ -21315,8 +21416,8 @@
"repo": "Silex/docker.el",
"unstable": {
"version": [
- 20210208,
- 1500
+ 20210313,
+ 1943
],
"deps": [
"dash",
@@ -21326,8 +21427,8 @@
"tablist",
"transient"
],
- "commit": "0ca910badf86ff2e2dbfdf3f18819dd72a3198fc",
- "sha256": "0n21nv79z356wmz2sryq1r0f68ds2kwkgivi8z82lqrv9ndni2xv"
+ "commit": "ed0cdf08597ceb3a1f85e065d1b2b7aefd7e35ee",
+ "sha256": "1p0281gaj09jpavlkv24dzvf0gdh9r7ki1z53x0q49dm1fcday6m"
},
"stable": {
"version": [
@@ -21521,14 +21622,14 @@
"repo": "jcs-elpa/docstr",
"unstable": {
"version": [
- 20210222,
- 1525
+ 20210317,
+ 1612
],
"deps": [
"s"
],
- "commit": "6103a63385f5dfa828a3e759f3668f6be630cd54",
- "sha256": "0w69m94i2aqhfcwnvvpkkfrz1vd871rf0fn68jm123mxg1hc76ac"
+ "commit": "5ce0d758dbabb6c250f761fcb6754930cd793c2a",
+ "sha256": "0x9sxcp40p83isjc6smhg00n42056q5dsf0w71gglb1gc5rqhhl6"
},
"stable": {
"version": [
@@ -21670,16 +21771,16 @@
"repo": "seagle0128/doom-modeline",
"unstable": {
"version": [
- 20210227,
- 1747
+ 20210308,
+ 1212
],
"deps": [
"all-the-icons",
"dash",
"shrink-path"
],
- "commit": "1d8d8f885d1e2cdde31c256e11fce95a5b1fcce3",
- "sha256": "1irvb4s6y80jpi6lwr7fviwisfnv4nvay29dssbj66k2jqlwyjqz"
+ "commit": "0c2f2f0aa2911880b20b2a7e9a5ba20f19be7e24",
+ "sha256": "1i367ihnx3vspwx5ly7imj3rmx9f113jmf4i0siklxx0gb7r65n7"
},
"stable": {
"version": [
@@ -21723,14 +21824,14 @@
"repo": "hlissner/emacs-doom-themes",
"unstable": {
"version": [
- 20210226,
- 1558
+ 20210302,
+ 1549
],
"deps": [
"cl-lib"
],
- "commit": "35b86f228f76ef4f782562c9d3188769e433b17b",
- "sha256": "1xyykbygb0dajbwmfl50pq7azzhzis53nqg8az9c7rw1fd9bds9f"
+ "commit": "55f01ede533c800e6eb44ef5bdc2fe64d0400425",
+ "sha256": "19lhvf6gsvpadmx27lswdnl6y93sywn17d7yjbigva62lmr6yq0w"
},
"stable": {
"version": [
@@ -21832,14 +21933,14 @@
"repo": "zk-phi/download-region",
"unstable": {
"version": [
- 20200816,
- 1009
+ 20210306,
+ 415
],
"deps": [
"cl-lib"
],
- "commit": "0dca3b224649bba80a7e9ecbf1d1b6f6be962455",
- "sha256": "1yka864dzz8nxskcllqyxk04313hlyfc9a4p0apmk56q19fcpwgn"
+ "commit": "e0a721858a22896fa1d7f1d5689dd0878dbc58fa",
+ "sha256": "1hvnwqx61g4idqww1axs4xa3jxrd68lvipgvca22ybr2fpdny1xx"
}
},
{
@@ -22210,8 +22311,8 @@
"s",
"seq"
],
- "commit": "945f014d2a3618caa5031f6a8fbc8daf1a5754ae",
- "sha256": "13rdlp0j3f4kvms29akhrbr5l2y58x48jlzgaivi6qhhh2ggya8w"
+ "commit": "2a2a635e2b1d8243a41df0450e45fc8c75c6674b",
+ "sha256": "0kd8lkvaxqaz4ns8mwyczbbjyi68r3gicngnrichwlbl27am1zvm"
}
},
{
@@ -22237,11 +22338,11 @@
"repo": "jscheid/dtrt-indent",
"unstable": {
"version": [
- 20210214,
- 811
+ 20210307,
+ 2140
],
- "commit": "95c08dc4841b37902fad63a5a976d20e7a5ce3b0",
- "sha256": "11r68sh3yrrfib7pixnazispwsffrygmgplffrv8qq57xrqzyxih"
+ "commit": "37529fc7a98564164c87103e5107a6dca32b0e44",
+ "sha256": "1h2j25b6qayydl841zwbh73fw1177xgskrqm27cqmfx0bcpx7qq3"
},
"stable": {
"version": [
@@ -22319,16 +22420,16 @@
"repo": "jacktasia/dumb-jump",
"unstable": {
"version": [
- 20210227,
- 2100
+ 20210303,
+ 1714
],
"deps": [
"dash",
"popup",
"s"
],
- "commit": "782c2f9595d4288ac0f662d6620e23b8e33f0790",
- "sha256": "0sczljv4isgc6r4x46g876kivgq8ywr8z4gb4w1cis9bivrlbdsf"
+ "commit": "8bc195000e17ce6c72755a8fb55ca0fcd36add76",
+ "sha256": "0dc31yy4r41nwwv57dzbd6zgwddizqh4q4qagpqx645l509s7k7i"
},
"stable": {
"version": [
@@ -22372,17 +22473,17 @@
20210213,
757
],
- "commit": "a8c6ed8bb27af690955e51eabbef0382b7e2d41e",
- "sha256": "1c2r9njzm4l3rvhz0854qymf70dbmawfiahm0iaf5gva480kjv3a"
+ "commit": "a181b937c20c706f24ba1d17021593b0087ac574",
+ "sha256": "0g3s4g3lq42c6ca10idxlybwj3pici2v7r9aifyr5q15n2xgpizq"
},
"stable": {
"version": [
2,
8,
- 2
+ 4
],
- "commit": "6c471da57bea666267a8a63034aed57962f378b0",
- "sha256": "0b7mqcns4n614fq3p9kisffks3j2wzawxp4xccka7wgyn1q2pgr8"
+ "commit": "b6a3f66fb15378fc7170e94778f4d2c0b142ad92",
+ "sha256": "1p3r197cfb96675n2s7mbggndqspcxxmk9lkncirixm3k7ww36l1"
}
},
{
@@ -22423,11 +22524,11 @@
"repo": "integral-dw/dw-passphrase-generator",
"unstable": {
"version": [
- 20210226,
- 2028
+ 20210307,
+ 1834
],
- "commit": "66d92f592b35fd168f23d7c58d698a1ed2dcaa0a",
- "sha256": "1pfz1wwrdpdkd29309dryy7ficl1h1rfmgv7fbpy9p33vs9mdi9p"
+ "commit": "8c5b5c9d435de97ce9b95b9280feb1c0a57a60f8",
+ "sha256": "1793bwfn3c2f9dxcs8mmps3riy25y5baz1fvbpdr9pq19sl58bj5"
},
"stable": {
"version": [
@@ -22458,18 +22559,18 @@
}
},
{
- "ename": "dylan-mode",
- "commit": "94481ba3ebba6a99f11efab5a33e8bc6ea2d857a",
- "sha256": "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy",
+ "ename": "dylan",
+ "commit": "227c61618e491c4da2b2b48daf7f1bebd2271558",
+ "sha256": "0i0139jv2l9yw82hpmavw0jkzi3jxbz663xls604nhdggi7kqgzg",
"fetcher": "github",
- "repo": "dylan-lang/dylan-mode",
+ "repo": "dylan-lang/dylan-emacs-support",
"unstable": {
"version": [
- 20210227,
- 1818
+ 20210317,
+ 1405
],
- "commit": "fe965628177b0ee0bced7aa4fa42b6f5519c2d0e",
- "sha256": "17q91qnxbmbmsdnq9pnhn7q8wmq4bafl2z701783ka7nwf4z3ihl"
+ "commit": "c51cdb2d947494d8161a429134f9e9d23070a173",
+ "sha256": "0p4kp2gp27xgs4fw0cfd4qz06yp6kvn0k1pq902arzcxkrqz6lj3"
}
},
{
@@ -22865,28 +22966,28 @@
"repo": "masasam/emacs-easy-hugo",
"unstable": {
"version": [
- 20201205,
- 1908
+ 20210303,
+ 2352
],
"deps": [
"popup",
"request"
],
- "commit": "eacc00637380fbd9a2cc95821e91969ab75e76eb",
- "sha256": "12vlkbi15c54wpy0ak5mq89x354f86qk1y9g413bacafg5hxnn95"
+ "commit": "b3c9ca2a4e1d90013a7d990056d56cdf2bdf8e40",
+ "sha256": "1g48c2142yqs8ir2872q0zdl46qprx2mhhhd9jvcscakm4xv3cdf"
},
"stable": {
"version": [
3,
9,
- 50
+ 55
],
"deps": [
"popup",
"request"
],
- "commit": "eacc00637380fbd9a2cc95821e91969ab75e76eb",
- "sha256": "12vlkbi15c54wpy0ak5mq89x354f86qk1y9g413bacafg5hxnn95"
+ "commit": "b3c9ca2a4e1d90013a7d990056d56cdf2bdf8e40",
+ "sha256": "1g48c2142yqs8ir2872q0zdl46qprx2mhhhd9jvcscakm4xv3cdf"
}
},
{
@@ -23043,25 +23144,26 @@
"repo": "joostkremers/ebib",
"unstable": {
"version": [
- 20210219,
- 1115
+ 20210316,
+ 840
],
"deps": [
"parsebib"
],
- "commit": "32f97677bcfca2157583473af507c17e24f88f55",
- "sha256": "1wd63jiik98ya5z4bkdpnznw03c1qri9wb8nn0w9smia9888a640"
+ "commit": "1a23ce943991d5dce4a3c3d71d7b5d6b6f9897fe",
+ "sha256": "1wwgfgcr83mvjp9w1yizg49j85j92kd2fyiyyl6x9v8bs4xsn4pi"
},
"stable": {
"version": [
2,
- 29
+ 30,
+ 1
],
"deps": [
"parsebib"
],
- "commit": "dd18665862413fc1e1aea0becb318a9e6d281d10",
- "sha256": "1d0xnhdcsz2ysq145k2l0f2r4vb0pkai1v6wl6sfba7xi5fc323i"
+ "commit": "6a3351c4bee70517facf0eac457a17a1efc21144",
+ "sha256": "0ppp6a8qyllh1kjrh8fa8dvhv98wnq0w742mzh8gahkjbrsjdwcj"
}
},
{
@@ -23531,15 +23633,15 @@
"repo": "editorconfig/editorconfig-emacs",
"unstable": {
"version": [
- 20210221,
- 1617
+ 20210309,
+ 1345
],
"deps": [
"cl-lib",
"nadvice"
],
- "commit": "048c553999c90db0b6066b3ec647a79f4af9985d",
- "sha256": "0i1h0p78dm256y7gg2fzhks4x8hq89s5i5m39pipfwy4srkp3d19"
+ "commit": "9da2dab6474e1f735a2e9fbc7f26a553497c58c2",
+ "sha256": "0vpspvng3g0l2lqig3fvmxhxl4dqqs9zcyfgymjak03nfcilm394"
},
"stable": {
"version": [
@@ -23890,8 +23992,8 @@
"repo": "joaotavora/eglot",
"unstable": {
"version": [
- 20210227,
- 1019
+ 20210319,
+ 2010
],
"deps": [
"eldoc",
@@ -23900,8 +24002,8 @@
"project",
"xref"
],
- "commit": "92b0c5d385cc6f3593f60c2f93917fd8b2d44207",
- "sha256": "1rlgindfq43622gj8jsdkx3b590lhkr2zn18djyfd7g29j26b4wm"
+ "commit": "b4ffcf26fb392ed83f6c40bc9b62cbe54483119c",
+ "sha256": "1lpi249cv61892nl8a0asx6z4dzgyphrh4f5cn9awryyv8x166dx"
},
"stable": {
"version": [
@@ -24051,8 +24153,8 @@
"repo": "millejoh/emacs-ipython-notebook",
"unstable": {
"version": [
- 20210228,
- 15
+ 20210317,
+ 12
],
"deps": [
"anaphora",
@@ -24063,8 +24165,8 @@
"websocket",
"with-editor"
],
- "commit": "dfd968c0ae92f368a1861a15b54d4e4385271469",
- "sha256": "1cna661kqkw1sz1dz7pba06d9l581k6g3vjl99vrraq1f7k4afcl"
+ "commit": "147940d5d734b22e8dc6fc24d1d7423766ceed0c",
+ "sha256": "1yjdlghgsm4alrfp6nsfq2wi7ym66nbh1gx3dfsm5c1hr22lx9fq"
},
"stable": {
"version": [
@@ -24147,8 +24249,8 @@
"direx",
"spinner"
],
- "commit": "6eecf51e4c5e6f7d24ab90e8def34f6cea4eda52",
- "sha256": "0yk5bblrzf0bvnkzdkb0bzk8mfp4b6j84cjg60k3i4dyyp17h847"
+ "commit": "c24519e5b7fc1051257b0ec67fc6dec84d6b996e",
+ "sha256": "1qsps36cxvd8vpssr7xjydgmgq8zslck0j77920xm27wvfyrj2a2"
},
"stable": {
"version": [
@@ -24561,11 +24663,11 @@
"repo": "Mstrodl/elcord",
"unstable": {
"version": [
- 20200611,
- 2314
+ 20210316,
+ 1921
],
- "commit": "01b26d1af2f33a7c7c5a1c24d8bfb6d40115a7b0",
- "sha256": "1lj87zfcvmzm34rlq5s4y4x2nwckwg5qxlhlgl4qry3bf16bmkcf"
+ "commit": "d63021046b5ccb129669f1eae60ffc5f48338230",
+ "sha256": "1mf98cfnmb58bzwrfcg6v1k02mmzwzkig3h61qx779014ayq7v2h"
}
},
{
@@ -24634,11 +24736,11 @@
"repo": "casouri/eldoc-box",
"unstable": {
"version": [
- 20200316,
- 1956
+ 20210313,
+ 1824
],
- "commit": "c1a1b77ec0c7fff9ecf7122d10dcd16eebcd3829",
- "sha256": "1gg3gxw5ks4fds7lgl9mqxyb2qjrdsdwyyc183nfz6aq0m4w91yb"
+ "commit": "d4574ee392b9a8c537bec895be37468b600c25ac",
+ "sha256": "08fscq9amwqap741i25j7swb0gwzipkczqrvrgg3430jb3i0d663"
},
"stable": {
"version": [
@@ -24791,11 +24893,11 @@
"repo": "xwl/electric-spacing",
"unstable": {
"version": [
- 20200607,
- 1405
+ 20210313,
+ 1118
],
- "commit": "f039011edb922cdc56c1d2bd0e49bb4575c35ab3",
- "sha256": "1qfjk928y8bnx2ksciv0f0ackahj78x3qsr84m9qcvsvlg9cql5p"
+ "commit": "fb1437a3386f55440abdbe7c107c86e5b028bdc5",
+ "sha256": "00pmp1596p24i7pasmm080aly8ifinp9hbvia2l4jf8mbfg2ndlw"
}
},
{
@@ -24836,16 +24938,16 @@
"repo": "freesteph/elescope",
"unstable": {
"version": [
- 20210128,
- 1509
+ 20210312,
+ 1147
],
"deps": [
"ivy",
"request",
"seq"
],
- "commit": "cd3ce082e47c0c13cfce34e6f6957c2275f9416b",
- "sha256": "1pk8avmvvcxmv2gsl5n8g66jjwi92py1r9f5h9c0wjq0nrazapy1"
+ "commit": "36566c8c1f5f993f67eadc85d18539ff375c0f98",
+ "sha256": "0qpgkv0h71pkbm006ni56hbimmn9wfvciaicxylhpbcqkd7n1gc1"
},
"stable": {
"version": [
@@ -24893,11 +24995,11 @@
"repo": "skeeto/elfeed",
"unstable": {
"version": [
- 20210226,
- 258
+ 20210309,
+ 2323
],
- "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6",
- "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"
+ "commit": "e29c8b91450bd42d90041231f769c4e5fe5070da",
+ "sha256": "12m4q8zfmn6g0kz2v3vmch4kbmivxshj9xk58j2f3f3c8fvk6567"
},
"stable": {
"version": [
@@ -25012,26 +25114,26 @@
"repo": "sp1ff/elfeed-score",
"unstable": {
"version": [
- 20210226,
- 106
+ 20210302,
+ 2051
],
"deps": [
"elfeed"
],
- "commit": "6f99f4b9338c1a4e64885a799ac01c5b9e1d3a0a",
- "sha256": "1l7xmnn0j5h01416ras5fjb8x68ssq9hzkcz7p4539fgq5m0p9y0"
+ "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0",
+ "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd"
},
"stable": {
"version": [
0,
7,
- 4
+ 7
],
"deps": [
"elfeed"
],
- "commit": "8c895a786be96db4caab476d4db30202c51b6c70",
- "sha256": "0zkkrf7xl91c8156vq0njkqlbdx2949s8pmpy62w2xfl12f2wb98"
+ "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0",
+ "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd"
}
},
{
@@ -25049,8 +25151,8 @@
"elfeed",
"simple-httpd"
],
- "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6",
- "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"
+ "commit": "e29c8b91450bd42d90041231f769c4e5fe5070da",
+ "sha256": "12m4q8zfmn6g0kz2v3vmch4kbmivxshj9xk58j2f3f3c8fvk6567"
},
"stable": {
"version": [
@@ -25152,11 +25254,11 @@
"repo": "xuchunyang/elisp-demos",
"unstable": {
"version": [
- 20201128,
- 1009
+ 20210312,
+ 542
],
- "commit": "ed9578dfdbbdd6874d497fc9873ebfe09f869570",
- "sha256": "1268wk05j0xjqah56x7mwxvkqbaal8nal894imy42ls043ppvqd3"
+ "commit": "924b07d28e4f5b82f0e1377bcde800068f0a6d9d",
+ "sha256": "1pf37rlpmr8fjaxqk47p7dv84nksgh3r63m23jpi1g49myvwfzgi"
},
"stable": {
"version": [
@@ -25725,11 +25827,11 @@
"repo": "redguardtoo/elpa-mirror",
"unstable": {
"version": [
- 20210217,
- 2309
+ 20210304,
+ 1432
],
- "commit": "ceef14444a5d668ec2eac2954db9f3fa8971521c",
- "sha256": "0nngpjgc98hb3aq8cq32n3n6qr59jnmm5c81i105x0ard3025jgk"
+ "commit": "893368d222faf94d0be66da8ab581c47e1c04082",
+ "sha256": "115wrc8rnslyssh2fwd1mc0a6l942rkjzfv6c4509h95b2xfdp8p"
},
"stable": {
"version": [
@@ -26125,14 +26227,14 @@
"repo": "tecosaur/emacs-everywhere",
"unstable": {
"version": [
- 20210226,
- 1928
+ 20210303,
+ 1507
],
"deps": [
"cl-lib"
],
- "commit": "18e88648cdac06e62b9470bba03c7512c7f6ad00",
- "sha256": "0jwxiaf6ajiqd18albj1y7aqj2r6f5k813kbbwwhixqk1sjd4i0c"
+ "commit": "99997af93310128cc95b8ddceacb448daed2403a",
+ "sha256": "03syfvwsbrrmghdav3xkmpjvdfh1q1qr880a6f6wkri9iazg021g"
}
},
{
@@ -26143,20 +26245,20 @@
"repo": "knu/emacsc",
"unstable": {
"version": [
- 20210226,
- 555
+ 20210302,
+ 806
],
- "commit": "75761078047f2a28d74eab527b881128faaa4b75",
- "sha256": "190j3gmy9fwm5ibk1zpxczqakjl9vj1c7jc7aik88jrs3l711sn7"
+ "commit": "409fc548bb650c6e832b459c756b13de68147117",
+ "sha256": "04k3gnfhqy0i4vb03k1jr3r43sfpxs6dyx863gsgz6qnkkbqrydn"
},
"stable": {
"version": [
1,
3,
- 20210226
+ 20210302
],
- "commit": "75761078047f2a28d74eab527b881128faaa4b75",
- "sha256": "190j3gmy9fwm5ibk1zpxczqakjl9vj1c7jc7aik88jrs3l711sn7"
+ "commit": "409fc548bb650c6e832b459c756b13de68147117",
+ "sha256": "04k3gnfhqy0i4vb03k1jr3r43sfpxs6dyx863gsgz6qnkkbqrydn"
}
},
{
@@ -26422,11 +26524,11 @@
"repo": "oantolin/embark",
"unstable": {
"version": [
- 20210228,
- 10
+ 20210317,
+ 1432
],
- "commit": "0c7323953e628c8797270a37c0f639fe23092175",
- "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l"
+ "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd",
+ "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54"
},
"stable": {
"version": [
@@ -26445,15 +26547,15 @@
"repo": "oantolin/embark",
"unstable": {
"version": [
- 20210223,
- 1919
+ 20210308,
+ 1615
],
"deps": [
"consult",
"embark"
],
- "commit": "0c7323953e628c8797270a37c0f639fe23092175",
- "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l"
+ "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd",
+ "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54"
},
"stable": {
"version": [
@@ -26620,15 +26722,15 @@
"url": "https://git.savannah.gnu.org/git/emms.git",
"unstable": {
"version": [
- 20210228,
- 1251
+ 20210310,
+ 2103
],
"deps": [
"cl-lib",
"seq"
],
- "commit": "757043ba5c4d259df41f71fa6545a156de107ff8",
- "sha256": "05y09nr3l8xh8zg301jbl37yvm213cdq99gwjgzjs1vmlg8hp0nb"
+ "commit": "de0c4079ccdf3e17b722e3ddf2a275e66703b6bb",
+ "sha256": "1m334c1c1b6jfh100xfdxfqs89i5q1vw6dwjf4alydl0d08q91lc"
},
"stable": {
"version": [
@@ -26958,8 +27060,8 @@
"ht",
"seq"
],
- "commit": "cfa00865388809363df3f884b4dd554a5d44f835",
- "sha256": "0dw0wkirphwk7iv61b9z5qbg850nnyrivi6d2a80al1nmxkla2sg"
+ "commit": "1b726412f19896abf5e4857d4c32220e33400b55",
+ "sha256": "1g8dviwmwifzjvy9rvnhr9hsxwv37ksqikqccrbjyrpcyv57z1a5"
},
"stable": {
"version": [
@@ -27996,8 +28098,8 @@
20200914,
644
],
- "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0",
- "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8"
+ "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299",
+ "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08"
},
"stable": {
"version": [
@@ -28018,11 +28120,11 @@
"repo": "erlang/otp",
"unstable": {
"version": [
- 20210226,
- 1127
+ 20210315,
+ 1640
],
- "commit": "cd074622c9ed4c93d4f12ded40f2a36f91a26bc0",
- "sha256": "0pf06a9wgzqm49xqyivddc3r3mc2g6rf3s7zsnxnnsp5wjx4amw3"
+ "commit": "ebc70093c3be41cd86da18d2f188ce9648dc287c",
+ "sha256": "1gvb5p92gnl0lv48wqgls6jyhyzkd7kckklrsmn325s6vnqx72cd"
},
"stable": {
"version": [
@@ -28771,8 +28873,8 @@
20210224,
126
],
- "commit": "e714905b71993b6234a4aee6138d5b659605fe57",
- "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw"
+ "commit": "6a0a939ad2b07203e7c66a71b3a348ea06780cff",
+ "sha256": "1kjywdafjga5rd2way2vafwb0paz2fb2dkg1i5vlsggwhkl7dn6r"
}
},
{
@@ -28884,11 +28986,11 @@
"repo": "emacs-ess/ESS",
"unstable": {
"version": [
- 20210227,
- 2101
+ 20210318,
+ 748
],
- "commit": "4e9a04284d00232e20d44269195e2a524252ebe0",
- "sha256": "07k091b04gkmk8mdbqjvr9br19v8b0blrn5ywxvimyy3vwrxb87r"
+ "commit": "96ba4876753e7ac592a150f7ee1272747dc693d3",
+ "sha256": "0drfgzkdah2gpz7ahacbsqh5i1y4znrjgj4hmlwx4ycpcvvixbrz"
},
"stable": {
"version": [
@@ -29040,8 +29142,8 @@
"f",
"s"
],
- "commit": "d4e5a340b7bcc58c434867b97923094bd0680283",
- "sha256": "1yzki5f2k7gmj4m0871h4h46zalv2x71rbpa6glkfx7bm9kyc193"
+ "commit": "925cafd876e2cc37bc756bb7fcf3f34534b457e2",
+ "sha256": "1hb83cjr711yg4dphbyg9nfkdmd1a6bcsqw964nwdarflw6jss24"
}
},
{
@@ -29052,15 +29154,15 @@
"repo": "ShuguangSun/ess-view-data",
"unstable": {
"version": [
- 20201202,
- 1124
+ 20210315,
+ 1643
],
"deps": [
"csv-mode",
"ess"
],
- "commit": "9aeb18c0adc3e0fed75640a15500944becd5f3ef",
- "sha256": "0mspy45wrc42r7agksyzrlf6ir3wqnyx19hfikm0fh81bn23im2h"
+ "commit": "b642e2e7f4643eadee14c3599f9af399a2f714fe",
+ "sha256": "1dm4w0cj4sc1ybfmvgapwxlnkbywkfqs79gx13381k99ah0wbgji"
},
"stable": {
"version": [
@@ -29467,15 +29569,15 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20210228,
- 1738
+ 20210319,
+ 1539
],
"deps": [
"cl-lib",
"goto-chg"
],
- "commit": "a50a15f4057dd474f274464842381aa44e550b4d",
- "sha256": "05p49hgxqs650snivcnqrj3xlkaxcs1ki0k9ybf335nnxgdfg4zr"
+ "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357",
+ "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h"
},
"stable": {
"version": [
@@ -29669,15 +29771,15 @@
"repo": "emacs-evil/evil-collection",
"unstable": {
"version": [
- 20210209,
- 629
+ 20210319,
+ 1440
],
"deps": [
"annalist",
"evil"
],
- "commit": "334670e29d964c5f591f75ccbf52b7b5faf4daba",
- "sha256": "0drjcdclzy27ja95q9wp25p798nr2xwix2br50pp0s73rpfvv2sy"
+ "commit": "2d3d652cb51eeddc6c63ad9cbf251ecbd2f561d6",
+ "sha256": "15vdi5kynm1gczvdp006zyac96n1q25im9pf2q2n244ph9rzgc4v"
},
"stable": {
"version": [
@@ -30370,20 +30472,20 @@
"repo": "redguardtoo/evil-nerd-commenter",
"unstable": {
"version": [
- 20210208,
- 530
+ 20210311,
+ 37
],
- "commit": "2730820b9ccedf758c8a0428ee2c994c9fc415dd",
- "sha256": "1y5pn3rkqj8dxp5c7dsci621vnv6hsia74w2c1hybkkrjbka851q"
+ "commit": "b8ac35fe019df5602c31912f65303a3d8ad0066c",
+ "sha256": "1vyl8lidhjph7k86n8q09mwqpasaxsmwb8vi5i2gcd6klds9hg0d"
},
"stable": {
"version": [
3,
5,
- 3
+ 4
],
- "commit": "2730820b9ccedf758c8a0428ee2c994c9fc415dd",
- "sha256": "1y5pn3rkqj8dxp5c7dsci621vnv6hsia74w2c1hybkkrjbka851q"
+ "commit": "b8ac35fe019df5602c31912f65303a3d8ad0066c",
+ "sha256": "1vyl8lidhjph7k86n8q09mwqpasaxsmwb8vi5i2gcd6klds9hg0d"
}
},
{
@@ -30992,8 +31094,8 @@
"deps": [
"evil"
],
- "commit": "a50a15f4057dd474f274464842381aa44e550b4d",
- "sha256": "05p49hgxqs650snivcnqrj3xlkaxcs1ki0k9ybf335nnxgdfg4zr"
+ "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357",
+ "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h"
},
"stable": {
"version": [
@@ -31781,11 +31883,11 @@
"repo": "extemporelang/extempore-emacs-mode",
"unstable": {
"version": [
- 20200518,
- 1043
+ 20210316,
+ 205
],
- "commit": "7d0ca861e6b483be1f4a08e63c5ade9cd07b4799",
- "sha256": "0mw041jccyn8s1n3wpas397k2vrp9ryq9lfj16ipk9iqs4la6hlx"
+ "commit": "81d79cb2f611aef10fd7b05f6d47977a66502a08",
+ "sha256": "0bmpmiaz32id2yplfp2vmg3bjbfypg8k0mac8m7v6jclaprw3mal"
}
},
{
@@ -32283,19 +32385,19 @@
"repo": "WJCFerguson/emacs-faff-theme",
"unstable": {
"version": [
- 20210128,
- 2108
+ 20210303,
+ 1351
],
- "commit": "14a755f2f85e4db00978de76e1b7f404bfaa5e67",
- "sha256": "0nxijsqwq3kvszv3f3r4z0vskxp9f0zjq5mx0c6gzfc4q82lvqkr"
+ "commit": "2db5c559ca7356189083fb698a053bb1fee922a9",
+ "sha256": "1gk2dxmxv0sgkng7zgakz0gq9i0zh3wrwzsi785s338vjyypwm3g"
},
"stable": {
"version": [
2,
- 16
+ 17
],
- "commit": "e475a0805cd9f4bb0f7397e4d37b868f42d96c00",
- "sha256": "1djgrjnqapxjpnjly3mk9xna27fgl53rj257slz2dm3svhyghk2n"
+ "commit": "2db5c559ca7356189083fb698a053bb1fee922a9",
+ "sha256": "1gk2dxmxv0sgkng7zgakz0gq9i0zh3wrwzsi785s338vjyypwm3g"
}
},
{
@@ -32636,11 +32738,11 @@
"repo": "yqrashawn/fd-dired",
"unstable": {
"version": [
- 20201217,
- 547
+ 20210311,
+ 321
],
- "commit": "9fb966df33e7dde9360b8707f7a0197694f46abd",
- "sha256": "0gx84kr8fnx8nic3iasqjdi1z6g9shfghin13kh5i9h7d8n83xkq"
+ "commit": "7d18938751d047eef18bfb5975195419f0d1e2d3",
+ "sha256": "0182hg9iayz371lv4flls3gwsvn7bad027h5bn7lizvxxmgg3c6s"
},
"stable": {
"version": [
@@ -32758,11 +32860,11 @@
"repo": "technomancy/fennel-mode",
"unstable": {
"version": [
- 20201221,
- 543
+ 20210301,
+ 1703
],
- "commit": "bebc9dd58a845928114082c5ab4538b9869b4fc7",
- "sha256": "1dyzfxcaq0gzw957386gapha4kai2y0hv6qqpv7gs4hsilvr8vzb"
+ "commit": "b0ce628d253e0fcb648144081535bb8569532220",
+ "sha256": "0mqfwmqdfm3j4yjcmpwgikblsgfxmj15pagq537ds9yb960myxs1"
},
"stable": {
"version": [
@@ -33080,20 +33182,20 @@
"repo": "redguardtoo/find-file-in-project",
"unstable": {
"version": [
- 20210227,
- 546
+ 20210315,
+ 413
],
- "commit": "28de73305f6e83e7eebd5a3e7f7ec2f3c0f4985a",
- "sha256": "1afridpi5imdxcv257872nx3g4rgzzi1ld629774da3p36jpvdwl"
+ "commit": "50607615352df980dfe99d464f5fd0b3d70a4381",
+ "sha256": "120182fjalcamijwxvrfgf72f63k5jy1z9rl4arg80bx2682a0pj"
},
"stable": {
"version": [
6,
0,
- 1
+ 3
],
- "commit": "06df008d5dc9eaced2dfc216f934a79c66b5cd5e",
- "sha256": "1r9x8fzc2ccyqk24q3gijssa9jmfc6lsylayjh24xz42kdbw2kx8"
+ "commit": "6a6328c59a96b09e771cbcc5f4188f20d0757aca",
+ "sha256": "17l5b9nibhfymyndppq0avbdr2rh20527fyr1q5i1c3xkn4d6wvp"
}
},
{
@@ -33104,11 +33206,11 @@
"repo": "h/find-file-in-repository",
"unstable": {
"version": [
- 20210225,
- 1929
+ 20210301,
+ 2202
],
- "commit": "047eeeb8bf1958397a048d9ea8aaa43f80bac34e",
- "sha256": "1czhnf4ayiygkv3nxw3gdaimy2l6pfy308msnp2sjy0q719ygc79"
+ "commit": "10f5bd919ce35691addc5ce0d281597a46813a79",
+ "sha256": "0x8f0nw7w9lvkcrxgyfmdb8apw5da57lkbkxxysc8z5z6qzngqrr"
},
"stable": {
"version": [
@@ -33477,14 +33579,14 @@
"repo": "mrkkrp/fix-word",
"unstable": {
"version": [
- 20190713,
- 1338
+ 20210319,
+ 1414
],
"deps": [
"cl-lib"
],
- "commit": "46487e5279a3079730e2d7146ace7c8ad42371ac",
- "sha256": "0ij0bjrb446h07lyhflfk06sk802jylgdl11ib00r89zai8sq8r7"
+ "commit": "80cf4529915c34d2d39b4d3410781a19ef264e9f",
+ "sha256": "193bwcsj42w07aj8k32zl895yp0kw4rgrphn10dd81jv5411r6ij"
},
"stable": {
"version": [
@@ -33943,11 +34045,11 @@
"repo": "amake/flutter.el",
"unstable": {
"version": [
- 20201202,
- 138
+ 20210304,
+ 1341
],
- "commit": "696228a619f6078b16f9f77071112f6ad2a25c4e",
- "sha256": "0c39jgxykl1z74r0q7xiamwcnh6slidxrwg2f8ksdvyppgnqldwh"
+ "commit": "960b63576a13b7bd3495d0ad1883ed736873543b",
+ "sha256": "0l6k8ydrdbwms8va45jw88514ichj1qxbxkq8mfvvacb3rkb0gj0"
}
},
{
@@ -33965,8 +34067,8 @@
"flutter",
"flycheck"
],
- "commit": "696228a619f6078b16f9f77071112f6ad2a25c4e",
- "sha256": "0c39jgxykl1z74r0q7xiamwcnh6slidxrwg2f8ksdvyppgnqldwh"
+ "commit": "960b63576a13b7bd3495d0ad1883ed736873543b",
+ "sha256": "0l6k8ydrdbwms8va45jw88514ichj1qxbxkq8mfvvacb3rkb0gj0"
}
},
{
@@ -34076,8 +34178,8 @@
"repo": "flycheck/flycheck",
"unstable": {
"version": [
- 20201228,
- 2104
+ 20210314,
+ 2015
],
"deps": [
"dash",
@@ -34085,8 +34187,8 @@
"pkg-info",
"seq"
],
- "commit": "01396a5eff9fa494285e0d3139838231c05e3948",
- "sha256": "0s740sbchr84yddcg0zbs4v4s52smy178f8fq5y07i3vsdnfly8m"
+ "commit": "6e6ac0c50f85170ed47bf1711bc761941b69b325",
+ "sha256": "1rp53zpd8mi16r7n66hxy3jv966rr3yw9v3d8dsq9lnnyly9llny"
},
"stable": {
"version": [
@@ -34247,6 +34349,36 @@
"sha256": "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy"
}
},
+ {
+ "ename": "flycheck-cfn",
+ "commit": "3ac23c6e0cceb3dd52519a9946dcd500936d8e97",
+ "sha256": "16ls9xbg7s8c4li51zvv9frlinrwflp6blgxw5psnvvdrm6gavi5",
+ "fetcher": "gitlab",
+ "repo": "worr/cfn-mode",
+ "unstable": {
+ "version": [
+ 20201120,
+ 2307
+ ],
+ "deps": [
+ "flycheck"
+ ],
+ "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533",
+ "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "flycheck"
+ ],
+ "commit": "b4ffad5cabea7e858c66dc824d545653b1cdcb70",
+ "sha256": "1la7qhczg9bgs1klinwj21mjywsg1nm3sxd5cyc09bxjzbflzzz6"
+ }
+ },
{
"ename": "flycheck-checkbashisms",
"commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228",
@@ -34775,15 +34907,15 @@
"repo": "flycheck/flycheck-eldev",
"unstable": {
"version": [
- 20210228,
- 2234
+ 20210305,
+ 2231
],
"deps": [
"dash",
"flycheck"
],
- "commit": "d222ce6a8e59385ffeeee7c3a36ee41cf9a8561e",
- "sha256": "0lipvy48ilc8cxkzk64j7384rx0w57hjcgxbn9dp31c8i5pygj6y"
+ "commit": "2ed17db874da51fba3d2991a1e05cf375fca9619",
+ "sha256": "0kzcx6sjwxzamal0za2vnll77kpvshr12zwxc9czxvc9vpckf921"
},
"stable": {
"version": [
@@ -35758,24 +35890,6 @@
"sha256": "072jc0vrjg531ydk5bjrjpmbvdk81yw75jqjnvb7alkib6jn5f9r"
}
},
- {
- "ename": "flycheck-perl6",
- "commit": "2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f",
- "sha256": "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4",
- "fetcher": "github",
- "repo": "hinrik/flycheck-perl6",
- "unstable": {
- "version": [
- 20180509,
- 2201
- ],
- "deps": [
- "flycheck"
- ],
- "commit": "b804702305d7a6e26f762ff98cfdeec2e9dd4cb7",
- "sha256": "0gys38rlx9lx35bia6nj7kfhz1v5xfrirgf8adwk7b2hfjazrsib"
- }
- },
{
"ename": "flycheck-pest",
"commit": "f0c1b89d79456ecaa22b95f3c292799f5d1aa133",
@@ -35980,15 +36094,15 @@
"repo": "alexmurray/flycheck-posframe",
"unstable": {
"version": [
- 20210217,
- 327
+ 20210316,
+ 618
],
"deps": [
"flycheck",
"posframe"
],
- "commit": "24fd9b3d81eab8dd850c504ae46a5c5f11a46ee0",
- "sha256": "0dv9bkagzk61r32i9231zpndizv6avpg8n84nrnh8yyl0w4hzldv"
+ "commit": "8f60c9bf124ab9597d681504a73fdf116a0bde12",
+ "sha256": "0qh9hzvs95jvfrspglzkwhfq6a5pinab94bbh5vzkg8jc2fq6drf"
}
},
{
@@ -36139,6 +36253,24 @@
"sha256": "0f58127197q6yfylz53nigyn7v91pcsdd91ywfgq5lrl0f5fvmdy"
}
},
+ {
+ "ename": "flycheck-raku",
+ "commit": "a285426ee792eab3138ceb012f3825d91a7c85b1",
+ "sha256": "13il1cl60rv18xnp381z57l4nv4jc4isavjsqbrrqpyjpi81c3g8",
+ "fetcher": "github",
+ "repo": "Raku/flycheck-raku",
+ "unstable": {
+ "version": [
+ 20210316,
+ 820
+ ],
+ "deps": [
+ "flycheck"
+ ],
+ "commit": "4163c0dcc1447bc98bb20b835eb23cb68a638ba9",
+ "sha256": "0z19zz5dq0pjkzrjg2fbrh9szlgd0lq2j9wmkf4pzkrcb519kchn"
+ }
+ },
{
"ename": "flycheck-relint",
"commit": "e20128460e942a78a88bd9e6389a8fcbb14343ad",
@@ -37217,14 +37349,14 @@
"repo": "juergenhoetzel/flymake-nasm",
"unstable": {
"version": [
- 20210107,
- 524
+ 20210310,
+ 1540
],
"deps": [
"flymake-quickdef"
],
- "commit": "92b96ca659e88d25e21e711038332a5b4c199e61",
- "sha256": "1s76s5y5lwdw84bkcbx3xawc748hm9p9g2sfpn33mmz1mc227kz5"
+ "commit": "27e58d7f3a48ca6fc12238fe6c888a3fdffc3f75",
+ "sha256": "0j4zai3par1i27szs2rws72qrqjcr3yz55pp56hl397r40kzwgmq"
}
},
{
@@ -37592,11 +37724,11 @@
"repo": "federicotdn/flymake-shellcheck",
"unstable": {
"version": [
- 20200921,
- 2341
+ 20210314,
+ 2048
],
- "commit": "060da4097c1caadc1eb1d6feac4deaedaadb6dc0",
- "sha256": "021qmkysx8gmwxnxcx6izs1q1h66ncvrwlvpk1wsxw9lf9symm7c"
+ "commit": "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7",
+ "sha256": "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl"
}
},
{
@@ -37861,11 +37993,11 @@
"repo": "rolandwalker/flyspell-lazy",
"unstable": {
"version": [
- 20201028,
- 111
+ 20210308,
+ 1253
],
- "commit": "d57382cf06462931cb354f5630469425fce56396",
- "sha256": "0ahq75izwjmkzdkj25k3iml76csgkqav912dnlairqsnc9il6bj8"
+ "commit": "0fc5996bcee20b46cbd227ae948d343c3bef7339",
+ "sha256": "1r9sz6p8p2g3n59pqfqllr5324pg7q3fji6lki9qpy0l5yd6j1p4"
},
"stable": {
"version": [
@@ -37932,16 +38064,15 @@
"repo": "troyp/fn.el",
"unstable": {
"version": [
- 20170210,
- 204
+ 20210304,
+ 1812
],
"deps": [
"cl-lib",
- "dash",
- "dash-functional"
+ "dash"
],
- "commit": "f685fd0c08ec3b1d1b9974b37e62edd78a000cb8",
- "sha256": "1k8pwlpcvlwr4pavg85ja8hdc7rrbafqs1mhhqr5gbq8cp822sja"
+ "commit": "98e3fe1b4785e162d9aca978a2db106baa79260f",
+ "sha256": "0qaxbqwqxxgvw1lb6icsv3mx215mg682n3jsrmqfsvgl9nc97ps6"
},
"stable": {
"version": [
@@ -38232,8 +38363,8 @@
20191004,
1850
],
- "commit": "e086c59a14701cd041641b51c952fa704ee963df",
- "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
+ "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
+ "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
}
},
{
@@ -38310,8 +38441,8 @@
"repo": "magit/forge",
"unstable": {
"version": [
- 20210228,
- 1555
+ 20210314,
+ 2238
],
"deps": [
"closql",
@@ -38323,8 +38454,8 @@
"markdown-mode",
"transient"
],
- "commit": "b4df041a25811daa2536f9502461b99379dc0f11",
- "sha256": "0v5i3wnlajz7yznksml1rwl8avkjlqf3rbjl0gpr3ylv05hcra9k"
+ "commit": "f4c95dd0e633b3dd332d6f91122c864ab3640912",
+ "sha256": "02jhimj1ykz0mfg63iwaaxg1i9fdijczcd1g5fz02zwj1v2dgqgh"
},
"stable": {
"version": [
@@ -38379,15 +38510,15 @@
"repo": "lassik/emacs-format-all-the-code",
"unstable": {
"version": [
- 20210224,
- 1954
+ 20210315,
+ 640
],
"deps": [
"inheritenv",
"language-id"
],
- "commit": "8f25a5e72f81b60bcf27fdfd653b76e7c4773895",
- "sha256": "0yfk59sbv8ydhc1sqwf3254h9qag7zmbs4h9f47kc9kp79a93i26"
+ "commit": "94239d35944830ce009d01ac3369e0d61f9723c2",
+ "sha256": "1q27yr916vhk0ah1406vs540f8hpp8bca1f118xwhyj1fw3yrbaw"
},
"stable": {
"version": [
@@ -39007,16 +39138,16 @@
"repo": "waymondo/frog-jump-buffer",
"unstable": {
"version": [
- 20201117,
- 1803
+ 20210308,
+ 2316
],
"deps": [
"avy",
"dash",
"frog-menu"
],
- "commit": "39aeb02f5a38f3637b5e1d0560b366daa131d421",
- "sha256": "1zgzvcrybcx5vvvqhxxhridsfcjggcyb2kxzsmp6fmd4bdhd4crx"
+ "commit": "3481626cccea8e77e4eee79b05f99c9171559f7b",
+ "sha256": "1v7p3ln8jw3qm2ka0jl55wq9smal5k31rzsina9i8c5mcslml1l2"
}
},
{
@@ -39148,8 +39279,8 @@
"deps": [
"cl-lib"
],
- "commit": "1488f29aa774326e5d6bf4f9c2823124606399b3",
- "sha256": "1wyyxg3z7s7ga003pjik1116vrj5x9cssmk50s80b4xdxmw04viz"
+ "commit": "8f5f6939044b68a97d231b6902ab5ac86744db2a",
+ "sha256": "15fnn413rmaav9zi8p5yqvim0wblsljfp6xhgsa68zji5y99lxva"
},
"stable": {
"version": [
@@ -39344,19 +39475,19 @@
"repo": "auto-complete/fuzzy-el",
"unstable": {
"version": [
- 20150730,
- 337
+ 20210317,
+ 140
],
- "commit": "a36bde2f6e94d6b2bfaae68d73bbd39734e5b907",
- "sha256": "1aj7r16bnx2jr2gpzwsmr3yqmfza5qbdcn78chcsfqxv5c8bgswa"
+ "commit": "edce468a3077d03ca63e1559f7ffebfa09c8effd",
+ "sha256": "126wbccdilqi7yf1w7z9gjr6zr4lmrrii6bz65jg5ffnpx8kj30d"
},
"stable": {
"version": [
0,
- 1
+ 3
],
- "commit": "939f4e9a3f08d83925b41dd3d23b2321f3f6b09c",
- "sha256": "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss"
+ "commit": "122939ee0a82efa1bcf405de3134debe34e4a0b6",
+ "sha256": "07kpixgqc6vky91bi7j4r0q78ccc3azydwmkaz4z7lr3ncbc6ymj"
}
},
{
@@ -39748,11 +39879,11 @@
"repo": "jaor/geiser",
"unstable": {
"version": [
- 20210221,
- 2032
+ 20210303,
+ 1351
],
- "commit": "26dd2f4ae0f44879b5273bf87cdd42b8ec4140a1",
- "sha256": "05xv5amg5pffgnrlcl0yjlx37p9m5hxllq6xn96sf8dcpgsiprfs"
+ "commit": "8e61c27b628373523b7c467d5f71aac8c873258b",
+ "sha256": "1hnfyr4sbznmmqamk6zwwyq8z4a8vi628a0wfxmj8lyzjb2dqyi1"
},
"stable": {
"version": [
@@ -40039,18 +40170,18 @@
"repo": "mkjunker/ggo-mode",
"unstable": {
"version": [
- 20130524,
- 1143
+ 20210310,
+ 1345
],
- "commit": "e326899d9ed8217c7a4ea6cfdc4dd7aea61d6c1b",
- "sha256": "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp"
+ "commit": "6a7617b5af3d13029e4d680a375e8107c40d0fac",
+ "sha256": "1l39j3vkjszn3xkg2dk7r8k4fy4hjn0gp5n3bm6wv25wc8946dx4"
},
"stable": {
"version": [
- 20130521
+ 20210310
],
- "commit": "ea5097f87072309c7b77204888d459d084bf630f",
- "sha256": "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz"
+ "commit": "6a7617b5af3d13029e4d680a375e8107c40d0fac",
+ "sha256": "1l39j3vkjszn3xkg2dk7r8k4fy4hjn0gp5n3bm6wv25wc8946dx4"
}
},
{
@@ -40602,16 +40733,16 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20210206,
- 2245
+ 20210309,
+ 1106
],
"deps": [
"dash",
"transient",
"with-editor"
],
- "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7",
- "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356"
+ "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a",
+ "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56"
},
"stable": {
"version": [
@@ -40894,11 +41025,11 @@
"repo": "sshaw/git-link",
"unstable": {
"version": [
- 20210121,
- 235
+ 20210318,
+ 313
],
- "commit": "f76bffd42fb4ed8ffe09d48c084f6577b0b99fa6",
- "sha256": "0l7xmvmj5s93hc39wjjv75f22zbhahnmcxpmvx3dfvsbig9pmk75"
+ "commit": "2b510cf3f28bed842853294fc4ee23c7f8b6435a",
+ "sha256": "0c5p5llxlgi09lymjnh0jpp36v5vfmi6rjb77123gcnsqi0031wn"
},
"stable": {
"version": [
@@ -41344,8 +41475,8 @@
"repo": "charignon/github-review",
"unstable": {
"version": [
- 20201012,
- 40
+ 20210314,
+ 2203
],
"deps": [
"a",
@@ -41354,8 +41485,8 @@
"ghub",
"s"
],
- "commit": "d0c8234cf523818513f892f30153210606abb6be",
- "sha256": "1d0g79mp14ngx5x0f8sc4lri40m3gh0ql6gzyqrl4c94lhq59cn7"
+ "commit": "341b7a1352e4ee1f1119756360ac0714abbaf460",
+ "sha256": "15lqiknl7ilskpy1s9qdfi0qjvrkvmj8nw110cf8ifwvvyxyqbhb"
}
},
{
@@ -43392,11 +43523,11 @@
"url": "https://depp.brause.cc/gotham-theme.git",
"unstable": {
"version": [
- 20200506,
- 1250
+ 20210318,
+ 2207
],
- "commit": "a549cd031859e24fd37a779323e1542aefe86d43",
- "sha256": "0smjajazr86r8f1szw1xdrinfbn455xhl6bbhyhhmrk6sw0pnc6n"
+ "commit": "51876a72dbe5a16aeadde2e885da6bbf75909bd1",
+ "sha256": "042cpdl7srfj1ha3z27xj03bzp3vrz6ql4x0zzvjxsyj08z1q80y"
},
"stable": {
"version": [
@@ -43536,14 +43667,14 @@
"magit-popup",
"s"
],
- "commit": "ee5d4c3f398dbd307c06cb092361268ee4afc60c",
- "sha256": "0nx4zgafgwhzddsyvb4im0rm0k6bvd0lialr9k21mvs2amxpwmq7"
+ "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411",
+ "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g"
},
"stable": {
"version": [
0,
24,
- 0
+ 1
],
"deps": [
"dash",
@@ -43551,8 +43682,8 @@
"magit-popup",
"s"
],
- "commit": "1ec59a7c0002598c594fb58e03907d7ff0ca84b4",
- "sha256": "0bz01ybpj1lk7g34n6wwy53aaa4jvs3xhsv50y34z5wvxa8ypdsj"
+ "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411",
+ "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g"
}
},
{
@@ -44514,14 +44645,14 @@
"repo": "tmalsburg/guess-language.el",
"unstable": {
"version": [
- 20210217,
- 1507
+ 20210308,
+ 1514
],
"deps": [
"cl-lib"
],
- "commit": "e7decda098ee6819b37bacd958260c7c789962cb",
- "sha256": "0d0348knda33qb9l729bz5ccig49hhw15dbjayl9y6l23nlwx7yg"
+ "commit": "7e511d23ee4315a79081c53596398c471572fb0f",
+ "sha256": "03bm6j8d1v5z1gz1chlpp7s3jzi0lnq6nqdw8r7z1ik5si59dvj5"
}
},
{
@@ -45221,11 +45352,11 @@
"repo": "haskell/haskell-mode",
"unstable": {
"version": [
- 20201230,
- 342
+ 20210303,
+ 1948
],
- "commit": "3a019e65b504861d7ea23afbfecd14e5ef63e846",
- "sha256": "011x9mp4ili0g9dq6ql33dq7xgv479di37phai0q282hkh5487q0"
+ "commit": "20f72ccc17c8233dbb7c94ebf52a2a59e7d97730",
+ "sha256": "0lgm5hbzbzb9izpsryvhiygq26cg5dpwmkxbvldikj9scw1dp57i"
},
"stable": {
"version": [
@@ -45555,30 +45686,30 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20210223,
- 2045
+ 20210318,
+ 1838
],
"deps": [
"async",
"helm-core",
"popup"
],
- "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51",
- "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p"
+ "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03",
+ "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j"
},
"stable": {
"version": [
3,
7,
- 0
+ 1
],
"deps": [
"async",
"helm-core",
"popup"
],
- "commit": "5ad6c83681fda7bfd5a745fedecaa924630253dd",
- "sha256": "0lxq13bsbh7xawgsq08kjm7s28x9yl8mid3538flv5kcc1rv2b9y"
+ "commit": "8b0b9953a71ba07c24fdfc4d26fab21fb66e4d1f",
+ "sha256": "0b8sfpvy02ijk9xi9b44762b718jqfq063wcg75dk3q452d27s1h"
}
},
{
@@ -45658,14 +45789,14 @@
"repo": "emacsorphanage/helm-ag",
"unstable": {
"version": [
- 20200915,
- 1650
+ 20210305,
+ 334
],
"deps": [
"helm"
],
- "commit": "db52f860b50aa4d5edfa1c6c97802d36aef7f78b",
- "sha256": "1l95vskrvk88a2glpn2pdylcpy7qxqg5qgmjnh9w24xfyc77g513"
+ "commit": "51e164b4bb1a9826fe8b39c0d02b4064c9352b9f",
+ "sha256": "0371s2y06pipjn0ka8c1a0r6g8migz5sbm8hqqilng1cr1dm3x7a"
},
"stable": {
"version": [
@@ -46463,26 +46594,26 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20210211,
- 1417
+ 20210319,
+ 1649
],
"deps": [
"async"
],
- "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51",
- "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p"
+ "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03",
+ "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j"
},
"stable": {
"version": [
3,
7,
- 0
+ 1
],
"deps": [
"async"
],
- "commit": "5ad6c83681fda7bfd5a745fedecaa924630253dd",
- "sha256": "0lxq13bsbh7xawgsq08kjm7s28x9yl8mid3538flv5kcc1rv2b9y"
+ "commit": "8b0b9953a71ba07c24fdfc4d26fab21fb66e4d1f",
+ "sha256": "0b8sfpvy02ijk9xi9b44762b718jqfq063wcg75dk3q452d27s1h"
}
},
{
@@ -47762,16 +47893,16 @@
"repo": "yyoncho/helm-icons",
"unstable": {
"version": [
- 20210219,
- 1752
+ 20210315,
+ 1339
],
"deps": [
"dash",
"f",
"treemacs"
],
- "commit": "5a668ef21ba02bf1fce2db18950858c769bf5d05",
- "sha256": "0n759vnymjgpf24kn7704vj8l1phsnjrgllqhcv1c50fsni1fajl"
+ "commit": "7e8d1e213a164aa63b868e610ef8a4fd1ff58769",
+ "sha256": "0g5n9f8vfv3zbylxh6w2xrym4fzd4jqx5n4g6gjp8sscaw5zaxkd"
}
},
{
@@ -47998,16 +48129,16 @@
"repo": "leanprover/lean-mode",
"unstable": {
"version": [
- 20200620,
- 915
+ 20210305,
+ 1705
],
"deps": [
"dash",
"helm",
"lean-mode"
],
- "commit": "15bee87dc4080b87c543964375b7ce162317ab6f",
- "sha256": "127b7ny5mr1y14yg54gy7an3lk3928w4y9a22295i4v4zgj704j4"
+ "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d",
+ "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj"
}
},
{
@@ -48074,14 +48205,14 @@
"repo": "emacs-helm/helm-ls-git",
"unstable": {
"version": [
- 20200519,
- 912
+ 20210317,
+ 1205
],
"deps": [
"helm"
],
- "commit": "4da1a53f2f0a078ee2e896a914a1b19c0bf1d5ed",
- "sha256": "12fi08w20yjsdfkxl1pk9q4w0z9l92va5fa5ghay9w33xlymc8dc"
+ "commit": "58dbeafb184cf6a10a1ae3078b37310dd82ad2ed",
+ "sha256": "1hlqvpb34pq4bmyplm58wsnwfrflp5bf7kzjl8nrsj9fcqr29nbv"
},
"stable": {
"version": [
@@ -50035,16 +50166,16 @@
"repo": "emacs-helm/helm-w3m",
"unstable": {
"version": [
- 20181029,
- 726
+ 20210315,
+ 723
],
"deps": [
"cl-lib",
"helm",
"w3m"
],
- "commit": "c15d926631198d6d759ec8881837bcca5a64963b",
- "sha256": "0qaqcwhwmckfmg3axiad35azn0l74k1niw4ix0v1bn2vqrxanqcw"
+ "commit": "0a25a2b1df9bc660a90d633beb301b3815556e4e",
+ "sha256": "0cdfk1r2rcc5hflwjpmsijss6xf5lwzn7x68jq4b4xdlckkqf9d7"
},
"stable": {
"version": [
@@ -50234,8 +50365,8 @@
"repo": "Wilfred/helpful",
"unstable": {
"version": [
- 20210219,
- 728
+ 20210319,
+ 802
],
"deps": [
"dash",
@@ -50243,8 +50374,8 @@
"f",
"s"
],
- "commit": "0b6720145e1d1e037ec8658b83fddfad2c0ce923",
- "sha256": "0rsxd62l81hkpvznclgwvd1r6ca66mx6xm7jlvv8id28jhrqv03w"
+ "commit": "7e4b1f0d5572a4e2b8ee7a9b084ef863d0315a73",
+ "sha256": "0qrz3klqs94aj6bxh49qymf9fvpa73xpp6djkxwpypgb2wv8hk6n"
},
"stable": {
"version": [
@@ -50384,14 +50515,14 @@
"repo": "jojojames/hg-histedit",
"unstable": {
"version": [
- 20190707,
- 11
+ 20210302,
+ 2334
],
"deps": [
"with-editor"
],
- "commit": "2448d00bc390fed3e53091d968ec1222c8e7e35b",
- "sha256": "0qp29yiyplv8h0z2yk5h0473a7nj401h14gi3fqsxqq9brx3s9jy"
+ "commit": "a05149483b9c5f7848ece0ba6028c900595a6a25",
+ "sha256": "04zps0d4s99f5a8ahrpyf8b6qw0c1y7rd1bsaq9nc6m4qblsvwc8"
}
},
{
@@ -50402,11 +50533,11 @@
"repo": "omajid/hgignore-mode",
"unstable": {
"version": [
- 20160501,
- 7
+ 20210314,
+ 431
],
- "commit": "7aa9f3b8a9c610dbd80b952061b40194e1d9c5bd",
- "sha256": "0l22sqi9lmy25idh231p0hgq22b3dxwb9wq60yxk8dck9zlkv7rr"
+ "commit": "2c5aa4c238848f5b4f2955afcfb5f21ea513653b",
+ "sha256": "0jn9rzhrmmv4lf7rdapdjclk6623d1mir2lq3c46428skhzjlph7"
}
},
{
@@ -50804,10 +50935,10 @@
},
{
"ename": "highlight-parentheses",
- "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
- "sha256": "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5",
- "fetcher": "github",
- "repo": "tsdh/highlight-parentheses.el",
+ "commit": "40bb1119bea79bb9e91378c99e2aa60936de013a",
+ "sha256": "0ly9d01ja517psf1sqg12wyljykixi5c6qbhahyjy7n331kkpkmr",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el",
"unstable": {
"version": [
20210104,
@@ -50816,8 +50947,8 @@
"deps": [
"cl-lib"
],
- "commit": "013ac29970d5209c14da0af6c5bb9bbbcca40c02",
- "sha256": "01p8j248vcmbcdskr3146ag979c0m74gddy3yzp3x8hz9a4mgqx0"
+ "commit": "723abf9b6092d7e19548316de1f907ed0d67c780",
+ "sha256": "1kkxxq5cw090vw3cddzdq51f208vxw326hsqb1zi8f6z3vsm2h7s"
},
"stable": {
"version": [
@@ -50878,11 +51009,11 @@
"repo": "zk-phi/highlight-stages",
"unstable": {
"version": [
- 20161212,
- 1457
+ 20210306,
+ 418
],
- "commit": "29cbc5b78261916da042ddb107420083da49b271",
- "sha256": "0r6nbcrr0dqpgm8dir8ahzjy7rw4nrac48byamzrq96r7ajlxlv0"
+ "commit": "95daa710f3d8fc83f42c5da38003fc71ae0da1fc",
+ "sha256": "0yhwsbpnlsfnbppviwnn0y3gm02rds684841301sbmawplz457z7"
}
},
{
@@ -51352,16 +51483,16 @@
"repo": "thanhvg/emacs-hnreader",
"unstable": {
"version": [
- 20200726,
- 654
+ 20210319,
+ 527
],
"deps": [
"org",
"promise",
"request"
],
- "commit": "7ff808d4728ce4e269b6d99a73604063dd9b374a",
- "sha256": "0kxx8pvl99qdbldsn6lvxj69j1jpmmc33wxcr2aw3h423ibcna3s"
+ "commit": "ae52af1424ccde2b20e88ff8c589eb772162a560",
+ "sha256": "12h1lvm6bwdln7jnl1adl1vqgi603yvsvb4dbg9yvy1np8b6mj7r"
}
},
{
@@ -52625,27 +52756,27 @@
"repo": "plandes/icsql",
"unstable": {
"version": [
- 20210216,
- 2116
+ 20210304,
+ 1843
],
"deps": [
"buffer-manage",
"choice-program"
],
- "commit": "af9eaab39cc62869d3a3806cdb2c0b981417da16",
- "sha256": "0h37yqdh7dx1d3mmzlc037d4ph7p740438x0kpxk36rqw1xp7xqp"
+ "commit": "759a63d373681e09d71e0f5522d063a811d7127e",
+ "sha256": "191cwfjrcv2yvgh0f6n0f2s64w6r2v19vvc41x4g1x48szzrzbg2"
},
"stable": {
"version": [
0,
- 4
+ 6
],
"deps": [
"buffer-manage",
"choice-program"
],
- "commit": "af9eaab39cc62869d3a3806cdb2c0b981417da16",
- "sha256": "0h37yqdh7dx1d3mmzlc037d4ph7p740438x0kpxk36rqw1xp7xqp"
+ "commit": "bc600ecb6e6134e98dfb67f10301bde5a4e07adf",
+ "sha256": "0j27iiwgzysd9ymb4nc0m1300sqz0gqmri7ky9zfgv2g5gpjs4w0"
}
},
{
@@ -52821,10 +52952,10 @@
"stable": {
"version": [
1,
- 1
+ 3
],
- "commit": "ad9baaec10e06be3f85db97b6c8fd970cf20df77",
- "sha256": "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5"
+ "commit": "d1244243e042b8d5b6b991db752a17a44ea169bc",
+ "sha256": "1gl646lj1i2yxmgrgwd0sz9abq3zqf9z4qkl6ilp49ijk4cks63g"
}
},
{
@@ -53464,11 +53595,11 @@
"repo": "QiangF/imbot",
"unstable": {
"version": [
- 20210223,
- 1226
+ 20210319,
+ 126
],
- "commit": "b5d191c9168918a47373c70e97ae83ba46b946f6",
- "sha256": "10qj11q35q9ck5dlkv26ra5zy5p3jckb24jl7y050af0fip1m0vd"
+ "commit": "0fdc71bfa66ecc1f8a54cdcd2458eb47eab41ecd",
+ "sha256": "1ibd9i75x6gb0nprbdi0giklllfwsmvghi3fm19qm7hiw3kg9j3m"
}
},
{
@@ -53533,25 +53664,25 @@
"repo": "bmag/imenu-list",
"unstable": {
"version": [
- 20190115,
- 2130
+ 20210316,
+ 2102
],
"deps": [
"cl-lib"
],
- "commit": "46008738f8fef578a763c308cf6695e5b4d4aa77",
- "sha256": "14l3yw9y1nk103s7z5i1fmd6kvlb2p6ayi6sf9l1x1ydg9glrpl8"
+ "commit": "b50222378412fbe321622a84cb2b036e084c697a",
+ "sha256": "1936dd41fa05ndzf2bwhllvjz97iz0rflkazjipr7dvz5q072wj2"
},
"stable": {
"version": [
0,
- 8
+ 9
],
"deps": [
"cl-lib"
],
- "commit": "27170d27c9594989587c03c23f753a809f6a0e10",
- "sha256": "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx"
+ "commit": "6cded436010a39592175238e4d02263a7cdb44c4",
+ "sha256": "09x1n2bgwgximcmnrfn32d5hr6wa0iz8acaj78a93azzx065xxgk"
}
},
{
@@ -53824,11 +53955,11 @@
"repo": "jcs-elpa/indent-control",
"unstable": {
"version": [
- 20210117,
- 356
+ 20210309,
+ 1151
],
- "commit": "ec9238bb204875d0d789e077c84c1d2ffe4e8173",
- "sha256": "1r61jvbx57gqlfq2kkbxwz4rsidj6dig4czkxjnb01nigzp0y58c"
+ "commit": "383ea506a6e6145bbb6327a7b1e509b40edf446b",
+ "sha256": "1828wh72ij2dhrvlwzx70j6q2gjqs96dk2h6wk508pphqw3yn29x"
},
"stable": {
"version": [
@@ -53980,8 +54111,8 @@
"repo": "NicolasPetton/Indium",
"unstable": {
"version": [
- 20210222,
- 1110
+ 20210309,
+ 1210
],
"deps": [
"company",
@@ -53990,8 +54121,8 @@
"json-process-client",
"seq"
],
- "commit": "32487a432d6c0728e1fd69db61c4a07b94bb5798",
- "sha256": "11s3mn096bsbsrj14h9wpi0721yhlnnd434yswgj6m12k1wpdmzq"
+ "commit": "8499e156bf7286846c3a2bf8c9e0c4d4f24b224c",
+ "sha256": "1hii97gz1qpr9nbnpb6am4i6a6vwxnbzcy65gyjvsfc122m3qn03"
},
"stable": {
"version": [
@@ -54033,14 +54164,14 @@
"repo": "clojure-emacs/inf-clojure",
"unstable": {
"version": [
- 20210213,
- 2044
+ 20210317,
+ 1221
],
"deps": [
"clojure-mode"
],
- "commit": "e144b335fae20418e783c4067463de38de56b65a",
- "sha256": "0jjfgi77pkqissbqvghqwfqlxkzgg69k28q1phgpm06c56z2shnq"
+ "commit": "3e712d9f489313c4097ccc891abedcfb6e1788d3",
+ "sha256": "1bdz8zsv6vixgvq88vc8mlq729rn105wr2mzjl6a2w9b8zkjzs08"
},
"stable": {
"version": [
@@ -54093,11 +54224,11 @@
"repo": "J3RN/inf-elixir",
"unstable": {
"version": [
- 20210226,
- 1653
+ 20210315,
+ 1723
],
- "commit": "9c21ae6d7a1313c856fd508880ee121fbea99f4d",
- "sha256": "0w6fj1sh1pdsrk5sis2zkbdz0ixbpndaizvlqv2riw3sgpnc41f3"
+ "commit": "b526ce852886d1863163e054fcbbcbb83c55b32a",
+ "sha256": "1kmv2j1g299wb8dqq43zk61jigkfl9rnqxbfnclzsqfdlnhvw6ii"
},
"stable": {
"version": [
@@ -54132,11 +54263,11 @@
"repo": "nonsequitur/inf-ruby",
"unstable": {
"version": [
- 20201228,
- 1237
+ 20210314,
+ 123
],
- "commit": "1fc972ecda6a2155806d75d202481327703a0681",
- "sha256": "0kv98g30kgfpyd0ghiclk17ac2y17j7bi77km59gdw5i1b5k1a27"
+ "commit": "c6990a60c740b2d69495e34e95b29f13014b3cde",
+ "sha256": "05nz7hvly47n7d945gdb1x8xgzla5r9k629if81rgjh99w24dpgc"
},
"stable": {
"version": [
@@ -55334,20 +55465,20 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210225,
- 1251
+ 20210311,
+ 1638
],
- "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
- "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
0,
13,
- 2
+ 4
],
- "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
- "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
+ "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
+ "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
}
},
{
@@ -55358,28 +55489,28 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210225,
- 1251
+ 20210310,
+ 1230
],
"deps": [
"avy",
"ivy"
],
- "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
- "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
0,
13,
- 2
+ 4
],
"deps": [
"avy",
"ivy"
],
- "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
- "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
+ "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
+ "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
}
},
{
@@ -55726,28 +55857,28 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210225,
- 1251
+ 20210311,
+ 1108
],
"deps": [
"hydra",
"ivy"
],
- "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
- "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
0,
13,
- 2
+ 4
],
"deps": [
"hydra",
"ivy"
],
- "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
- "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
+ "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
+ "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
}
},
{
@@ -55939,8 +56070,8 @@
"ivy",
"prescient"
],
- "commit": "b6da466e552a710a9362c73a3c1c265984de9790",
- "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall"
+ "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b",
+ "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n"
},
"stable": {
"version": [
@@ -56561,14 +56692,14 @@
"repo": "zk-phi/jaword",
"unstable": {
"version": [
- 20200816,
- 647
+ 20210306,
+ 420
],
"deps": [
"tinysegmenter"
],
- "commit": "45e350895fc55f087a2102fded5b306811089a7d",
- "sha256": "02ncm22wldx8g3iibdw92gk4hdig0209f7bmhxrhgdv8xp544c2h"
+ "commit": "783544a265f91b2e568b52311afb36e3691d5ad3",
+ "sha256": "09gn08c9wz60jc8jh5y3bv7qymp0ciz62bk5sjwkwgnq5mkpsf49"
}
},
{
@@ -57061,11 +57192,11 @@
"repo": "Michael-Allan/Java_Mode_Tamed",
"unstable": {
"version": [
- 20210206,
- 1851
+ 20210305,
+ 646
],
- "commit": "fd9be900549bb0c0a373d6fd1552295f1e8a1d08",
- "sha256": "0g9bihlmq6bwbyzk9zr3gig5w0vaysz1gsdqacq604jls34ks491"
+ "commit": "2e5e85392532fea07848000089137d51d008f42a",
+ "sha256": "0dcgs0p01hk9aljmv8z36gxqcpcw4p77yl2nvz1gql66lb4p7h6s"
}
},
{
@@ -57453,14 +57584,14 @@
},
{
"ename": "js2-refactor",
- "commit": "8935264dfea9bacc89fef312215624d1ad9fc437",
- "sha256": "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r",
+ "commit": "974d846518908d21c0e8edfea6f26174ea044a0c",
+ "sha256": "09gdsy93vpmdk110yyljvbcalxhpwpxy8vgv1l1by11k0p10b7nc",
"fetcher": "github",
- "repo": "magnars/js2-refactor.el",
+ "repo": "js-emacs/js2-refactor.el",
"unstable": {
"version": [
- 20190630,
- 2108
+ 20210306,
+ 2003
],
"deps": [
"dash",
@@ -57469,8 +57600,8 @@
"s",
"yasnippet"
],
- "commit": "d4c40b5fc86d3edd7c6a7d83ac86483ee1cb7a28",
- "sha256": "08b25y3raz0p98zxk9xdd8nj9shqd6mzrqhbq1gg4cwsmi7h7ly1"
+ "commit": "a0977c4ce1918cc266db9d6cd7a2ab63f3a76b9a",
+ "sha256": "0pjadcb5i8g8wkaf4hvh270r5z3qcsksnpcq5gzacqbgz5j2qcaf"
},
"stable": {
"version": [
@@ -58173,6 +58304,30 @@
"sha256": "1sr007wsl2y6wqpzkmv3inbpwhvgdcb2nmqzgfg7w1awapi2r13p"
}
},
+ {
+ "ename": "just-mode",
+ "commit": "4ae56fd7c24a37769aeaba2de086a126d6ff23d3",
+ "sha256": "0sm5l2jb0k17661738jfx6hz06j6kdadwsc86ck750mpw0pb391r",
+ "fetcher": "github",
+ "repo": "leon-barrett/just-mode.el",
+ "unstable": {
+ "version": [
+ 20210311,
+ 2359
+ ],
+ "commit": "45c248fe72d4a15c5a9f26bc0b27adb874265f53",
+ "sha256": "065nnm4r6n83lbsn47idrxn3j1vpwnik683fgc4afhi5mm4ij89b"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 4
+ ],
+ "commit": "8c0d9bec38f717be1549e74839360e35587739e0",
+ "sha256": "1568fwh6y9584lyx57iq9ncw0xn4j1ywdbq38sk9hlpgbpsy8ln4"
+ }
+ },
{
"ename": "jvm-mode",
"commit": "7cdb7d7d7b955405eb6357277b5d049df8aa85ce",
@@ -58476,8 +58631,8 @@
"parseedn",
"s"
],
- "commit": "1376d50f1fc91f9345351aeb4960b54bf83be59e",
- "sha256": "06zp5kshcsxf91d4as0nw1ncxx1a8ii6npzvk485sjrghnldsccm"
+ "commit": "755b0dfb3bd676c769c4b4aeb81c2cd5828bd207",
+ "sha256": "1snrzah6pcxd9vm6crxz85c5nl6zfhfbc0581z765g2vg87qcb12"
},
"stable": {
"version": [
@@ -58502,15 +58657,15 @@
"repo": "ogdenwebb/emacs-kaolin-themes",
"unstable": {
"version": [
- 20210225,
- 725
+ 20210315,
+ 1754
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "7f27dd887da0e2d2522f711f8954c997de366ac4",
- "sha256": "134ijij23vhc5jw1bvfvkikl64lwvnsmbprqsv64791x1fvcbd6y"
+ "commit": "80d0a5824fedb332432d5999af9842316b7dc3f2",
+ "sha256": "0309vmrbw7a4r0gnsdd5jyfql2fl3lbh3gsnagynvq7rzv9ryr1c"
},
"stable": {
"version": [
@@ -59284,11 +59439,11 @@
"repo": "kivy/kivy",
"unstable": {
"version": [
- 20180702,
- 2029
+ 20210318,
+ 2106
],
- "commit": "de520e601fee568b03800e8069118730ccbbdb95",
- "sha256": "1yk5ygmhkzhfwk770k6lhqx5hjcwsjrgnf99qzl59af74qxn3wya"
+ "commit": "3421cedfd83acb9fd0dd15600811662136faa1c6",
+ "sha256": "103d32iamgharcjnqagm5w63ssj6365mqcxjdrvzarhgsq2gqx6b"
},
"stable": {
"version": [
@@ -59581,8 +59736,8 @@
"transient",
"yaml-mode"
],
- "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e",
- "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni"
+ "commit": "0c118987feee05059629073228d966502f5d0e93",
+ "sha256": "07k14qr2z1mhshyrr5j5ij8q84bl79rdfmsbhk38nnh0kmhpldvs"
},
"stable": {
"version": [
@@ -59614,8 +59769,8 @@
"evil",
"kubel"
],
- "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e",
- "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni"
+ "commit": "0c118987feee05059629073228d966502f5d0e93",
+ "sha256": "07k14qr2z1mhshyrr5j5ij8q84bl79rdfmsbhk38nnh0kmhpldvs"
},
"stable": {
"version": [
@@ -59822,6 +59977,38 @@
"sha256": "1s3fndzjhz0xvbhdb0y7raa7zqrpws1xm79blgfcxcrv2fbmbzan"
}
},
+ {
+ "ename": "laas",
+ "commit": "db04bf3e4da0a51cbbab7db4c6070f1d06053c90",
+ "sha256": "1cpd9zflk57fb70xjlkfwr9ghv11xmvad5px0fzb6gf51gqh3g6x",
+ "fetcher": "github",
+ "repo": "tecosaur/LaTeX-auto-activating-snippets",
+ "unstable": {
+ "version": [
+ 20210308,
+ 336
+ ],
+ "deps": [
+ "aas",
+ "auctex",
+ "yasnippet"
+ ],
+ "commit": "78b10f0e1629283f8ba0f5bd1e28cf9a606362fd",
+ "sha256": "077hnz3gzqzp1pnfksr88p2q33l4ghz6rlxlqajnmb42cv64rxv1"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2
+ ],
+ "deps": [
+ "aas",
+ "yasnippet"
+ ],
+ "commit": "94be7523159ee261077a33094775c7f73218a900",
+ "sha256": "0qyj4xwsxhn78akkv08ka9k47aa3jssd4mgws7ccbnqj68fv78gg"
+ }
+ },
{
"ename": "lab-themes",
"commit": "c5817cb4cb3a573f93bacfb8ef340bef0e1c5df4",
@@ -59899,16 +60086,16 @@
"repo": "Deducteam/lambdapi",
"unstable": {
"version": [
- 20210220,
- 728
+ 20210312,
+ 1104
],
"deps": [
"eglot",
"highlight",
"math-symbol-lists"
],
- "commit": "e9aeee78c3aede7e39fec993b846e731d7790acf",
- "sha256": "1dkbrwd1dchc9h650r7rfw9xcjr342xkyjjrq0lyxwa8v5s4558v"
+ "commit": "3f2d0e95362c3ea9ed78f32fcb3d310c2366df12",
+ "sha256": "1898ixkcgmcwzfxl4cpjdc9kim5s2a5n2s7hi6xqzccqx2mf4brd"
}
},
{
@@ -60284,11 +60471,11 @@
"repo": "pekingduck/launchctl-el",
"unstable": {
"version": [
- 20200531,
- 1043
+ 20210309,
+ 1113
],
- "commit": "96886b7e64d15ffd3319c8b4b04310ccdc648576",
- "sha256": "0mw1c14ysh186lbgmmyp01hszdgjm605diqfq6a17a7dd7fn549a"
+ "commit": "86cbb8980de4641b552a792389cc2cb9b2718ee4",
+ "sha256": "08prmsx6ski5j1pnzr7v3hxvbdrb5by8x2dihwhz0wjgfsqj13mr"
}
},
{
@@ -60396,11 +60583,11 @@
"repo": "conao3/leaf.el",
"unstable": {
"version": [
- 20210224,
- 144
+ 20210316,
+ 1822
],
- "commit": "fbe9bfba5ef4c99ee190b259a5e3341dd7a71935",
- "sha256": "16rki5xzffws02l2nr2ra0kxapizqdix5373ny9f4hlkvp7bqgzi"
+ "commit": "ab5cc26b56a6a53a3338ebfde17b746522c2c14c",
+ "sha256": "1ds545sh8hg2vg5l7fm4v6z31lzax14ivdni3a37278jfx82xxrx"
},
"stable": {
"version": [
@@ -60432,6 +60619,25 @@
"sha256": "09g4ibd0afdv54cim45ab69cc7zsmx8n0100wqwakmhvpq8g4kf6"
}
},
+ {
+ "ename": "leaf-defaults",
+ "commit": "326fab332b9dec9660414906aafd220986372906",
+ "sha256": "1a08xjjjf9w3scw2bzbvlxak4nmjjia9icnf01ilhcfmlqa3rwdc",
+ "fetcher": "github",
+ "repo": "conao3/leaf-defaults.el",
+ "unstable": {
+ "version": [
+ 20210301,
+ 118
+ ],
+ "deps": [
+ "leaf",
+ "leaf-keywords"
+ ],
+ "commit": "96ce39d4f16736f1e654e24eac16a2603976c724",
+ "sha256": "1z56x3wnyakilgxak2yyf6rf35072996szxfz712lmdwqs6xfqv4"
+ }
+ },
{
"ename": "leaf-keywords",
"commit": "dfe671ccd5a87ba4157f55e2a16a39dfaa10c027",
@@ -60531,18 +60737,17 @@
"repo": "leanprover/lean-mode",
"unstable": {
"version": [
- 20210209,
- 1734
+ 20210305,
+ 1705
],
"deps": [
"dash",
- "dash-functional",
"f",
"flycheck",
"s"
],
- "commit": "15bee87dc4080b87c543964375b7ce162317ab6f",
- "sha256": "127b7ny5mr1y14yg54gy7an3lk3928w4y9a22295i4v4zgj704j4"
+ "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d",
+ "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj"
}
},
{
@@ -60638,11 +60843,11 @@
"repo": "ledger/ledger-mode",
"unstable": {
"version": [
- 20210221,
- 1315
+ 20210318,
+ 26
],
- "commit": "3495d1224ee73aa96c1d5bd131dc3a7f23d46336",
- "sha256": "137z70baylzv6bm6y2wyl1p3f47hzkvjzqcmwmwjmlkpc0p5j4ac"
+ "commit": "3c53ecc4fd27736560db7a64587e516b26521d61",
+ "sha256": "176h5n3azjqyp63map0224m01jrqzmjy4g9cdh00mna5p2n1lbwr"
},
"stable": {
"version": [
@@ -60929,15 +61134,15 @@
"repo": "tecosaur/lexic",
"unstable": {
"version": [
- 20210203,
- 358
+ 20210318,
+ 1315
],
"deps": [
"dash",
"visual-fill-column"
],
- "commit": "e59224cd5808af50e8b9ba8cce0a687cf09aacc1",
- "sha256": "1si5ndfs8xbk96iiwcwlhi57k914jnsq3zdgvlb7xm3y8zjy2l6x"
+ "commit": "4ded6be2ce3e8dadc5635a534827181a8c8ab602",
+ "sha256": "116qjizqa83zy6xas5cah58sf22ha05pps2004wfgng487ln9n59"
}
},
{
@@ -60951,8 +61156,8 @@
20201007,
2214
],
- "commit": "5bb4b76b1d1d2453de69920b3a1a6b2a302aea07",
- "sha256": "1dqpksmpnnpi591p76hhv95p5gmkmsw794vzny7rd4xkdgcc39jv"
+ "commit": "339021e29a50c71045736f322e961efbfc37bd99",
+ "sha256": "0416fcd1jnvhfj1bm3x60yi8n9cbxyyz11ri5k1g7b454pw54yb5"
},
"stable": {
"version": [
@@ -61187,6 +61392,30 @@
"sha256": "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8"
}
},
+ {
+ "ename": "ligo-mode",
+ "commit": "c8a86d223f5e764419aaf964d69a30350f74f904",
+ "sha256": "1289n7xbpx6ppil6rixck81xw3x0acrpcnxchml5yrwqrbr8czli",
+ "fetcher": "gitlab",
+ "repo": "ligolang/ligo",
+ "unstable": {
+ "version": [
+ 20210303,
+ 1751
+ ],
+ "commit": "46827603dc28320c359ca30364778f24f66ea6f4",
+ "sha256": "1jf6cfp26n7k2hr30sh16x7ijd1pig0g4krzmv5dpgw0m5v1ba6f"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 12,
+ 0
+ ],
+ "commit": "70d42b3922d152e8be946c2415151d0551b591d4",
+ "sha256": "17k0v1nfcsq5kdfk05cdkh8nbbi5bqniydqcr6whzw3aawnjryyc"
+ }
+ },
{
"ename": "line-reminder",
"commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db",
@@ -61496,14 +61725,11 @@
"repo": "lispunion/emacs-lisp-local",
"unstable": {
"version": [
- 20200409,
- 1330
+ 20210307,
+ 1545
],
- "deps": [
- "cl-lib"
- ],
- "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61",
- "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg"
+ "commit": "3a3237a5c25db9526dfbe1b3ac1e7125f8f459b0",
+ "sha256": "1nm2kmilhk2hm9nfd1f6drhlpwkpk31s1072y8im16ci7i13lig4"
},
"stable": {
"version": [
@@ -61864,11 +62090,11 @@
"repo": "jingtaozf/literate-elisp",
"unstable": {
"version": [
- 20210130,
- 107
+ 20210318,
+ 350
],
- "commit": "de73de9e8060574cb0c85be4ec3b5d8ff8a92b7b",
- "sha256": "19kyrvpkmbgiygcxr3hyrba9smz33y0adz5fwh1kb5qhcyrq8jw7"
+ "commit": "6979fc6369d55519d52ca1e8f7d80d73ce54c383",
+ "sha256": "180lsghxcjrn21c79jl7g9kkvd4lf4xabgbwbqlck7barfj256jv"
},
"stable": {
"version": [
@@ -62593,8 +62819,8 @@
"repo": "emacs-lsp/lsp-dart",
"unstable": {
"version": [
- 20210215,
- 1558
+ 20210313,
+ 1940
],
"deps": [
"dap-mode",
@@ -62605,14 +62831,14 @@
"lsp-treemacs",
"pkg-info"
],
- "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f",
- "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr"
+ "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d",
+ "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk"
},
"stable": {
"version": [
1,
- 17,
- 13
+ 18,
+ 0
],
"deps": [
"dap-mode",
@@ -62623,8 +62849,8 @@
"lsp-treemacs",
"pkg-info"
],
- "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f",
- "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr"
+ "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d",
+ "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk"
}
},
{
@@ -62686,26 +62912,36 @@
"repo": "emacs-grammarly/lsp-grammarly",
"unstable": {
"version": [
- 20210222,
- 409
+ 20210317,
+ 538
],
"deps": [
- "lsp-mode"
+ "grammarly",
+ "ht",
+ "keytar",
+ "lsp-mode",
+ "request",
+ "s"
],
- "commit": "699a0fda7b83953a19a30d235c6a4006f72f41fb",
- "sha256": "0ip55ji04z9mmlmhrwywq7sw4j98jq79lfac2j3nz0q1qx8576w2"
+ "commit": "f5675c58ba80258331dda99072c5bfac524dbf48",
+ "sha256": "0ziv51c9fq4yv8ll7087cd2bwqkl309b1a0gds67d160pj9swwhh"
},
"stable": {
"version": [
0,
- 1,
- 0
+ 2,
+ 1
],
"deps": [
- "lsp-mode"
+ "grammarly",
+ "ht",
+ "keytar",
+ "lsp-mode",
+ "request",
+ "s"
],
- "commit": "16825b8dde5dfb3042f4c6fb94be70d6f10b745d",
- "sha256": "1byv93xasdpiyfhszi8vh6z7jmhdhxh6lj91xhlgif0s209nfbs9"
+ "commit": "739a7efc7de6e2b0eca9e72268790431a0fb3185",
+ "sha256": "1ksa685ggp9z0zndscwy9azxjibxd9l79qzvh50i7mz4x9xzdjbd"
}
},
{
@@ -62786,8 +63022,8 @@
"repo": "emacs-lsp/lsp-java",
"unstable": {
"version": [
- 20210228,
- 1108
+ 20210309,
+ 1856
],
"deps": [
"dap-mode",
@@ -62799,8 +63035,8 @@
"request",
"treemacs"
],
- "commit": "93db10d0b521435824732e1e46ac1fcf05c9893f",
- "sha256": "0fskr9s7rp9dcarv3jz4pdkhhik0j6y19s10zp1fknwniql7kvj5"
+ "commit": "542aaf16d6d3a410b0e41861d80f3fd6b5be7bb9",
+ "sha256": "07kpx8gx9v9v6zhpl7kyg3q4dgpkxk1n089cn1hdxr5vapw7xac9"
},
"stable": {
"version": [
@@ -62879,15 +63115,15 @@
"repo": "non-Jedi/lsp-julia",
"unstable": {
"version": [
- 20200912,
- 1106
+ 20210310,
+ 1116
],
"deps": [
"julia-mode",
"lsp-mode"
],
- "commit": "c523c250c4bd2777203101ab417e9b7312472f46",
- "sha256": "0zgxgghsx9dw4b0i4p0l1kvp3bka7aw80iyr7x05sp1mwwchh2gb"
+ "commit": "c487ed715c49d863e8a8e76d13b37b6e694520d4",
+ "sha256": "0dqf34gq8rnskqj7m3vp8pxmzysg5bdchbyfhfz6h5yc0p52rvr4"
},
"stable": {
"version": [
@@ -62941,21 +63177,20 @@
"repo": "emacs-lsp/lsp-metals",
"unstable": {
"version": [
- 20201230,
- 706
+ 20210217,
+ 1027
],
"deps": [
"dap-mode",
"dash",
- "dash-functional",
"f",
"ht",
"lsp-mode",
"lsp-treemacs",
"treemacs"
],
- "commit": "c76eeb6b580fadf6a16357be8c22c197d22574fd",
- "sha256": "0r1sihiximsgjf7dyh9rndxwy26d5kfz04y13b0gq2lhvrgjbbkv"
+ "commit": "51a89c1861eb505882c20393227f303ac33276e4",
+ "sha256": "1l4ic84qpcn2z54knzhw1mj61s699gpyg6a01vbq9mbpx1sxs9lf"
},
"stable": {
"version": [
@@ -62984,8 +63219,8 @@
"repo": "emacs-lsp/lsp-mode",
"unstable": {
"version": [
- 20210228,
- 1524
+ 20210319,
+ 1818
],
"deps": [
"dash",
@@ -62995,8 +63230,8 @@
"markdown-mode",
"spinner"
],
- "commit": "555bd9f0ee598f2c5601c7e33ef640f4fbe8e246",
- "sha256": "0wjkcyq67447b79rif8hys2sy4gvzzb494jw6h8ab244zbkrrag9"
+ "commit": "726ba9b174be01ca84b850428c41b6f3b3dfc9c9",
+ "sha256": "15wmb3bapmkvg21dqhv6v3xjx1iaxbzbjxf0las6a87dyb8qz1gn"
},
"stable": {
"version": [
@@ -63246,14 +63481,14 @@
"repo": "merrickluo/lsp-tailwindcss",
"unstable": {
"version": [
- 20210208,
- 1458
+ 20210315,
+ 624
],
"deps": [
"lsp-mode"
],
- "commit": "0558fd1cdbc31c48ca02308bee1b65c77f3fce3a",
- "sha256": "0lbpwcf6vnk99rk3mzq3mbh4nxgl6prjrrak2aq9c789n7qainfr"
+ "commit": "d11cdc25be8e20400a1f9005f716648dd2ce4a3f",
+ "sha256": "1gls3c2ai2axnsl2dh4vy8l6hr1fyzv4hxi6yss5fw0xs8rqq7c5"
}
},
{
@@ -63302,16 +63537,16 @@
"repo": "emacs-lsp/lsp-ui",
"unstable": {
"version": [
- 20210220,
- 703
+ 20210317,
+ 1358
],
"deps": [
"dash",
"lsp-mode",
"markdown-mode"
],
- "commit": "0ac3e12138a7eeaf764845d1e7e61b02769003ec",
- "sha256": "1xqdmbfvn3i7lpk287jslgc9j6zlfxxw6hamqhb25y22bkqjgxsp"
+ "commit": "784e6d4bb72c6ad1338f3c62d88e2e95056f236f",
+ "sha256": "04xv0v8l6x57d66rlk4ibs9m59hvliv35ikmiz1dygpdn3ili9zh"
},
"stable": {
"version": [
@@ -63732,14 +63967,14 @@
"repo": "zk-phi/magic-latex-buffer",
"unstable": {
"version": [
- 20200816,
- 648
+ 20210306,
+ 422
],
"deps": [
"cl-lib"
],
- "commit": "8a6e33f79a930d2c1977409f1980afc4cc99b909",
- "sha256": "1f052yx0fib6vv2kqr21fv1nlsxc1b0mlcxasppxr6kig1jbj2x9"
+ "commit": "903ec91872760e47c0e5715795f8465173615098",
+ "sha256": "0n2f3y6b6n8ipvk99ai1hwqddkwg5y97ks068wvp4rr4fspxkm9k"
}
},
{
@@ -63774,8 +64009,8 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20210228,
- 1841
+ 20210312,
+ 1012
],
"deps": [
"dash",
@@ -63783,8 +64018,8 @@
"transient",
"with-editor"
],
- "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7",
- "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356"
+ "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a",
+ "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56"
},
"stable": {
"version": [
@@ -63871,8 +64106,8 @@
"magit",
"xterm-color"
],
- "commit": "fc4de96e3faa1c983728239c5e41cc9f074b73a2",
- "sha256": "0gyjsjjjdbns8vlbja8wvmba8sq85ah7cawqqm0xjinrpfrhh8b7"
+ "commit": "1164a6c3e501e944f1a6a2e91f15374a193bb8d3",
+ "sha256": "1a24qpqdk00prprm5s4gwfi1hvdljp2808rg33qaaa1087zdavqj"
}
},
{
@@ -64130,8 +64365,8 @@
"libgit",
"magit"
],
- "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7",
- "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356"
+ "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a",
+ "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56"
}
},
{
@@ -64285,8 +64520,8 @@
"deps": [
"dash"
],
- "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7",
- "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356"
+ "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a",
+ "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56"
},
"stable": {
"version": [
@@ -65075,19 +65310,19 @@
"repo": "minad/marginalia",
"unstable": {
"version": [
- 20210224,
- 1404
+ 20210317,
+ 1054
],
- "commit": "2387cba868a21f6c18244b8c84125221a866dfb5",
- "sha256": "00pr1zw9si8if76pjvxvalxzwk42320y2k6fnkbpdfm8yv6pxkd1"
+ "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f",
+ "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh"
},
"stable": {
"version": [
0,
- 3
+ 4
],
- "commit": "62ed158ff588900b9d3e56f3f05f659763c8c2ba",
- "sha256": "1qihw1vq9sysrl6ha23ggycp0n2n1dx1ajkaqfm5vmv8480al07i"
+ "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f",
+ "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh"
}
},
{
@@ -65624,11 +65859,11 @@
"url": "https://git.code.sf.net/p/matlab-emacs/src",
"unstable": {
"version": [
- 20210225,
- 1441
+ 20210302,
+ 1630
],
- "commit": "00e25f897c56c91a18bb821cd502270cad91fa0c",
- "sha256": "1zbwzfsqkw97ywl60h6ryvrlcq82z8407g29w93cigakfwg6ir6j"
+ "commit": "a47515461ae22fcb90b6f8e45a6304bcb44b953c",
+ "sha256": "0wffq7hn5vmgvyysvhkgngcp77mq5fddia1q3n90rmb0ql2z2qg2"
}
},
{
@@ -66145,16 +66380,16 @@
"repo": "DogLooksGood/meow",
"unstable": {
"version": [
- 20210301,
- 59
+ 20210319,
+ 1657
],
"deps": [
"cl-lib",
"dash",
"s"
],
- "commit": "5f01f8be74853f27cff021ad6e750f4b31e9375d",
- "sha256": "009kfsis6qib0ax9nlipcvwclqk4kyqwafvsymssvls0r7ar50f9"
+ "commit": "a3dbefc07f897fb09124d8568272a31791657898",
+ "sha256": "15969wbd9wqryi2q1f3n21c732m0my5rp9lc3v4xa4w288s1m21a"
}
},
{
@@ -66168,8 +66403,8 @@
20210129,
1443
],
- "commit": "2a0dd5c16178efcc4b8132e3c3b3c2a6cc7b13ea",
- "sha256": "0aa0izxahpyzv9vz3g8q6m332ndqb8kxgwx22bxnf01n9v90v2j7"
+ "commit": "5dae97414e4e4f68a9d71d79362e03416bb6e6ce",
+ "sha256": "09c430k88kwvcni1v68ncvnf5pdpp236ij8k6vf5rnm5khki6vj3"
},
"stable": {
"version": [
@@ -66764,14 +66999,14 @@
"repo": "kiennq/emacs-mini-modeline",
"unstable": {
"version": [
- 20201221,
- 1825
+ 20210312,
+ 452
],
"deps": [
"dash"
],
- "commit": "7dcd0ab81bb7c298377708061176f5c5a50f77db",
- "sha256": "1bik23ci0h9gki7ysw7r5wj5z9ib56167qzk7sac2wqw9xmi8dbb"
+ "commit": "3e67b8e59d46659df4b37dedf75485a366c93600",
+ "sha256": "1iqdbm90qj90a522qmssbqn5im0kxdw1kxq7z821ss3fag960xw8"
},
"stable": {
"version": [
@@ -67122,8 +67357,8 @@
20210215,
1755
],
- "commit": "40caa67262c78e7668147f86a2b7ca1dad4b2190",
- "sha256": "0wcqj0wf1bhqsbvs52a7nwix71nmiy0xixvmmx2pkg7c7mxpm6v4"
+ "commit": "177a269d1f16dc5902f08d56d12a084ea028c8ab",
+ "sha256": "000h78k729irpn31xykq1r6kdnrcfvv5m9cc8g9l1lfp6pjhmd9c"
}
},
{
@@ -67355,11 +67590,11 @@
"repo": "mrkkrp/modalka",
"unstable": {
"version": [
- 20190713,
- 1335
+ 20210318,
+ 1748
],
- "commit": "4b2b92b14ed0b64fb0a0fa80a374ec9f87fbfeb6",
- "sha256": "18dbnicaqryq4xhv4d7hds61k85kj3bnpcqv7rippvlyrqm2r6wx"
+ "commit": "0accefac11451b9c9196a56223b5fe1e26d75e6e",
+ "sha256": "04i776arnyg2gzzhiifarb73dr4w3sg38kw9cwp1bl1x5w49x47x"
},
"stable": {
"version": [
@@ -67567,20 +67802,20 @@
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20210228,
- 2012
+ 20210319,
+ 543
],
- "commit": "9d3538f8a5007e33640b8ac1a0b725afc6287174",
- "sha256": "0h3y94gglkdlygdkhakxlp5gmpvhrl76z2cm22pads722j1jj5nw"
+ "commit": "121aa48cadd9ab3fd64f5cddc057bdcc94dd7383",
+ "sha256": "1aqsh0qbk0rkcfznbbhhja3whl6xygij89kdqlzc4az0kj43l2jq"
},
"stable": {
"version": [
1,
- 1,
- 1
+ 2,
+ 3
],
- "commit": "585659d36ac41dcc97ab335daa5bde566f088d4b",
- "sha256": "1n716nasa1pccz7983kicagc9sqnxlyfmflvifqk4kza2ks0rh9m"
+ "commit": "0a36239baf908585cdf32c6188eb86713d9bf6c6",
+ "sha256": "1l392hz6zs6wg06x2zxnk7s0h5cpmvbkcynh68gjmqjj84l7mqrk"
}
},
{
@@ -67591,11 +67826,11 @@
"repo": "kuanyui/moe-theme.el",
"unstable": {
"version": [
- 20210226,
- 1623
+ 20210308,
+ 1053
],
- "commit": "697864d14f4b620f1be579a975bf97b769d2199e",
- "sha256": "19jqf6q2fl89hpf6jl53kl6a64aryf5q2hm1dg14fyiag883m9q9"
+ "commit": "d432815230f4e62d3f38a0819621ff227f780522",
+ "sha256": "1gfqx0xvxyyf35yngc5sgq7xb42xxv8wzvm36sgg2qqlkgvrh6fz"
},
"stable": {
"version": [
@@ -67923,20 +68158,20 @@
"repo": "takaxp/moom",
"unstable": {
"version": [
- 20210228,
- 718
+ 20210318,
+ 1137
],
- "commit": "a756418dde112a67c4c68355bee46ef17fc45d07",
- "sha256": "0csv7afdyzvpnc1znh4fz3d7ddgi51dfkfbr3c1mv6wvwg844j2a"
+ "commit": "9d3170f60dd188bac2d0304daf2a94bec9bfbbd3",
+ "sha256": "1fc20zglhv48aiy5vl8y6vlk3nimwgfzajx8pq4n7jga3k7cp0q5"
},
"stable": {
"version": [
1,
- 4,
+ 5,
0
],
- "commit": "42d809ed57ad6ed63dde61f75e4b535b2700aaca",
- "sha256": "0ln8qa51v1r5m2z4cjz7kfdmvq48lwgsdf7z43zmb1nzvn10gcvg"
+ "commit": "d0076ea22b2afc4c3faeea2138e836b1c8f08988",
+ "sha256": "0hz525xmv6kslss3yn8ibj6bi2xp442knad0030px7giia6y1pf6"
}
},
{
@@ -68255,11 +68490,11 @@
"repo": "google/mozc",
"unstable": {
"version": [
- 20210109,
- 642
+ 20210306,
+ 1053
],
- "commit": "36c81efa69ecf6843e8b671a3caffb905a54f72f",
- "sha256": "0smfhrcikxzaw4qbvq84ac51rdjw1mm5lm58zb8zyps7pzv3d9s8"
+ "commit": "8ad7b19d89e65ec81c78204986088154d8702309",
+ "sha256": "1m4vnwfr04cr3rbg7cny49spz08c09sgm8zpq99r510xn8xxs7vg"
},
"stable": {
"version": [
@@ -68526,14 +68761,14 @@
"repo": "andrmuel/mqtt-mode",
"unstable": {
"version": [
- 20180605,
- 1731
+ 20180611,
+ 1735
],
"deps": [
"dash"
],
- "commit": "36d1d4296d79e17b8f35e8e14f2708980eb502db",
- "sha256": "1116xvwpavg7icm263s0clgxhw3qqm4aqiw4ky94w9a8ydazx51l"
+ "commit": "613e70e9b9940e635e779994b5c83f86eb62c8e6",
+ "sha256": "1ci1w4yma6axiigz55b2ip0r7zy8v215532jc0rkb3wyn14nsrh7"
},
"stable": {
"version": [
@@ -69882,11 +70117,11 @@
"repo": "CeleritasCelery/emacs-native-shell-complete",
"unstable": {
"version": [
- 20200814,
- 2301
+ 20210315,
+ 2048
],
- "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52",
- "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd"
+ "commit": "cf142e84eaa4dd91bc75d96a5d26dab5e38eba4c",
+ "sha256": "01li6c271v5j35chg3a8nl9az3bwq4hk1j8lfjq5a27p91iszpc0"
}
},
{
@@ -70544,11 +70779,11 @@
"repo": "m-cat/nimbus-theme",
"unstable": {
"version": [
- 20210115,
- 2034
+ 20210318,
+ 1654
],
- "commit": "ca504e4387641b648e7bc6037fe515b03a90b801",
- "sha256": "0gz2qrkr4gvy5wh44wiy7mhqwlxgfa8fyg0bincnba89161fnymk"
+ "commit": "a4d9d69442c9edac3f2cacabd2a7401dbefe7ff3",
+ "sha256": "1h828cxjacfqlhm719w2kwh91i0r1lai6wswpp7wp21wvvp28v5r"
}
},
{
@@ -70562,8 +70797,8 @@
20181024,
1439
],
- "commit": "1a8015038d9a8c6bf0c04a42588fb2a26861be63",
- "sha256": "08071i5zv0jg9yb83bq9r2sj6hyw31ziwzg79gsbyr7l8whz7cx8"
+ "commit": "ac0fe07d9e924661c6c443f4a9503d4f4308fb20",
+ "sha256": "06ifnn51pqsjx958rj8wwkq3dpw2gsfnqhhlfc27frf9zjk0qdwh"
},
"stable": {
"version": [
@@ -71267,8 +71502,8 @@
20210205,
1412
],
- "commit": "4c79a2dabe38ac72eb9eb21620f2ffca5f1885c6",
- "sha256": "1kfg503j44ivcx9zsqzgjl7ab936vwnw31gb6kpcjhd1kyha0mjm"
+ "commit": "13efbd0e1c88fcbdb48b4c30c7852c5bf1fbd0b7",
+ "sha256": "0xc06vqyqpkbq6hd00vdcwxk74mraxmbswin3j716iyx5j7hk7wc"
},
"stable": {
"version": [
@@ -71601,8 +71836,8 @@
20210129,
850
],
- "commit": "72fac3d4b7a1c42a71cb396d20cc22fca8a52ed5",
- "sha256": "17ks8cmnwc313q9vcxbrsv9xmji2hdnw18jczc3xrgl441vkzds1"
+ "commit": "2aa3a96abbc76f007923f3fbb19a5246e29ae500",
+ "sha256": "0lhl49cs0sdr7p22spxf83sixp1pzjiq11plmxc8i0lqv735b9sn"
},
"stable": {
"version": [
@@ -71737,15 +71972,28 @@
"repo": "douglasdavis/numpydoc.el",
"unstable": {
"version": [
- 20210301,
- 25
+ 20210305,
+ 2006
],
"deps": [
"dash",
"s"
],
- "commit": "8a7430de69650dbd2e91fd746c2f8fe1665e5a45",
- "sha256": "1n26c8kj6w36v3cz15497r51rkb03ngsgkld5qcy75j8ha7mddwz"
+ "commit": "a8bc2a58220e7eb92d61a637c2c6d8cb2ccb270b",
+ "sha256": "1c2nhg00naqj2m4avjsk03bpdbkspsjkng5fdhf6nx58ny9xdj5p"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 0
+ ],
+ "deps": [
+ "dash",
+ "s"
+ ],
+ "commit": "1549f362fda96b75760f20cee9b471362823ef4e",
+ "sha256": "1d5ff42fifssb38qvmhr8p6rvgak7z1mjhandirla05bjb4cramp"
}
},
{
@@ -71969,8 +72217,8 @@
"deps": [
"axiom-environment"
],
- "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f",
- "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218"
+ "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6",
+ "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7"
}
},
{
@@ -72994,8 +73242,8 @@
20201204,
945
],
- "commit": "7db8d1377a127b39e2bf985c91b6a9a8d6cbeff2",
- "sha256": "1vwmw3dcqxg7sy0ki86gq4kpva5ncwzygzbl5ml9947xklvnw9in"
+ "commit": "585b139f3dee1f801edbbf6545891232119c9087",
+ "sha256": "15gfvnkqzixwvq4jq8w6y7v7lyd2j8gca62hap3rsh6c41b8ls1p"
},
"stable": {
"version": [
@@ -73535,8 +73783,8 @@
"popup",
"s"
],
- "commit": "8ec59296b2e2a12d8ea146fb7056091fbb7bdd10",
- "sha256": "02kx5gx1hk5r3lks3y9myq3x90zcz0snhckyf7sx45ydgnjxm5j4"
+ "commit": "5fad6835bee15792774183164dd423ba18cf1e01",
+ "sha256": "1ww202j6bh8ycw2wfngy9rw1hv5qrjg66bgp2yj28j12ag1qxn2r"
},
"stable": {
"version": [
@@ -74060,6 +74308,21 @@
"sha256": "009n23gcgyfylp4q6igj67r606syq2r43s86g12xkl3vmc14929b"
}
},
+ {
+ "ename": "org-appear",
+ "commit": "d4c5bea920593d5da72b4208c0727b5ced0a588a",
+ "sha256": "1b88r4nsvm1ndicwc2rgkznmfcyb6bz7fb05fw667dw6mzmlpxk1",
+ "fetcher": "github",
+ "repo": "awth13/org-appear",
+ "unstable": {
+ "version": [
+ 20210307,
+ 1335
+ ],
+ "commit": "0b3b029d5851c77ee792727b280f062eaf2c22c7",
+ "sha256": "136z40r0i9q9wqbj4yxa8d4c2ygx7dzp9i126ra56sm6cdkvz0cj"
+ }
+ },
{
"ename": "org-attach-screenshot",
"commit": "f545cd8d1da39e7fbd61020e178de30053ba774b",
@@ -75001,8 +75264,8 @@
"repo": "kidd/org-gcal.el",
"unstable": {
"version": [
- 20210228,
- 2038
+ 20210313,
+ 420
],
"deps": [
"alert",
@@ -75010,8 +75273,8 @@
"request",
"request-deferred"
],
- "commit": "133cca813abd2823a6e2a9ada295b7b8b115be4f",
- "sha256": "1mwspxx1im87qa886w9ib8a104xzi02qky6z5pl8va0mrcnpl86i"
+ "commit": "d38acdad70883dc3fe34a4cd41024e5a8099ddb2",
+ "sha256": "17lnsn045l99w787mbrq623div40w3c59rgryvx04px085bb2i5g"
},
"stable": {
"version": [
@@ -75373,30 +75636,30 @@
"repo": "gizmomogwai/org-kanban",
"unstable": {
"version": [
- 20200729,
- 2120
+ 20210315,
+ 28
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "70b4c9823b32ae299f3da521966b6c5abacf73e2",
- "sha256": "159g13m1zpc1b2ggs9iw2l51pj0h433y1x00bgznhc9fvamysasd"
+ "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257",
+ "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h"
},
"stable": {
"version": [
0,
6,
- 1
+ 3
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "fbb27c3983ad735a333c766815642a6615cea2ed",
- "sha256": "0xclk323hq4lszqmvba4v8785v57bxfxln5n1hy0vaf0f45hfkjw"
+ "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257",
+ "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h"
}
},
{
@@ -75426,8 +75689,8 @@
"repo": "yangsheng6810/org-latex-impatient",
"unstable": {
"version": [
- 20201123,
- 845
+ 20210312,
+ 2250
],
"deps": [
"dash",
@@ -75435,8 +75698,8 @@
"posframe",
"s"
],
- "commit": "d8be05fd6857c72a1766e3fa9dafa1602ccf88e3",
- "sha256": "0vidxcv07brz4adik1826g0v7zyyz80r84kzz01rcxcc471fl957"
+ "commit": "a27ec1491c7d897904e84d9b9db380e1a4c7914a",
+ "sha256": "0r0yn0z4d5y5mzc8awg8wcb3lvb058c7gk7v5mghnwln50zvqqia"
}
},
{
@@ -75525,15 +75788,14 @@
"repo": "dfeich/org-listcruncher",
"unstable": {
"version": [
- 20210130,
- 1405
+ 20210304,
+ 1602
],
"deps": [
- "cl-lib",
"seq"
],
- "commit": "291a824d8da1c14a883e21281b596ce9dcd11e1b",
- "sha256": "0bz57dvydz67bk704q2daxkfpdygxmz9jf6ilycjip2v16lx37i1"
+ "commit": "b0269843f317b6715dbde8a4e955aac9c38cbdb6",
+ "sha256": "1ywwngjqfvppxbb0dghqzr0kg9dxyqidjgjrh4ncc0zc9iamcx2w"
}
},
{
@@ -75577,14 +75839,14 @@
"repo": "org-mime/org-mime",
"unstable": {
"version": [
- 20201224,
- 1404
+ 20210309,
+ 1028
],
"deps": [
"cl-lib"
],
- "commit": "b47811562ba5c0882e9bacf9124b18fb5d0f4a61",
- "sha256": "0xnrgf5p9l920lfzfxa7msjfgm6ic7xfn4mycxjv9jmdnkdm85hw"
+ "commit": "eb21c02ba8f97fe69c14dc657a7883b982664649",
+ "sha256": "0bgrp39mi8pqfr8hfd2lgjil3br55bgilhj09hy3v6klzypbdviy"
},
"stable": {
"version": [
@@ -76510,8 +76772,8 @@
"repo": "jkitchin/org-ref",
"unstable": {
"version": [
- 20210225,
- 1454
+ 20210315,
+ 1730
],
"deps": [
"bibtex-completion",
@@ -76526,8 +76788,8 @@
"pdf-tools",
"s"
],
- "commit": "7dbe3ace9bf8ba9bd7c28c73ff960b4732d09071",
- "sha256": "0nyqhbdbawg0rfqzgfqhk38hk1mb0naksrmrgha669zzmha6vd29"
+ "commit": "7b0ebdd2e34b3a509c7f043cb9d919a0069491c2",
+ "sha256": "1r1p2k9x5sddxr8cf5ds3hqz2xn4zvy9zabgyr63s16cl7hhn2lg"
},
"stable": {
"version": [
@@ -76653,8 +76915,8 @@
"repo": "org-roam/org-roam",
"unstable": {
"version": [
- 20210128,
- 1341
+ 20210308,
+ 457
],
"deps": [
"dash",
@@ -76664,8 +76926,8 @@
"org",
"s"
],
- "commit": "b0fd12647b94ba6e3cf82a2a5b1ee7655ac07760",
- "sha256": "0blpfwiff0sn39hfsk2zznmkj8ad0f4a65vcbgdqmmc9i56yahv1"
+ "commit": "8ad57b121831eda8d226faa14ff2ba7ab652849c",
+ "sha256": "162qhb6rkpl1n0l8yhnwgagsx56ykaj9lchsny1id5z1257kgw9w"
},
"stable": {
"version": [
@@ -76693,28 +76955,28 @@
"repo": "org-roam/org-roam-bibtex",
"unstable": {
"version": [
- 20210226,
- 1227
+ 20210316,
+ 840
],
"deps": [
"bibtex-completion",
"org-roam"
],
- "commit": "356cb0f882ed925913dd41e1901dec0c2f86fb98",
- "sha256": "0p616v191h10hz98la52qy19bg1ry4vy6y88hgw0i3ndh6k872s2"
+ "commit": "81b6fedf99996a78199067e61935964dea9389ee",
+ "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9"
},
"stable": {
"version": [
0,
- 4,
+ 5,
0
],
"deps": [
"bibtex-completion",
"org-roam"
],
- "commit": "71da772469bcb49d4a93ee9d9704fbee9488aa28",
- "sha256": "13pll793khyfncpwm2dg24w747sqp7kgf7m3fqw2xzhv9cx2g7nq"
+ "commit": "81b6fedf99996a78199067e61935964dea9389ee",
+ "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9"
}
},
{
@@ -76725,8 +76987,8 @@
"repo": "org-roam/org-roam-server",
"unstable": {
"version": [
- 20210201,
- 1122
+ 20210312,
+ 1125
],
"deps": [
"dash",
@@ -76736,8 +76998,8 @@
"s",
"simple-httpd"
],
- "commit": "2093ea5a1a1f2d128dd377778472a481913717b4",
- "sha256": "1jp8mkqx1l3w166b16l2d5zsqjcc836bkclplgjk4laysb6msry8"
+ "commit": "a9051e03a2fc3744aa6716ebb529142caa0af2f0",
+ "sha256": "0199ri3xabrc7xy746s0f87y6vy9hw90ylw5pj7ha29xvcrfh851"
},
"stable": {
"version": [
@@ -76974,8 +77236,8 @@
"repo": "ndwarshuis/org-sql",
"unstable": {
"version": [
- 20210220,
- 2146
+ 20210306,
+ 329
],
"deps": [
"dash",
@@ -76983,13 +77245,13 @@
"org-ml",
"s"
],
- "commit": "87c712740cc0e934bbb9fd322386adf45f05c543",
- "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z"
+ "commit": "c93834332a333f6a602d3bbe0b39c79abb2f78cb",
+ "sha256": "1wp3d3b1wdw8v5drwbrfxrbq8psf82bs9cwjin2psfgb4n1166dy"
},
"stable": {
"version": [
- 2,
- 1,
+ 3,
+ 0,
0
],
"deps": [
@@ -76998,8 +77260,8 @@
"org-ml",
"s"
],
- "commit": "19eaba4dcadb3f1101a2363aac2a6d2430559c70",
- "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z"
+ "commit": "1cc854e814f86bc35f536563837a97a832a06122",
+ "sha256": "1wp3d3b1wdw8v5drwbrfxrbq8psf82bs9cwjin2psfgb4n1166dy"
}
},
{
@@ -77010,14 +77272,14 @@
"repo": "akirak/org-starter",
"unstable": {
"version": [
- 20210219,
- 1622
+ 20210314,
+ 1558
],
"deps": [
"dash"
],
- "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2",
- "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf"
+ "commit": "786257e682bf147022d5b19e6df6e7c9939193af",
+ "sha256": "1vfw06c08yhpc1dbqb4gprh9l3j0rgsyvhhgmvcv3y5cq2yaibhb"
},
"stable": {
"version": [
@@ -77048,8 +77310,8 @@
"org-starter",
"swiper"
],
- "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2",
- "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf"
+ "commit": "786257e682bf147022d5b19e6df6e7c9939193af",
+ "sha256": "1vfw06c08yhpc1dbqb4gprh9l3j0rgsyvhhgmvcv3y5cq2yaibhb"
},
"stable": {
"version": [
@@ -77073,20 +77335,20 @@
"repo": "bastibe/org-static-blog",
"unstable": {
"version": [
- 20210222,
- 1035
+ 20210306,
+ 1316
],
- "commit": "9b9f7a994be54a10f5ac2a58221d52555574f78d",
- "sha256": "1s3p7ig0swp1msvrzbkpyf6nv121rgschcacs3c5ps758yldg5lh"
+ "commit": "ea437f80de87ea72deff1d420854bd2c011ef4e5",
+ "sha256": "0y6i2cc99x5cl8ylyfarim1pka5cy4zqmv2m4x2s9bsar60nwmii"
},
"stable": {
"version": [
1,
- 4,
+ 5,
0
],
- "commit": "58019b6dd1ae1323b72d491e65bf9636a9278dd6",
- "sha256": "00yhgxg87mfaflrkh0i905hr873yd03a7znw5hkrps43zxha9kb9"
+ "commit": "734dd263cf79e4d5a0077f8b5ce344ea45bf7f3d",
+ "sha256": "1p9v40mm8p25b9xgfahwqqx4c36aqnl9yyjjdhkp6x5xkhkdf7by"
}
},
{
@@ -77298,15 +77560,15 @@
"repo": "stardiviner/org-tag-beautify",
"unstable": {
"version": [
- 20210202,
- 628
+ 20210304,
+ 1124
],
"deps": [
"all-the-icons",
"org-pretty-tags"
],
- "commit": "4a6de709ee0d4ee719c83df6dce86f38f9db1f75",
- "sha256": "02qw4b750p4rav9kw3qwcvmril8wxkgdfqklbrfbws6wz2sjjv3l"
+ "commit": "e655ced70140cbec8fe12f9207614ca2b3a6c37c",
+ "sha256": "0853avvi2qpr19ca6c9ix8ls7r2r5v5f38nzkr4lbindmmxl6kpv"
}
},
{
@@ -77639,8 +77901,8 @@
"repo": "org-trello/org-trello",
"unstable": {
"version": [
- 20200508,
- 1705
+ 20210314,
+ 1856
],
"deps": [
"dash",
@@ -77649,8 +77911,8 @@
"request-deferred",
"s"
],
- "commit": "56c519a00c6e3c8f6923cd0460342089d58c41c9",
- "sha256": "09028167pi9pzgcb8fpvqgvzviq1fxvgby5lb99wvyy94vjxwnk2"
+ "commit": "0435d77cd32cf475ce71b81cda4bb48066c44f31",
+ "sha256": "1nnii5d5qf0bgfpywmhzprh6f1hk39k2wnhnjl0ahqm99bl46fps"
},
"stable": {
"version": [
@@ -77680,8 +77942,8 @@
20200919,
1348
],
- "commit": "e086c59a14701cd041641b51c952fa704ee963df",
- "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
+ "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
+ "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
}
},
{
@@ -77769,17 +78031,16 @@
"repo": "akhramov/org-wild-notifier.el",
"unstable": {
"version": [
- 20200926,
- 1502
+ 20210308,
+ 1348
],
"deps": [
"alert",
"async",
- "dash",
- "dash-functional"
+ "dash"
],
- "commit": "b83d31422abcf9527d5ec0344f2fa2df5b76a357",
- "sha256": "0cdd93sqx0ijajqa2z91bg6h6m1njsaqzwygr8q28dd2pazxq5xc"
+ "commit": "b616924f9b6e2c26c21e07ad6bccfc26826b7be3",
+ "sha256": "0ps3kzi95ybr7adrspmhflw9jw3h5d6lf0kl5cn45myyyjapckjj"
},
"stable": {
"version": [
@@ -78110,15 +78371,15 @@
"repo": "magit/orgit",
"unstable": {
"version": [
- 20200714,
- 1943
+ 20210309,
+ 1906
],
"deps": [
"magit",
"org"
],
- "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646",
- "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481"
+ "commit": "609fd0ccfb5268704b5bc7d7ac1014d4960b9707",
+ "sha256": "00rmp5pbn7bn4mrfzlkh9dc5m80qw72bs5jxdss9sk38v1gvxbr3"
},
"stable": {
"version": [
@@ -78252,8 +78513,8 @@
20201129,
604
],
- "commit": "50ce687d0be602c86256211fc8f783f5ef7df8a5",
- "sha256": "1hr476lr2lwh4hz8z9yi2n3gdyzaabchn364jzwkppjksq9q0q6h"
+ "commit": "5c065aa584d18257a58cd7c5439df5ce23d989c3",
+ "sha256": "1pmkkihnrch7z705mc94dmr8bxb4mgg7c5iirmrar4hhg84l13q2"
},
"stable": {
"version": [
@@ -78273,11 +78534,11 @@
"repo": "tbanel/orgaggregate",
"unstable": {
"version": [
- 20210225,
- 915
+ 20210315,
+ 1415
],
- "commit": "bcb38ada8469a7f6f9a915c36760a05b2c68ad88",
- "sha256": "1db0wm7dlx1yqnfhbw4m3q3a8x4wk02j1c276qazhff4n03mbhf8"
+ "commit": "639ec296ccca4e2f7405e9ef72506fad609f2167",
+ "sha256": "0nkm6y851sm1bp8ch9d7dxi1z07qs1254ab8zjv16hvq8arp0s6c"
}
},
{
@@ -78500,14 +78761,14 @@
"repo": "xuchunyang/osx-dictionary.el",
"unstable": {
"version": [
- 20191206,
- 519
+ 20210309,
+ 115
],
"deps": [
"cl-lib"
],
- "commit": "1b79ff64c72485cb078db9ab7ee3256b11a99f4b",
- "sha256": "1lnjpsb09w48ibjvabqkxqh997mv61zpvqhx3d35q4lw5sirgjxg"
+ "commit": "4d4cc19fdd4ac8408bd5acc7694e7a7096b1e3b3",
+ "sha256": "1zmng3qx7i4wkz1vrxw0vw3kyirnb8a0pn46zq6zhzj33ybn9582"
},
"stable": {
"version": [
@@ -79182,8 +79443,8 @@
"deps": [
"org"
],
- "commit": "6805ccc23365620004034c18fbed22a8a07bd4dc",
- "sha256": "12z1w6xsdx7p3q20h3bfap7ghxlj7awd6vpf4g3r7acd86fmxkjq"
+ "commit": "02140a294a8d0d15ca42a1956af794fd7ec18140",
+ "sha256": "1sjfiypk3707jh4r4ndym8chiahw0imlawkx7hsrv2ld65hc78lp"
},
"stable": {
"version": [
@@ -79970,14 +80231,14 @@
"repo": "melpa/package-build",
"unstable": {
"version": [
- 20210209,
- 1639
+ 20210318,
+ 1411
],
"deps": [
"cl-lib"
],
- "commit": "d8ec8ddf5e39b61e9338de9a778633b7e01854cd",
- "sha256": "1wdii6hlvd4pbgf7bp9d8ay0kd34nyxz2w7gyq2kx43hlcgxhyp1"
+ "commit": "af4f87beb48afc3fb455c58648749e5bfdda1d03",
+ "sha256": "1cn61si2dn60pm3q0d0yjlrsfbns2v51zsdfl52rnfmnrhnl3qjl"
},
"stable": {
"version": [
@@ -80424,28 +80685,27 @@
"repo": "joostkremers/pandoc-mode",
"unstable": {
"version": [
- 20210201,
- 1150
+ 20210317,
+ 2340
],
"deps": [
"dash",
"hydra"
],
- "commit": "69ec31fc4da30dca2d223ac9ed1bcb5f9d3801ba",
- "sha256": "0c4j95c2axbhw0jnqsj9qxc62cdqwk2w3g4a2zgi64m2qlf3q4c9"
+ "commit": "2ad3cfa3045e0a3bcbdee02819c6fd356a8bc40c",
+ "sha256": "1m6c5y95asrw7fkn9sah6a38glr66vb35d3g6gc8lcvh2ikmgjn1"
},
"stable": {
"version": [
2,
- 30,
- 1
+ 31
],
"deps": [
"dash",
"hydra"
],
- "commit": "0630a112ae7d3eab1a4c47c7ef380915560a6bb2",
- "sha256": "1k31pkvd9m798i6phcr0y3wd34fgq6ii41hx3lszmikvxb1yvm2y"
+ "commit": "500e80666fb779457be8771c5613c177187ba0cc",
+ "sha256": "1c3gay9fkikg7h46djw1nf86fzckmv7w1zbz5fbar20klcr12pbm"
}
},
{
@@ -80482,8 +80742,8 @@
20200510,
5
],
- "commit": "e086c59a14701cd041641b51c952fa704ee963df",
- "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
+ "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
+ "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
}
},
{
@@ -80711,11 +80971,11 @@
"repo": "justinbarclay/parinfer-rust-mode",
"unstable": {
"version": [
- 20210218,
- 1650
+ 20210308,
+ 2025
],
- "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774",
- "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x"
+ "commit": "c19374a3cf9ce57a356a044731063040c552df32",
+ "sha256": "04mghs7wn6ml8nr75pvqzzrjljv9d5252j4qkcg2llbpvhkya75h"
},
"stable": {
"version": [
@@ -80774,26 +81034,26 @@
"repo": "jcs-elpa/parse-it",
"unstable": {
"version": [
- 20210222,
- 1623
+ 20210306,
+ 821
],
"deps": [
"s"
],
- "commit": "b1b80d1bd1cb852d344a8daf6ba7142be2c9ee7b",
- "sha256": "1dckhlzxzr8zj6hbccgs60igigcij9qrvsb3v80z5dqgj24mqab2"
+ "commit": "f910af3b1d98b88a0f41794bbe7fd57411e9b909",
+ "sha256": "02miw5sf4bbwmz58ya98ijjhqx92vamyzw8c5v2k6id3pxaypng4"
},
"stable": {
"version": [
0,
2,
- 0
+ 1
],
"deps": [
"s"
],
- "commit": "580713c0c578f6c91f6851ae2120e8a9b7871bb0",
- "sha256": "0c61gyks581xx47a4lrdjx64d1x1py7qmzsxklvwlcx0gq6pzalm"
+ "commit": "f910af3b1d98b88a0f41794bbe7fd57411e9b909",
+ "sha256": "02miw5sf4bbwmz58ya98ijjhqx92vamyzw8c5v2k6id3pxaypng4"
}
},
{
@@ -81661,8 +81921,8 @@
20160321,
2237
],
- "commit": "1d410a4e48db07a942e54d3b83a85c7a7ec0aab3",
- "sha256": "1b7csqypqkalkzq6vrbq5ry1gdk0qnhnk43rlj514mph0s1nywdd"
+ "commit": "29f6e7058f635b0084880a1f890a6c92501e8c29",
+ "sha256": "06lzb3mzrf2hqbdj4m8vfayf1xar9dgkwznzsqkbj6gjwxbz6xvd"
}
},
{
@@ -81960,14 +82220,14 @@
"repo": "nex3/perspective-el",
"unstable": {
"version": [
- 20210104,
- 2243
+ 20210310,
+ 25
],
"deps": [
"cl-lib"
],
- "commit": "697d95f24e055eb9725781d179d7db63d6afd2b5",
- "sha256": "18sjkqc94kawgfv3q9ai8m0bq3h63mlyg47bxyv0zyn34n1mpc9l"
+ "commit": "cbdc3e5dc77ccb681f8719db0a85af8850b757d2",
+ "sha256": "0q5sxwf0dkm1glnwsgm8387vzfxjj14g48ih72dpvarxysrrv2ql"
},
"stable": {
"version": [
@@ -82169,14 +82429,14 @@
"repo": "zk-phi/phi-autopair",
"unstable": {
"version": [
- 20200914,
- 355
+ 20210306,
+ 424
],
"deps": [
"paredit"
],
- "commit": "8bebd5d3018746812847b6c47ab7c79a36382e7c",
- "sha256": "1mf5blmws9kc3h4d9iy7r38w6kvi5w2gvmlbrxlwmh95a3y1n3nz"
+ "commit": "6a67c37d31a3ff9261fc9f812547a0c86721fc90",
+ "sha256": "0m1n77sq7cr1j6chf13zf4x34qyjycbimfpwk0msq1zc6cqjcm7n"
}
},
{
@@ -82187,14 +82447,14 @@
"repo": "zk-phi/phi-grep",
"unstable": {
"version": [
- 20200816,
- 1027
+ 20210306,
+ 425
],
"deps": [
"cl-lib"
],
- "commit": "d9dbf69dcf0e06944dcfb89375b09d0d2b0ef4ee",
- "sha256": "1lgixvg5668kb1y8a2xxm1nlbppj5a8sswjrcxasqnxmrif6lkls"
+ "commit": "7e2804c7ab4e875c7511917692c4b192662aa1ae",
+ "sha256": "1znim5mfd8s4dzwsg8gp2im1i837pw990r9r7mcv5zkzyll7wiq3"
}
},
{
@@ -82419,20 +82679,20 @@
"repo": "emacs-php/php-mode",
"unstable": {
"version": [
- 20210103,
- 1738
+ 20210310,
+ 1724
],
- "commit": "8cdc727e6d4eef81655b90574784e9540f407cda",
- "sha256": "1v09ldgdjayj66q8vn97n6hh0zqk3pxqg100ibbcyz6vfrsa5pdm"
+ "commit": "a2bca9be4c34a9dc38393602cb2708df24587838",
+ "sha256": "1rc67f3jzjhqykcn16s2ibviibxmr7b9y2c20hdwg49r41ax4f9v"
},
"stable": {
"version": [
1,
- 23,
+ 24,
0
],
- "commit": "08c6e0f6719fafa60cf76f741d83524fd84163d6",
- "sha256": "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c"
+ "commit": "7e1b55354ce41043148ce2d3270b032c318f0f90",
+ "sha256": "0bs9q62bd7885c39v7x1qz3w1fhpmpdgm72xwsk2yygw0ii425nn"
}
},
{
@@ -82535,8 +82795,8 @@
"repo": "emacs-php/phpactor.el",
"unstable": {
"version": [
- 20200618,
- 1845
+ 20210311,
+ 1615
],
"deps": [
"async",
@@ -82544,8 +82804,8 @@
"f",
"php-runtime"
],
- "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24",
- "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc"
+ "commit": "80788a817b0257363c1eee11a57cc0f873f0eef1",
+ "sha256": "1w4zxp6j77xd9qcz9skpj8jbl8ink1fgdd5f1dhx0486g882mi2l"
},
"stable": {
"version": [
@@ -84354,8 +84614,8 @@
"yafolding",
"yasnippet"
],
- "commit": "a1583287cbafce053d4345a1531c6358ce970a77",
- "sha256": "0pdimil370rilynz437xw7s1a323g00hmcinzpsfbnvq4k4ajk8s"
+ "commit": "91ca19b2a93029a393f8873e273777b553d308e1",
+ "sha256": "07sn00k8krsb0bikbbypznvwrk13k4jdk6d66iai0a66s9dr84ys"
},
"stable": {
"version": [
@@ -84424,6 +84684,21 @@
"sha256": "1ymqhy0sqd54z154s3cm6q1m4xnr9wkx9dl5f93845k11ay3kvln"
}
},
+ {
+ "ename": "popper",
+ "commit": "fd5bfc5df356ea6c91f2fd120b8f912d093a0de6",
+ "sha256": "0iz784hzrhmxr7zv1jx13fk0k9h1c15rbgakry0nyjm4x366rmhj",
+ "fetcher": "github",
+ "repo": "karthink/popper",
+ "unstable": {
+ "version": [
+ 20210319,
+ 31
+ ],
+ "commit": "89ed8ab2da330ffefa0d32ac34491467fc6be228",
+ "sha256": "1n9raivjdsh0nrn0npw2357j72ccqb19mpnmg4cq5qj5q1if2f8v"
+ }
+ },
{
"ename": "popup",
"commit": "083fb071191bccd6feb3fb84569373a597440fb1",
@@ -84432,14 +84707,11 @@
"repo": "auto-complete/popup-el",
"unstable": {
"version": [
- 20210108,
- 1821
+ 20210317,
+ 138
],
- "deps": [
- "cl-lib"
- ],
- "commit": "bd5a0df7e5bc68af46eef37afe9e80764a1d4fd8",
- "sha256": "1y9wv5c9x1rsfdhh3r7mah7yyx2cs7asjzhgsn1pbq7zdjpv5p0p"
+ "commit": "866a091b83369873b4d1c5d62a590fbb0a150bd0",
+ "sha256": "059x15zlc6c17yg5ahdca3bryr10nh9xbb61dv0gdc2wg2c0pzzi"
},
"stable": {
"version": [
@@ -84678,11 +84950,11 @@
"repo": "tumashu/posframe",
"unstable": {
"version": [
- 20210208,
- 229
+ 20210311,
+ 937
],
- "commit": "3454a4cb9d218c38f9c5b88798dfb2f7f85ad936",
- "sha256": "039a84gwb0phjm7jcklmji1pcpbxmp4s40djhac8sbzmwdv39zi4"
+ "commit": "fff21ccb706b576f4074883f9fa87d2bcc534096",
+ "sha256": "1r9i3jsdvzvbr8kggfradvk65i1d0wq96shs4dhfsr3pw7phaxv3"
},
"stable": {
"version": [
@@ -84773,14 +85045,14 @@
"repo": "milkypostman/powerline",
"unstable": {
"version": [
- 20201129,
- 2306
+ 20210317,
+ 110
],
"deps": [
"cl-lib"
],
- "commit": "b293abf83c0a2b2988af19dd0ef0426c3b1d1501",
- "sha256": "01nqff1pg9nxv49g2mmapnrjl8978wwyr6afkr3rm7zlnjz1cjas"
+ "commit": "cfff1cfe63793ea1a8bcfcae50c296558384cf08",
+ "sha256": "12s3mp2dyslq1ilah64gpz7a2j0ca9yls7wvj9kcmjca1931s8s3"
},
"stable": {
"version": [
@@ -84964,8 +85236,8 @@
20210227,
600
],
- "commit": "b6da466e552a710a9362c73a3c1c265984de9790",
- "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall"
+ "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b",
+ "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n"
},
"stable": {
"version": [
@@ -85029,15 +85301,15 @@
"repo": "jscheid/prettier.el",
"unstable": {
"version": [
- 20210224,
- 913
+ 20210313,
+ 1047
],
"deps": [
"iter2",
"nvm"
],
- "commit": "d7ab018a9312979a415d27973890129586b13dc5",
- "sha256": "1phkvmhrcszhc74l92syrsmjqg1pd233fl2hpfivyclwyapqky76"
+ "commit": "5232b886bb6a4fb3848d63db1bcfcb30487a180f",
+ "sha256": "0sbka039sccqip36y98s1b5z6rd5w5q0jzl5kbdq4wmzi7j823ri"
},
"stable": {
"version": [
@@ -85594,14 +85866,14 @@
"repo": "bbatsov/projectile",
"unstable": {
"version": [
- 20210225,
- 1816
+ 20210309,
+ 722
],
"deps": [
"pkg-info"
],
- "commit": "f3f8a6505d50ca0f03f7deef99a1c8aa3bcd9e58",
- "sha256": "014v34kxjz04jgd70kskh0iwms17ydapk43ywwp23f3m89ps1917"
+ "commit": "1528ed4f082e7aaca19f22394eb4bed879645b7c",
+ "sha256": "04x9gjjw1c4fiy631fkvwdp677s1p0yj1s4d5bw68832i1i5fq8y"
},
"stable": {
"version": [
@@ -85925,11 +86197,11 @@
"repo": "chuntaro/emacs-promise",
"unstable": {
"version": [
- 20200727,
- 900
+ 20210307,
+ 727
],
- "commit": "d7b59805e7a8da1f5edea9313b6e2d0f1115fec0",
- "sha256": "08f30fwwh86mnymbjxr9gswkgvsfdxa1mqajsmsbkk5nvmz1jx0n"
+ "commit": "cec51feb5f957e8febe6325335cf57dc2db6be30",
+ "sha256": "1kxsdgg5byw9zddf8jkc3h87mb4k5pnjdpskaagkahc0xg3w18d7"
},
"stable": {
"version": [
@@ -86005,11 +86277,11 @@
"repo": "ProofGeneral/PG",
"unstable": {
"version": [
- 20210227,
- 1942
+ 20210317,
+ 510
],
- "commit": "7844e312b2a192c4245d0d05c12908efc5730e3b",
- "sha256": "0ky8ivcwkjdclh1vh9hi8wc5zljamby10fd4m73nnkdi2lr6x5nr"
+ "commit": "56ee4ebc97e77da7d61eaa7b00580bf4ef5b87d9",
+ "sha256": "0hqmsqb6q2m0gq52lfm64xh8sc9kc48jbqr2w0vd6mp2467afj42"
},
"stable": {
"version": [
@@ -86112,8 +86384,8 @@
20200619,
1742
],
- "commit": "8080bebf1f2ff87ef96a24135afe7f82d2eb3d2a",
- "sha256": "1i82kgi3pwz61a07kmqw2gv79ym32rffwqqx8rlljk139k9j57mc"
+ "commit": "617e2556171d5db4f0c13bed56a5010d08fc3b4c",
+ "sha256": "0blmqy1jh2c536lwrksrbndmy0za6dxafkww28wkfhs64s9dqwdm"
},
"stable": {
"version": [
@@ -86540,14 +86812,14 @@
"repo": "voxpupuli/puppet-mode",
"unstable": {
"version": [
- 20210215,
- 2347
+ 20210305,
+ 645
],
"deps": [
"pkg-info"
],
- "commit": "9f4fef6489ddd9251213f68c8389328ca75db9a6",
- "sha256": "1syaxzsfwd6q9xkbr9mf9hy4k3bray6m3iybcxszqm1qmwdbl6qs"
+ "commit": "ab25cf379236f4e1bd4bc9c1d77a93c95800e9bf",
+ "sha256": "0djrq3wl7crpjd2p1zzzz1spqfdrfzf7991g5fi8zwbf3pi79gpd"
},
"stable": {
"version": [
@@ -86968,15 +87240,15 @@
"repo": "tumashu/pyim",
"unstable": {
"version": [
- 20210228,
- 653
+ 20210319,
+ 1102
],
"deps": [
"async",
"xr"
],
- "commit": "e55fd0d23f75d4f30ce268973d8909510fa01731",
- "sha256": "1n25546nlc2vw3wb4znjvv490yi0j614hravzsj99ybwkl9bf094"
+ "commit": "f48c3edee78ba5f020bcb42830db99a14761f176",
+ "sha256": "1ld3bqvfrda6fa4dv3g0wilznrdrsv544sr370sn3a9xlmy4fwp9"
},
"stable": {
"version": [
@@ -86999,11 +87271,11 @@
"repo": "tumashu/pyim-basedict",
"unstable": {
"version": [
- 20190719,
- 1252
+ 20210311,
+ 159
],
- "commit": "d499104189a9462cb80f8efd9713e4064dc7093d",
- "sha256": "0k1afdknyham46z6fv001rnlsxzl50183fz9skw3y0wxxv2v04r4"
+ "commit": "7495c974ada99f9fed96d8e85d8b97dabce9532c",
+ "sha256": "02asrh0adgjc5nn1ps7dq5zr38hkscnzc04sdpyjzvnmfcqsw7qb"
},
"stable": {
"version": [
@@ -87120,8 +87392,8 @@
20200503,
1624
],
- "commit": "15396a14bc8f977a00b5288356e79467653a2c3c",
- "sha256": "0j5dgaplar71lyx05ali8rhd6nmfc2dkphcq3wn0gdmd5qmwbwxk"
+ "commit": "cdfc8374b1b0ee88af0463bdbe58299186244d53",
+ "sha256": "0657491d55x4r4fir357l372pxz7palj60plsk7hinir3db9q7ri"
}
},
{
@@ -87362,11 +87634,11 @@
"repo": "python-mode-devs/python-mode",
"unstable": {
"version": [
- 20210216,
- 1205
+ 20210301,
+ 812
],
- "commit": "689ff2ddb1102a7fae9491333e418740ea0c0cbc",
- "sha256": "05a5qv98y2gbi9vycmcfnbzwnnzmdz2iv7fwd5c5qxfi9bsv24sv"
+ "commit": "fe7656a7c701eb988c2ec9192f1ce298818b5a92",
+ "sha256": "1ds4avwadwv20r8ihallyhg79r8cshgxnb2dv7kj0dgn9401djqj"
},
"stable": {
"version": [
@@ -87540,11 +87812,11 @@
"repo": "psaris/q-mode",
"unstable": {
"version": [
- 20201231,
- 140
+ 20210307,
+ 2102
],
- "commit": "3fef8d74bb45ec82f3c317d904a570c3b3318ce2",
- "sha256": "03n6cyg1qkn2hglvv0iynlmq1gwhxgd59jil9rc1qka60pislpgz"
+ "commit": "a30a84afae9bb72bc601b213ae68821479b0bb03",
+ "sha256": "1q85vxvv76vmb9zhc91p2aqh333h1p48737spriv5sw9wvis0gdm"
}
},
{
@@ -87678,11 +87950,11 @@
"repo": "quelpa/quelpa",
"unstable": {
"version": [
- 20210208,
- 716
+ 20210317,
+ 1221
],
- "commit": "8c25a40d07c08a6a9754b3ae12174664e8ed7871",
- "sha256": "05yl7ivr6rq6gry0ik4qg2pxsw07byqwz9sn58hpsx8v7blxwxln"
+ "commit": "ec61039dfd50967ca545cb955bf1dd349682dcf3",
+ "sha256": "0hlcckp9vc5rpxp7w30l25ncz7wxywx5jkr12836zcz2mzc8jbhp"
},
"stable": {
"version": [
@@ -87970,8 +88242,8 @@
"repo": "racer-rust/emacs-racer",
"unstable": {
"version": [
- 20210119,
- 225
+ 20210307,
+ 243
],
"deps": [
"dash",
@@ -87980,8 +88252,8 @@
"rust-mode",
"s"
],
- "commit": "f17f9d73c74ac86001a19d08735e6b966d6c5609",
- "sha256": "1hi0ackw5pfqak5yl4z804z2vajhg7wkvzz20w9kbzcighz6vccq"
+ "commit": "1e63e98626737ea9b662d4a9b1ffd6842b1c648c",
+ "sha256": "12a429lajk09qp1jxgig54p8z6wndfgr4jwdmgkc9s2df9sw02d3"
},
"stable": {
"version": [
@@ -89265,8 +89537,8 @@
"repo": "thanhvg/emacs-reddigg",
"unstable": {
"version": [
- 20210225,
- 1948
+ 20210301,
+ 2307
],
"deps": [
"ht",
@@ -89274,8 +89546,8 @@
"promise",
"request"
],
- "commit": "fab7b6881c1c93d96258596602531c2e2dafc1c4",
- "sha256": "1wxig3bhifczi9an98rw57wzkxshq5z16n44dy72r37pkc6azax5"
+ "commit": "196200eeccc4e821c5200c2e04429aeaafe4d536",
+ "sha256": "06q6vb0gxq323zhrq3im7xadgxgb9b8h0bxqak8xfmcnny0mcjlr"
}
},
{
@@ -90258,6 +90530,15 @@
20200520,
853
],
+ "commit": "2db53105f2f8ee533df903b7482e571e28ce3c7b",
+ "sha256": "19mjwk24nwhwn0ylr7m2f9vbyf91ksicznxj1w41jp5slh5h7pr0"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 7
+ ],
"commit": "90add9a1f8c4a3c78029d38087ff4d22fe5372d3",
"sha256": "05k2zp2hldzq5h6nl8gx79dd8lvfn507ad4x3naichdqgn2013nn"
}
@@ -90350,15 +90631,15 @@
"repo": "dajva/rg.el",
"unstable": {
"version": [
- 20210227,
- 1113
+ 20210305,
+ 1621
],
"deps": [
"transient",
"wgrep"
],
- "commit": "8a537d9f033ba1b47f2ebe4d76f68b3dd74aefcb",
- "sha256": "1gqh28fwyjxy4haclf23kzr755p8iyh2mvly3vmzpf55y2n1z8ib"
+ "commit": "10e64887c224002572e1f1e19c74453cba606c3f",
+ "sha256": "1519lh5j5zki2dfzd1a1hl1d24nap99hv80647rvpr3mzbcsg29s"
},
"stable": {
"version": [
@@ -90728,8 +91009,8 @@
"deps": [
"inf-ruby"
],
- "commit": "3ef165c5c99aebfd811a0f18ea7f8c983d4ab152",
- "sha256": "1vwwchgd45a0lin4n04ffwz021889ps4vcj787iy5ijw34pi8zrj"
+ "commit": "126650a06224f1a616b10c02bd9ad8a763a512ef",
+ "sha256": "11yhl9dpf7ni4l9qpr8akpzr2y6j99n3w5hx4yp8v9gppgb1q37w"
},
"stable": {
"version": [
@@ -90920,14 +91201,14 @@
"repo": "zk-phi/rpn-calc",
"unstable": {
"version": [
- 20200816,
- 545
+ 20210306,
+ 426
],
"deps": [
"popup"
],
- "commit": "1554be19acc2644898a2175fa277d1159327c8dc",
- "sha256": "1b4v9x8f9ykz2dqiv7p7c2f6kbl374i2723idmnvm2c9bc0hbpyv"
+ "commit": "320123ede874a8fc6cde542baa0d106950318071",
+ "sha256": "0fq7ym2wyfb5pgm75llc8wzyzr3kb5s3i2mw3ry076yk5c4gjsi2"
}
},
{
@@ -91063,17 +91344,17 @@
},
{
"ename": "rubocop",
- "commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
- "sha256": "07ma4fv015wzpj5j4rdb0ckwwmhkxs3k5vy33qxgwghqmn6xby6x",
+ "commit": "d30b73ad1fea01f4f3a2c4f00f7119c6f52fa7e6",
+ "sha256": "1gc9z5pwjapq2jiykb1ry31wl8n4fsy4g8zbpy7g4z4rqikf32gn",
"fetcher": "github",
- "repo": "rubocop-hq/rubocop-emacs",
+ "repo": "rubocop/rubocop-emacs",
"unstable": {
"version": [
- 20210213,
- 1215
+ 20210309,
+ 1241
],
- "commit": "1372ee3fc1daf7dc8d96741b03e4aff5f7ae3906",
- "sha256": "1svzp1ylc3j5mfp5bgivmxgy60wyfrzgahvcfzr1217dwjbf68jm"
+ "commit": "f5fd18aa810c3d3269188cbbd731ddc09006f8f5",
+ "sha256": "1kwxqryhhdj83jism19jw8fz0bgwxrmgq7f887yyjsm7b5glzvhx"
},
"stable": {
"version": [
@@ -91394,11 +91675,11 @@
"repo": "ideasman42/emacs-run-stuff",
"unstable": {
"version": [
- 20201109,
- 351
+ 20210308,
+ 453
],
- "commit": "80661d33cf705c1128975ab371b3ed4139e4e0f8",
- "sha256": "1l66phlrrwzrykapd8hmkb0ppb2jqkvr7yc8bpbxk1dxjb9w9na2"
+ "commit": "e5ee96c50c350cf860982b7b5deff1ed8d488c8a",
+ "sha256": "0g60kk49dbn331z06gpi3c8pqjsb780iwd07bl87bgbcxcpa2fg9"
}
},
{
@@ -91532,8 +91813,8 @@
"repo": "brotzeit/rustic",
"unstable": {
"version": [
- 20210201,
- 1846
+ 20210315,
+ 1728
],
"deps": [
"dash",
@@ -91546,8 +91827,8 @@
"spinner",
"xterm-color"
],
- "commit": "61d600e5598a37034b8b539bd50966c3eb557f10",
- "sha256": "0d5z6wab62g5xyb2bpmpprny22gy7rm11vsgij0phhnsqb8fqiig"
+ "commit": "d97ec8623c4c7e7ad3bb32e3d3773ba29a34bb0d",
+ "sha256": "1mimrn4aaplmdrwmgp6wax489vp0njd7j95abdnjf0ggc7qbgzcv"
}
},
{
@@ -91990,11 +92271,11 @@
"repo": "hvesalai/emacs-sbt-mode",
"unstable": {
"version": [
- 20201021,
- 1937
+ 20210306,
+ 1603
],
- "commit": "7b121fce50430a44bd743583c87d7645bf157be2",
- "sha256": "0jqq2a5rp6nfi4n2rpdxd8yzc01jhm2mfg3lmn7aacmnwi6554ji"
+ "commit": "0bdc36ba3b3955c1106a5cda69be98bd38195cb6",
+ "sha256": "03wikgh94a0qc3xyvrvzxi4rrrd713ykpgva8z4ly85mh193215s"
},
"stable": {
"version": [
@@ -92017,8 +92298,8 @@
20200830,
301
],
- "commit": "cacada6203a860236aff831f6a863c92dbe2b878",
- "sha256": "17k4n0kwfqrn172mi3d2f67jalgc13p6xr10zhs56mbd5bzwg958"
+ "commit": "4ebebdaf0dec2f7aaebb6a1c1f6163f503caaa63",
+ "sha256": "1vj4rd5mq93sg10cbdcr2yx5i954ng9s369dghw35h9dasblz1pl"
}
},
{
@@ -92029,14 +92310,14 @@
"repo": "zk-phi/scad-preview",
"unstable": {
"version": [
- 20200816,
- 549
+ 20210306,
+ 426
],
"deps": [
"scad-mode"
],
- "commit": "75fe00a9aaf875ac97930bdb334aef9e479e41d5",
- "sha256": "0vdb9ib76fjdvm3f13v3kh7x04izq993crrzsqp0vs5nilbkrs8c"
+ "commit": "8b2e7feb722ab2bde1ce050fe040f72ae0b05cad",
+ "sha256": "13hsd3sh1azcrbdbjnr1z5q0n5xw3ifzhvsnfqbqdz2pkpr5mfig"
}
},
{
@@ -92334,14 +92615,14 @@
"repo": "zk-phi/scratch-palette",
"unstable": {
"version": [
- 20200816,
- 551
+ 20210306,
+ 427
],
"deps": [
"popwin"
],
- "commit": "c39cacb11992383887fa096ace85510baed94aef",
- "sha256": "1va9c97cvdqf6404kixvgk0qwrlnc1lrz6khpkdp2w7w1brhf2f7"
+ "commit": "e4642ed8a2b744ba48a8e11ca83861f8e4b9c5b3",
+ "sha256": "1cvcsj6ayhfwdpp2mb75ja8bif33z085dip76bvyqliwjnjl2sgn"
}
},
{
@@ -92683,6 +92964,21 @@
"sha256": "1h1b48s2iirswdlvfz41jbflm4x09ksc2lycrc1awzlwd6r8hdhg"
}
},
+ {
+ "ename": "seen-mode",
+ "commit": "f29f5a7850d058984a39ecf6aaa81a9e465356f6",
+ "sha256": "0v2qjqf89fz9ss4m39zwrhpijk1flglmyys9wm4nxi5dp32pppji",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~shiorid/seen.el",
+ "unstable": {
+ "version": [
+ 20210311,
+ 1935
+ ],
+ "commit": "57c960d76ad3dc551ac5a57ebe8682ef9fdc6d31",
+ "sha256": "1bn6jrvnz4bh7jm0a4g9z29zld5lm6jc77gh0i5m9ia38wzr00jx"
+ }
+ },
{
"ename": "seethru",
"commit": "7945732d9789143b386603dd7c96ef14ba68ddaf",
@@ -92806,11 +93102,11 @@
"repo": "raxod502/selectrum",
"unstable": {
"version": [
- 20210228,
- 1401
+ 20210316,
+ 835
],
- "commit": "bcf371433f3593bfe911369a4c87fbf7287df866",
- "sha256": "052323wgs7z68hzfp6y9x262qsd0l6la667hsjvrdc64x6mv0dii"
+ "commit": "a72109ab3eb3a06d1d8e01629bed06871b2c94d2",
+ "sha256": "19z3hicdkr11112snalp657f28wb1n6l1kky7qffd01a71pmd8ia"
},
"stable": {
"version": [
@@ -92829,15 +93125,15 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20210227,
- 600
+ 20210311,
+ 1613
],
"deps": [
"prescient",
"selectrum"
],
- "commit": "b6da466e552a710a9362c73a3c1c265984de9790",
- "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall"
+ "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b",
+ "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n"
},
"stable": {
"version": [
@@ -93014,16 +93310,30 @@
"repo": "twlz0ne/separedit.el",
"unstable": {
"version": [
- 20210210,
- 1411
+ 20210316,
+ 1434
],
"deps": [
"dash",
- "dash-functional",
"edit-indirect"
],
- "commit": "cc1145bde8b1868322ea799a90e38a1295089ada",
- "sha256": "0m429i3zy5aik0q91r6sbr5xpqh4fgx984szp01p8fmbyb7wsh67"
+ "commit": "12db61458b053cee2d57dbf04f725f03487bb895",
+ "sha256": "1h7mr10agkvx8v6pvki8klz6b33lls201wn10q1fgg42djcw2skk"
+ }
+ },
+ {
+ "ename": "sequed",
+ "commit": "340eeeb2c21e313fedab8e1a28a1257374a7aea1",
+ "sha256": "1vym45gax05ay0naspwyqc1h48iwmqaq7b6vzxabsc72w8kw4sgs",
+ "fetcher": "github",
+ "repo": "brannala/sequed",
+ "unstable": {
+ "version": [
+ 20210315,
+ 2012
+ ],
+ "commit": "50c5dca413a12fe2d8a89eae833f10967c2f38d2",
+ "sha256": "16hsjk04xw88ddr2gbwlb4v8didqmk7ffwphp1iqy3a02wf4kif6"
}
},
{
@@ -94373,19 +94683,19 @@
"repo": "gexplorer/simple-modeline",
"unstable": {
"version": [
- 20201218,
- 840
+ 20210312,
+ 1048
],
- "commit": "38973dec2912e2136d8fde5f2667063863fee15a",
- "sha256": "0y70hc3x8rxr8b5x8d0a23gpcadzrn43wmrsvqqxmmkqqp45n7gj"
+ "commit": "119d8224a8ae0ee17b09ac1fed6cdb9cb1d048fd",
+ "sha256": "1rnzrx7gcaw056cqvnb1wai4hala0r0gpk3a4kyyghyp9hmrxbb5"
},
"stable": {
"version": [
1,
- 2
+ 4
],
- "commit": "f0b983ba3b5b44390ba2dbd419bb6f29908f95fb",
- "sha256": "164f95pj38a9hz315fs91ppvgn32a26v7vjz1pnrsvmllricm4zp"
+ "commit": "119d8224a8ae0ee17b09ac1fed6cdb9cb1d048fd",
+ "sha256": "1rnzrx7gcaw056cqvnb1wai4hala0r0gpk3a4kyyghyp9hmrxbb5"
}
},
{
@@ -95065,11 +95375,11 @@
"repo": "joaotavora/sly",
"unstable": {
"version": [
- 20210224,
- 1024
+ 20210303,
+ 1148
],
- "commit": "fb84318c08f59bc786e047006fc81e2ace568309",
- "sha256": "0z123k9ak7yjb9bxb5qx48f33ma8066rhkqh8xc14z7shk75jybj"
+ "commit": "5966d68727898fa6130fb6bb02208f70aa8d5ce3",
+ "sha256": "00yk9g0gi4gsa99n2gsq41mkwgvmih52mngmk4g8ajzxsv0pbwq0"
},
"stable": {
"version": [
@@ -95089,15 +95399,15 @@
"repo": "mmgeorge/sly-asdf",
"unstable": {
"version": [
- 20200306,
- 433
+ 20210308,
+ 332
],
"deps": [
"popup",
"sly"
],
- "commit": "32ce14994e8faee9321605cec36d156b02996c46",
- "sha256": "09x8l37wwqw74xc2frwzbfdb1if8rb3szg5akdk3v2qhik4sm3dd"
+ "commit": "bcaeba9b73b582ae1c4fadc23c71ee7e38d9a64e",
+ "sha256": "09gs99244g45v4bkvl4a5wshjr24cvwd8dg2w7y6j6aw2aikczrh"
},
"stable": {
"version": [
@@ -95335,11 +95645,11 @@
"repo": "jojojames/smart-jump",
"unstable": {
"version": [
- 20210110,
- 214
+ 20210304,
+ 844
],
- "commit": "947499023b7c31b99fc172e2a4c1a105ad9c8555",
- "sha256": "1yyyh1507lr4dlp39k8slwfz0fdjh2hx5ypn5zx5hyjjncw7x2r7"
+ "commit": "3392eb35e3cde37e6f5f2a48dc0db15ca535143c",
+ "sha256": "14yhln54mnh7257q49r86zypg04jy5bf6ahvmm1cbv6n25npawk5"
}
},
{
@@ -96188,14 +96498,14 @@
"repo": "hlissner/emacs-solaire-mode",
"unstable": {
"version": [
- 20201006,
- 22
+ 20210309,
+ 2115
],
"deps": [
"cl-lib"
],
- "commit": "c697925f7e03819a4046a233f6ab31664aca9d6a",
- "sha256": "1fwyranv159sgfsc07h7vjn7c2js95zk2hw06d1dr1ddnl5hgrvf"
+ "commit": "a8fe09d8f5a9cb541c59dcd75a136f1d2a06b8bd",
+ "sha256": "1fwjy5m66nz2ipshmr7dky8v4pdwynq54282anb0rfa34dim4mrh"
},
"stable": {
"version": [
@@ -96931,11 +97241,11 @@
"repo": "condy0919/spdx.el",
"unstable": {
"version": [
- 20210301,
- 224
+ 20210306,
+ 1600
],
- "commit": "63704d435255c1fe3d7579f0344e244c2fbdb706",
- "sha256": "1fbpbj7jzm4djlbzvzjld2gs46wiy6gm9hd1pjg2rr987fl882rg"
+ "commit": "b9f49bab9551e8ca1232582acffdd0a90aaa35f3",
+ "sha256": "0k9dlkxns8yhv1yzfjlr5gkfc26ihhqjfsjchqg9fvfxqnd39pic"
}
},
{
@@ -97062,11 +97372,11 @@
"repo": "ideasman42/emacs-spell-fu",
"unstable": {
"version": [
- 20201006,
- 1441
+ 20210317,
+ 909
],
- "commit": "a7db58747131dca2eee0e0757c3d254d391ddd1c",
- "sha256": "05f58nz2bhb5bzy06glpv7pjfqpalv5pyggm43zsh1kl2pxwzb9a"
+ "commit": "ca8f409788964daeabdeff9c8beb36109900f996",
+ "sha256": "1hkzhjnnz1m5lsh2alphr3d234zpbxw44xxhb47l2ws0vr64w50x"
}
},
{
@@ -97489,22 +97799,25 @@
"repo": "purcell/sqlformat",
"unstable": {
"version": [
- 20210218,
- 312
+ 20210305,
+ 209
],
"deps": [
"reformatter"
],
- "commit": "a7b38b20320b2b4f9ec109845fed3661da9b4a49",
- "sha256": "164x6vskcby6h7jaz119wqn5x73pnsf53qq314v0q4ncw2917bym"
+ "commit": "0cdb882874ba0853f4f831a07a85b511258472b2",
+ "sha256": "07ka6fqcbvbvzsdmwris89cj3dpg3qcfhmww2h6qs69za3h7mify"
},
"stable": {
"version": [
0,
- 1
+ 2
],
- "commit": "b70b05bf469a27c1a2940eeaa1a5c8cc93d805fd",
- "sha256": "14n2yjmi4ls8rmpvvw6d7cz5f6dcg7laaljxnhwbagfd5j4sdfrm"
+ "deps": [
+ "reformatter"
+ ],
+ "commit": "0cdb882874ba0853f4f831a07a85b511258472b2",
+ "sha256": "07ka6fqcbvbvzsdmwris89cj3dpg3qcfhmww2h6qs69za3h7mify"
}
},
{
@@ -97647,11 +97960,11 @@
"repo": "srfi-explorations/emacs-srfi",
"unstable": {
"version": [
- 20210228,
- 1834
+ 20210318,
+ 2242
],
- "commit": "12eec5df609b16f16b520eceb0681b74d9ae8aa6",
- "sha256": "043mra5ysz00jxziqglzpkg5nmhc15lvv4n7q26c5yv2dn4nbdsq"
+ "commit": "512d51e8b6f912857d484095defd7b89535edfbb",
+ "sha256": "0nww5hhzajj4vhps9n1hlyrgj3lifr9lg2dm1s04f2hy84pn9jm1"
},
"stable": {
"version": [
@@ -98024,14 +98337,14 @@
"repo": "Kungsgeten/steam.el",
"unstable": {
"version": [
- 20190916,
- 627
+ 20210307,
+ 1756
],
"deps": [
"cl-lib"
],
- "commit": "f32951f4e0a4bc92813d0121d9df0257101b8992",
- "sha256": "1fl4875992xxv0amcqj7b516f35k19h8fd7pij0by5b808k5ls6x"
+ "commit": "b0b79d9bd8f1f15c43ab60997f5a341a769651af",
+ "sha256": "144kkh1k09hfi7c8rn750m7p70jka4m0h8cakr16avkprrrpmxxc"
}
},
{
@@ -98881,11 +99194,11 @@
"repo": "rougier/svg-tag-mode",
"unstable": {
"version": [
- 20210227,
- 1105
+ 20210301,
+ 2205
],
- "commit": "a34a2e1128fa99f999c34c3bc6642fb62b887f34",
- "sha256": "01apd8agfdhr662lkiy5rh2xvr913754f9zz7f5hn4vkmfgambrh"
+ "commit": "95b5404997d7194b4946df0a475fd93203a36cb9",
+ "sha256": "06j19jx3bkdsds5rjqdvaqxfq42gsn8yanqd6jrd8rysncds8an0"
}
},
{
@@ -99143,26 +99456,26 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210225,
- 1251
+ 20210310,
+ 1230
],
"deps": [
"ivy"
],
- "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
- "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
0,
13,
- 2
+ 4
],
"deps": [
"ivy"
],
- "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
- "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
+ "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
+ "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
}
},
{
@@ -99465,11 +99778,10 @@
"repo": "countvajhula/symex.el",
"unstable": {
"version": [
- 20210219,
- 2348
+ 20210319,
+ 329
],
"deps": [
- "dash",
"evil",
"evil-cleverparens",
"evil-surround",
@@ -99480,17 +99792,15 @@
"smartparens",
"undo-tree"
],
- "commit": "a8e573324a56e131b92967802a8df88bedd1ef6f",
- "sha256": "015ijjzzrx6gjh1qgb7ja6fwffialck814y1japg6d6smkd8b82i"
+ "commit": "d37532a9dcff8ec5a2fdc54f27b517890f972bfb",
+ "sha256": "19ffgdvmnys2hby1iwb85kwr74iadnp8mfd0816jlaafjsga7inf"
},
"stable": {
"version": [
- 0,
- 8,
- 1
+ 1,
+ 0
],
"deps": [
- "dash-functional",
"evil",
"evil-cleverparens",
"evil-surround",
@@ -99501,8 +99811,8 @@
"smartparens",
"undo-tree"
],
- "commit": "2c9d94cf44ffc1337729db13f7ea3e3e8c470dbd",
- "sha256": "02848n7b0gswdv01mk85xz3khkf24c4y1c0rsw09arnjjkhjgzwh"
+ "commit": "d37532a9dcff8ec5a2fdc54f27b517890f972bfb",
+ "sha256": "19ffgdvmnys2hby1iwb85kwr74iadnp8mfd0816jlaafjsga7inf"
}
},
{
@@ -99861,11 +100171,11 @@
"repo": "fritzgrabo/tab-bar-echo-area",
"unstable": {
"version": [
- 20210221,
- 2336
+ 20210315,
+ 1609
],
- "commit": "7fe200bf2c7397abe5623d1b05983eaccc467320",
- "sha256": "16rf0b33adj780ix3x7xhp74dbx6f2044dzihpl77ar1yd48dhc7"
+ "commit": "d2ff6b1acb553bf1546e730640397b9e33ca5279",
+ "sha256": "1agjb68bjfjzgacrip2mjwzfdbvj3xn8cs3f6q5kdjg5v7lg9c9h"
}
},
{
@@ -99876,14 +100186,14 @@
"repo": "fritzgrabo/tab-bar-groups",
"unstable": {
"version": [
- 20210213,
- 2138
+ 20210319,
+ 2222
],
"deps": [
"s"
],
- "commit": "930a86edcfe7c0e33e16bfe2501dbe285a443df9",
- "sha256": "14vpwh2yh1626jlc1ifyl7lfyv2lsczcgsbjs4flbpv83c9biq8s"
+ "commit": "09f2049d5fac5c046e517108ac527d087a7352d8",
+ "sha256": "024yxwb40jpfk5bfb3achf0vkbkblnkidy7rymvln2mzym85g77s"
}
},
{
@@ -100154,11 +100464,11 @@
"repo": "saf-dmitry/taskpaper-mode",
"unstable": {
"version": [
- 20210228,
- 2046
+ 20210310,
+ 1632
],
- "commit": "62b112a335a62fbc6898401761275cff5d173821",
- "sha256": "0xnjwsw6ri46i5gygmn5p9ashwp1lcxglqgnllrq8b918qrayww1"
+ "commit": "d6edb345f31a13918d603d44b90a4ce30b34632b",
+ "sha256": "0jx095yjpsh28r6a23w2fxqv0rysbwz49c22vri2s8hzw011m55p"
},
"stable": {
"version": [
@@ -100345,28 +100655,28 @@
"repo": "zevlg/telega.el",
"unstable": {
"version": [
- 20210228,
- 1348
+ 20210319,
+ 2200
],
"deps": [
"rainbow-identifiers",
"visual-fill-column"
],
- "commit": "d3e5d654e1a86019f85dd8c41923fce29fab45d6",
- "sha256": "116ff8d8ir7dnmmm6qiy82i9ikziyx0xmy35v2p3dz4qib32n0yh"
+ "commit": "de153b575d0a6470314efb3cba9b48b14b5f6d57",
+ "sha256": "014hzm2dlvzrx15557zhd3h8d0dn6akyprxc81ijc6wfczj8bv6m"
},
"stable": {
"version": [
0,
7,
- 20
+ 22
],
"deps": [
"rainbow-identifiers",
"visual-fill-column"
],
- "commit": "0ed5173a2eaf1c049f3393c1518bb534a3a9ac94",
- "sha256": "0g0ffxd9p0l772p6bc3s2sr3rlvgmds5jvr0fn6fnv9sypvzplfq"
+ "commit": "3ed57544faf0fdd17dd8762126466b15dc471f8f",
+ "sha256": "1frljw1gipsr9l6cpb1skwi5b566x9yx3dhcc7bxfq11inh7bc74"
}
},
{
@@ -100433,11 +100743,11 @@
"repo": "lassik/emacs-teletext",
"unstable": {
"version": [
- 20210222,
- 901
+ 20210312,
+ 1951
],
- "commit": "7092a52b18b4b13b36f4558fade98f89e182e00d",
- "sha256": "15rhrkb454kby6n4i669d2l24n7m3xa7nm9p68nbqs04c4sinynq"
+ "commit": "7ec1118b9e4a8663fe9ec933e9e13f7c2d57e986",
+ "sha256": "1ffnxb088kvr3g0kjjwr6hdxd20pmlbi52bhpla3phmyzl8vz38k"
}
},
{
@@ -100484,20 +100794,20 @@
"repo": "clarete/templatel",
"unstable": {
"version": [
- 20210218,
- 1340
+ 20210319,
+ 2222
],
- "commit": "c1bb14cbaf47a24b0765b68ac6f252d0b5e2809f",
- "sha256": "1sk8g4gs9103f2sk76x6zx8i74zr79fr30mg87x4shlrnj6a54fq"
+ "commit": "ef93f4190c785166b49a310bf2d8695d3227ab40",
+ "sha256": "13hwa7v5yyji98g9rz2m4ql89nx2wi0hhhikm9y552l25qayrgxz"
},
"stable": {
"version": [
0,
1,
- 4
+ 5
],
- "commit": "1a7784e5ec9a5e43adae56674aa63e8b3cf7a2cd",
- "sha256": "1k33h503038l2bcr8gs020z2cjxfs94lamkdgv52cvd9i20d0kqq"
+ "commit": "971153aa43addf88bfe0922bcac19cb0edd3f86d",
+ "sha256": "0ldb01sxzrvchjy160karvmksinicw3d14jazriy84dxks8i6w8a"
}
},
{
@@ -101421,18 +101731,18 @@
20200212,
1903
],
- "commit": "2a5e467de2a63fd59b15c347581f3c5dca349e2b",
- "sha256": "0px46fq29xdsgys525l5ba0zbqq9d86c739zqlqnn3safvg5vrih"
+ "commit": "c6b9113fbe9d3510eb49d24f10cd47a249260e01",
+ "sha256": "0r7k57lpazrz65ix53cflc94msvw7j68myg6y8x0bz44hf8m5irs"
},
"stable": {
"version": [
2021,
- 2,
- 22,
+ 3,
+ 15,
0
],
- "commit": "a0eb44d20005e25284d0204f42387ff872bf52b9",
- "sha256": "1294wsx9g3k2y5prgxr7w8ms6h0af8c0xijvh4fjil6bsx729c6b"
+ "commit": "6d68811e7ee75f8e0b450b9b1778bfad2c44c715",
+ "sha256": "16yixl9qq6zh47zjnad9rv2vbjq936ms212j0wfdax7qhg094af8"
}
},
{
@@ -101488,8 +101798,8 @@
"deps": [
"haskell-mode"
],
- "commit": "839c9ae0db91509015d7638905d2d7a4811f877d",
- "sha256": "1gm8i3bvqkdk2fmkl1lbra1hqlag18bi0fq1mi6grw5lkmmlhay2"
+ "commit": "d88a8ece548f932aa17cf09b36fa441135ca0cbd",
+ "sha256": "1ga1ybn81w68ma939s73m84ina0xh2f36bkpfxy4j7ahm0h6vlmb"
},
"stable": {
"version": [
@@ -101512,8 +101822,8 @@
"repo": "ananthakumaran/tide",
"unstable": {
"version": [
- 20210211,
- 1055
+ 20210313,
+ 1524
],
"deps": [
"cl-lib",
@@ -101522,8 +101832,8 @@
"s",
"typescript-mode"
],
- "commit": "7f7334b42a40dd3093b830e887c36cdb4ef40858",
- "sha256": "0krixylc58lglpi6kgwlxfd47c90vmck3cml0h3awplbyyr8b5vg"
+ "commit": "f6ad5e591c4a21a8ed252444cbc0cf6b079d2449",
+ "sha256": "1vkvlkgbk1mlfk31gdf13w4lq3nj7pskp5xd40hivirgmck18wd4"
},
"stable": {
"version": [
@@ -101839,8 +102149,8 @@
"deps": [
"request"
],
- "commit": "269bda7001613c0b70c0662d2a74d200765c1dcb",
- "sha256": "0z8hkp15sdb0x0g67v6xa8ds28awz4i2vcbryj5zfpl15d0fiqc2"
+ "commit": "d59405bd72f3379417b9e73f06e8848b43cb021d",
+ "sha256": "19yb4cxcaif73yvf62d4891l5rvp8ynhxl0f2wc9lvssg0lpx5y0"
}
},
{
@@ -102471,11 +102781,11 @@
"repo": "magit/transient",
"unstable": {
"version": [
- 20210228,
- 1207
+ 20210315,
+ 1902
],
- "commit": "1e090b0cd4ea58c9fb5e807e4ebd7bdb9a7b66ba",
- "sha256": "0ci7khr2cp185kv4lm4a87fd7sgrjzz12k7w1s4iicaqvfryw9l5"
+ "commit": "cc16a5eaa73617a281b0bbf71b24432c38994e30",
+ "sha256": "15ah0h7i96wn4w5321gydr6pxahb8mc8dk58b9paqv06klp5q2cd"
},
"stable": {
"version": [
@@ -102718,26 +103028,26 @@
"repo": "ubolonton/emacs-tree-sitter",
"unstable": {
"version": [
- 20210116,
- 621
+ 20210315,
+ 238
],
"deps": [
"tsc"
],
- "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7",
- "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg"
+ "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
+ "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
},
"stable": {
"version": [
0,
- 13,
- 1
+ 15,
+ 0
],
"deps": [
"tsc"
],
- "commit": "d569763c143fdf4ba8480befbb4b8ce1e49df5e2",
- "sha256": "1rw21nc78m4xngl3i3dmlzrzlqb8rgvlpal6d4f50zdlfbn4pa4v"
+ "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
+ "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
}
},
{
@@ -102779,26 +103089,26 @@
"repo": "ubolonton/tree-sitter-langs",
"unstable": {
"version": [
- 20210228,
- 1450
+ 20210314,
+ 1704
],
"deps": [
"tree-sitter"
],
- "commit": "fcd267f5d141b0de47f0da16306991ece93100a1",
- "sha256": "0vyln2gh7x6fkn1wm5z81ibbn7ly440zb68yg7xmyvmxy8xyqfmm"
+ "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861",
+ "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a"
},
"stable": {
"version": [
0,
- 9,
- 2
+ 10,
+ 0
],
"deps": [
"tree-sitter"
],
- "commit": "d13a43e286e9e20daf6c6dd29357ac4992208747",
- "sha256": "11ap8rwsa83pq8850sbn9w46imdi3w8zncqp56g57gwgkkq11l6h"
+ "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861",
+ "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a"
}
},
{
@@ -102845,8 +103155,8 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20210228,
- 1117
+ 20210304,
+ 2130
],
"deps": [
"ace-window",
@@ -102858,8 +103168,8 @@
"pfuture",
"s"
],
- "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
- "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -102888,15 +103198,15 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20210118,
- 1808
+ 20210309,
+ 1844
],
"deps": [
"all-the-icons",
"treemacs"
],
- "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
- "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
}
},
{
@@ -102914,8 +103224,8 @@
"evil",
"treemacs"
],
- "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
- "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -102944,8 +103254,8 @@
"deps": [
"treemacs"
],
- "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
- "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -102976,8 +103286,8 @@
"pfuture",
"treemacs"
],
- "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
- "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -103009,8 +103319,8 @@
"persp-mode",
"treemacs"
],
- "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
- "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -103042,8 +103352,8 @@
"perspective",
"treemacs"
],
- "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
- "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
}
},
{
@@ -103061,8 +103371,8 @@
"projectile",
"treemacs"
],
- "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
- "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -103168,11 +103478,11 @@
"repo": "ianpan870102/tron-legacy-emacs-theme",
"unstable": {
"version": [
- 20200601,
- 533
+ 20210315,
+ 712
],
- "commit": "af17842821400a6fd466bb2769d13606e98550c0",
- "sha256": "19pabaiza0lrvqa8yi0p83rffm9g44n6789m395iayfcxq49lylq"
+ "commit": "4d543fbb9cb2098af1be0f5b10e1e4cd5245a9d0",
+ "sha256": "0fyprvi4s331r6a54xa4dljw0k330kiyhzcfnnjhbsqxc86264pz"
},
"stable": {
"version": [
@@ -103316,20 +103626,20 @@
"repo": "ubolonton/emacs-tree-sitter",
"unstable": {
"version": [
- 20210116,
- 621
+ 20210315,
+ 238
],
- "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7",
- "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg"
+ "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
+ "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
},
"stable": {
"version": [
0,
- 13,
- 1
+ 15,
+ 0
],
- "commit": "d569763c143fdf4ba8480befbb4b8ce1e49df5e2",
- "sha256": "1rw21nc78m4xngl3i3dmlzrzlqb8rgvlpal6d4f50zdlfbn4pa4v"
+ "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
+ "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
}
},
{
@@ -103698,15 +104008,15 @@
"repo": "mrkkrp/typit",
"unstable": {
"version": [
- 20200217,
- 2059
+ 20210318,
+ 1747
],
"deps": [
"f",
"mmt"
],
- "commit": "f567867a0a519e17ad3552837b48d3d45fb73aa5",
- "sha256": "0a5xds0mhfnq6kyc13s385vf4x4cqqpk2jiw1in7qg382fl8w2p0"
+ "commit": "fa125bf43757737fbcf91958b76c38b440d54b4c",
+ "sha256": "1l0qb8gjgsmjjdvxlma7g6fn2z6rj246p2kczrikq8ajg1xh61sr"
},
"stable": {
"version": [
@@ -105403,11 +105713,11 @@
"repo": "plapadoo/vdf-mode",
"unstable": {
"version": [
- 20200713,
- 1838
+ 20210303,
+ 714
],
- "commit": "8fbf6157440345879a0543bcab233e790a7b60ee",
- "sha256": "1m237py9jcxkm6z3wgsxzhikc3lidd28gfflcmr0wm588sdx48sl"
+ "commit": "0910d4f847e9c817eb8da5434b3879048ec4ac92",
+ "sha256": "0a69crh9m447kxy4g47y02lymdcp5abbsfh9v68hnwydwnwjxyap"
},
"stable": {
"version": [
@@ -105650,11 +105960,11 @@
"repo": "federicotdn/verb",
"unstable": {
"version": [
- 20210112,
- 2239
+ 20210315,
+ 1753
],
- "commit": "91827971f655936d8a8df95c9d2f39eaee667c97",
- "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp"
+ "commit": "9c5e9baf43388d5a69ea2fb216d9936628b36a84",
+ "sha256": "1jl4b1ka1xaavfm4gpqgg01f76mlvy0g0rdifmwwz9w8apw306j0"
},
"stable": {
"version": [
@@ -106413,11 +106723,11 @@
"repo": "ianpan870102/vscode-dark-plus-emacs-theme",
"unstable": {
"version": [
- 20201116,
- 749
+ 20210317,
+ 930
],
- "commit": "4a4c7502ceda44d189a5fb09018ef2bc3f3c8d5f",
- "sha256": "0vgg301za0bgdgcj8kfniysvjq1iyia3jk6lvi6vwrzc8sy9hx6z"
+ "commit": "d54fc120f0c0b363a8bef159da58786fb51e7b0f",
+ "sha256": "1imz2fr9164lsc8f1qji439iz4a643qslmxd9526alxa8gwx2yiz"
},
"stable": {
"version": [
@@ -106452,11 +106762,11 @@
"repo": "akermu/emacs-libvterm",
"unstable": {
"version": [
- 20210217,
- 737
+ 20210313,
+ 1359
],
- "commit": "e19da61668783239e47b1a7390fca10f38ceffa9",
- "sha256": "04x9514vl8315racjn3c4b1kp6wiy33d1q7b637zfzsf6w72ybpa"
+ "commit": "98179e129544bdee7d78fc095098971eeb72428d",
+ "sha256": "0abh1ydq4rzisgy1wf591r5jj606wh0w9jza7pjzwy30s19qd7bl"
}
},
{
@@ -106467,14 +106777,14 @@
"repo": "jixiuf/vterm-toggle",
"unstable": {
"version": [
- 20210226,
- 1800
+ 20210313,
+ 305
],
"deps": [
"vterm"
],
- "commit": "91f788e90b12dd940e3bc9c7b24108be37b99c03",
- "sha256": "1gdf27b89d47js89wi1amicrm49qryi0d3qyjzav4ryf8m7xx54m"
+ "commit": "d10239b7bb89b78dddb82f66ac2286bc0b02747b",
+ "sha256": "0r9n23wg9cfy10h5f9zqr8jpkvw34f9rylri3nxq870awjab7rqi"
}
},
{
@@ -106587,6 +106897,39 @@
"sha256": "18qcw9mh57jrd6qrgcma82q28d1dab2dy6v8pi08kadcy4w95y10"
}
},
+ {
+ "ename": "vulpea",
+ "commit": "cd29b11820d9d35717a9a03a7ed5b8f53cbe7bdb",
+ "sha256": "00kxpvysyzmc43d1pb8cdzp1nrwlzbl6wx9fw9c0sssjanchm3xn",
+ "fetcher": "github",
+ "repo": "d12frosted/vulpea",
+ "unstable": {
+ "version": [
+ 20210314,
+ 1818
+ ],
+ "deps": [
+ "org",
+ "org-roam",
+ "s"
+ ],
+ "commit": "ee35c562768a3a46b9d2c2f28dd2def105c05446",
+ "sha256": "19gx5i6jdb8dgpwaw0vmmla1v451svixahyf1pnfk6615rsb3m08"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "deps": [
+ "org",
+ "org-roam",
+ "s"
+ ],
+ "commit": "4088c95bdd64ca1afbc59bacee571c7260988175",
+ "sha256": "03kynwkl4q91xz9wsmyx8g3aqgls1r8p5dxhixg586sr9xr4xck0"
+ }
+ },
{
"ename": "vyper-mode",
"commit": "492d42d60bc188a567c5e438b838a275a124c699",
@@ -106879,16 +107222,16 @@
"repo": "wanderlust/wanderlust",
"unstable": {
"version": [
- 20210209,
- 1125
+ 20210312,
+ 843
],
"deps": [
"apel",
"flim",
"semi"
],
- "commit": "3a3530b1c4e2a2aa02d683d166cf123e9cc16a0a",
- "sha256": "09px7ns1k03frxx02gvkhjzbygz9sp214xq5qnain5mnz4vglcih"
+ "commit": "6e189fc944a9bbde76c5a6d9b6a38d57e85e6390",
+ "sha256": "0yphp7bqgmhd89hgqy8rg6kmkkzmhz3sjkzm9b1paic7fx9s0maj"
}
},
{
@@ -107271,14 +107614,14 @@
"repo": "emacs-love/weblorg",
"unstable": {
"version": [
- 20210222,
- 102
+ 20210308,
+ 109
],
"deps": [
"templatel"
],
- "commit": "96aa798389536eee543ffeb0fa3c34dbd123c359",
- "sha256": "0mjgw2rs67h6jgpjnidsbb4xly8dmxwgblas5vi1ddqfppzchgfr"
+ "commit": "faf78dfe01f25a3f32d6dcf199b5944cfc46b2c7",
+ "sha256": "0j9hnk5kymwq81qskn5l319qiilk5zck9134r44z0wx3bl0rc5gf"
},
"stable": {
"version": [
@@ -107301,28 +107644,28 @@
"repo": "etu/webpaste.el",
"unstable": {
"version": [
- 20201129,
- 1909
+ 20210306,
+ 1215
],
"deps": [
"cl-lib",
"request"
],
- "commit": "a9c4aa418526dbaf19348325ca30c249e2cf8440",
- "sha256": "1lwv4zqws7kkxzbcgppgsn93vv6njc4qfh9i15bxjsj7jx3lwkgm"
+ "commit": "87ea8b15f417037bb1a46ac849b2f60f08c0bfeb",
+ "sha256": "1ixvkxdf8sz2xxdjb28pc9bdnz321m736b1riffhfh4w755z7vzp"
},
"stable": {
"version": [
3,
2,
- 0
+ 1
],
"deps": [
"cl-lib",
"request"
],
- "commit": "9662b1c9c40e822d90842c82a778f65c709d3358",
- "sha256": "08545ihkzflw80rwklnxiswrpdrl8kr74xzxm5wsgrf36fkj9rn2"
+ "commit": "b063ddde87226281ce95f8ff0d7ce32d5dea29aa",
+ "sha256": "1d481pdnh7cnbyka7wn59czlci63zwfqms8n515svg92qm573ckd"
}
},
{
@@ -107457,11 +107800,11 @@
"repo": "jstaursky/weyland-yutani-theme",
"unstable": {
"version": [
- 20210227,
- 1749
+ 20210318,
+ 1726
],
- "commit": "831005d21ac373d5d12a1ef2d524e83a6b114c56",
- "sha256": "1grqvy901bkx0pqfy2zfyqzmk5wdarihg27lyjlz1hpiyl74y3sp"
+ "commit": "1441ff884092de03fa7be97fcfd03eefd4dd4b07",
+ "sha256": "0i2idvcck5605miyc938h2y85jvbmd1nky20nmyhrs9q155lifxv"
}
},
{
@@ -107890,8 +108233,8 @@
"makey",
"s"
],
- "commit": "a0d8456b9f71fcb40a28ec9235132df506aa6ecc",
- "sha256": "1bndpdzscb917sp32khmifk7vdkj4psh7c8rf4j5s5zs7033qwka"
+ "commit": "f57b7d182372c33a7e52a785363acf292422c8aa",
+ "sha256": "09zak7zqpvlxij4p1raz10wbc9x7qmik0y1xzcj7v2sh14z952iq"
}
},
{
@@ -107971,8 +108314,8 @@
"org",
"wikinfo"
],
- "commit": "d1a95a62e90cff70d83a6a2ce611aa895adb9a58",
- "sha256": "196hhbqpx233av4zfcz0ig5r0rbp6annr8w88j5i6bqrk0yzm2ws"
+ "commit": "2eb31ab00e4c8ad53dc15234f29527b9f0f54d71",
+ "sha256": "0sghvnvbbv3d7kdvcv2dbbzbv38b3jjzbrhjv6fn5lynyr929vqr"
}
},
{
@@ -108142,15 +108485,15 @@
"repo": "bmag/emacs-purpose",
"unstable": {
"version": [
- 20210214,
- 1451
+ 20210315,
+ 1848
],
"deps": [
"imenu-list",
"let-alist"
],
- "commit": "cb61b9381ef9865e725c4641588d7b8945d35003",
- "sha256": "0ppx6kbc03l18z0dwd6y0anf8bqnf9vcpdz7h552q8sycrrwfq0h"
+ "commit": "aa4e7376ab72b7f67cf8ad46b67a2eaec2f8cd61",
+ "sha256": "1l7nrms211jslxibq18wxxdx7rv6i18by8lzhk692fp6s5af2fi3"
},
"stable": {
"version": [
@@ -108368,11 +108711,11 @@
"repo": "magit/with-editor",
"unstable": {
"version": [
- 20210117,
- 2008
+ 20210319,
+ 1930
],
- "commit": "2848a90addae086b657605b84a7fbecf2c4c1c65",
- "sha256": "0pcy9w0q4jlwcf4hhcdm2cjgpj9ca4b04cydwlv5pnm0qrnlrzpc"
+ "commit": "ebcbd3b137154e6c5a2b976bacbb89d48ddfa242",
+ "sha256": "0qir7kzvnlchpvmpl8gj11yqly6j5m260mmxny9xxwx0dzwaya4k"
},
"stable": {
"version": [
@@ -108695,8 +109038,8 @@
"repo": "abo-abo/worf",
"unstable": {
"version": [
- 20210224,
- 1905
+ 20210309,
+ 1513
],
"deps": [
"ace-link",
@@ -108704,8 +109047,8 @@
"swiper",
"zoutline"
],
- "commit": "eed052db551f60483b4189e9c87cbb16f6d5947a",
- "sha256": "1800q96gchagwqplpwscgjqb9f7zcc0qb2z07cbq6a17dc4rqcpl"
+ "commit": "fff12d4d3bb1ddf70cd0abb78aecd9133b367990",
+ "sha256": "1fbi0rv9pvh9bf72fjc3pfql9xfnw7zif0rsw0r2gn4sdn7202id"
},
"stable": {
"version": [
@@ -108985,11 +109328,11 @@
"repo": "redguardtoo/wucuo",
"unstable": {
"version": [
- 20210129,
- 407
+ 20210316,
+ 156
],
- "commit": "4f1a63bf990c06942c5c290d5d146f8545f43b95",
- "sha256": "0awa2zhnmm49sdvxwzhbnzcynk4qsbpsrmqmh9xi9rw20711iwjr"
+ "commit": "d66e6808367048b7694383cf545102e7cad6ba8c",
+ "sha256": "0ahz85n49x2579hpzir2xsqwm0mwlv9x2h91haq0w0l73llnj35q"
},
"stable": {
"version": [
@@ -109154,11 +109497,11 @@
"repo": "xahlee/xah-fly-keys",
"unstable": {
"version": [
- 20210224,
- 2052
+ 20210319,
+ 1553
],
- "commit": "df7001159f7e8c9a61c0e360e8ea47b51deb38d9",
- "sha256": "1hcm86w7mkc3ms2hy1fljjnk88yin1lax6ww3aq7r2yijjsv9a4w"
+ "commit": "f35ef2e8cb8208c30a7ba02df52f32d915073fe6",
+ "sha256": "13xf12ci1anm6r8j90i6mj8pfmb8ffvhyzinz42046achhpymwnl"
}
},
{
@@ -109621,20 +109964,20 @@
},
{
"ename": "xref-js2",
- "commit": "b5dab444ead98210b4ab3a6f9a61d013aed6d5b7",
- "sha256": "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3",
+ "commit": "940abb73967f518c5ff2724bfa1adabbe6ed8f0d",
+ "sha256": "08az9z1ahs0x8307zrxc1yrvbqj26y4ipcxzgbdbbcil36c27z63",
"fetcher": "github",
- "repo": "NicolasPetton/xref-js2",
+ "repo": "js-emacs/xref-js2",
"unstable": {
"version": [
- 20190915,
- 2032
+ 20210310,
+ 1238
],
"deps": [
"js2-mode"
],
- "commit": "6f1ed5dae0c2485416196a51f2fa92f32e4b8262",
- "sha256": "0pbnhliq3zivijksdhdqd7m3ndc3z7kw2g21zwihq28faps96ikj"
+ "commit": "fd6b723e7f1f9793d189a815e1904364dc026b03",
+ "sha256": "0iny4qswyicrax36d4sgyfrw3giwjd1440bmlksd36y8zjkqqym0"
},
"stable": {
"version": [
@@ -110840,10 +111183,10 @@
},
{
"ename": "zenscript-mode",
- "commit": "2879811c121d24f14f23fb45afabd31fbd4246e1",
- "sha256": "141im3qrpssjzlpiy72zzdyhqdcshpn68yvdqdvcxajrakkh8d0w",
+ "commit": "c991dec83a2fdf5c9cdb4c291a8c80246591abef",
+ "sha256": "1vff9ax25j68gzdcnainynk55cb0brkg9rrv25ng9g6lixbrjs8a",
"fetcher": "github",
- "repo": "eutropius225/zenscript-mode",
+ "repo": "eutro/zenscript-mode",
"unstable": {
"version": [
20210102,
@@ -110938,8 +111281,8 @@
"deps": [
"all-the-icons"
],
- "commit": "65a4b57d064cd4bfe61750d105206c3654ac5bba",
- "sha256": "1jiyz68pswbmh5fbkwndw83kim150rg2wz7i2a5lac3vj7zqr0nc"
+ "commit": "ee49ea9e875d7a3da63386880ca3a9e10b1051e5",
+ "sha256": "06q1v0fkxyxadrpgy28gh85j19vi4ars2xrbbm1bz28xrcbnps04"
},
"stable": {
"version": [
@@ -111123,14 +111466,14 @@
"repo": "sshirokov/ZNC.el",
"unstable": {
"version": [
- 20160627,
- 2032
+ 20210304,
+ 2337
],
"deps": [
"cl-lib"
],
- "commit": "ce468d185e4a949c45fdd7586313144bc69d4fe5",
- "sha256": "0jh11lbzsndsz9i143av7510417nzwy4j3mmpq7cjixfbmnxdq06"
+ "commit": "e795739ec182d217ffaf3c595819c308911540ee",
+ "sha256": "108bw2k255rkngfkp5iff1frsirc06j70ar1gcrh9lc3fcxdawlp"
}
},
{
diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix
index 3814c8a879fd..4f78267dbe5d 100644
--- a/pkgs/applications/editors/fte/default.nix
+++ b/pkgs/applications/editors/fte/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
name = "fte-0.50.02";
- buildInputs = [ unzip perl libX11 libXpm gpm ncurses slang ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ perl libX11 libXpm gpm ncurses slang ];
ftesrc = fetchurl {
url = "mirror://sourceforge/fte/fte-20110708-src.zip";
diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index 23a81c9cb00a..2249009af777 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "ghostwriter";
- version = "2.0.0-rc4";
+ version = "2.0.0-rc5";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
rev = version;
- sha256 = "07547503a209hc0fcg902w3x0s1m899c10nj3gqz3hak0cmrasi3";
+ sha256 = "sha256-Gc0/AHxxJd5Cq3dBQ0Xy2TF78CBmQFYUzm4s7q1aHEE=";
};
nativeBuildInputs = [ qmake pkg-config qttools ];
diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index 06013b50d63b..81cba221622a 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glow";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "glow";
rev = "v${version}";
- sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j";
+ sha256 = "13ip29yxjc2fhsk12m6hj6mswrgc9a4m8gf0hiffd1nh5313mqxi";
};
- vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639";
+ vendorSha256 = "0i49b1yq9x5n59k29yacxyif928r0w7hl6azfvr5k3rssg0y4l7f";
doCheck = false;
diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/applications/editors/gophernotes/default.nix
index e48ee4dd13c7..161acb54bbad 100644
--- a/pkgs/applications/editors/gophernotes/default.nix
+++ b/pkgs/applications/editors/gophernotes/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gophernotes";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "gopherdata";
repo = "gophernotes";
rev = "v${version}";
- sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27";
+ sha256 = "sha256-EEMKV+k5qcep4z7J5r1nSLxmb0fbfpJOPmz5bE91cd8=";
};
- vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs";
+ vendorSha256 = "sha256-Wy4HcPlrlYUjRQHhw+UPAa+Rn1FvJobWGxgFiJKJTAg=";
meta = with lib; {
description = "Go kernel for Jupyter notebooks";
diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix
index 5429497d209e..29a3e1ff1caa 100644
--- a/pkgs/applications/editors/hecate/default.nix
+++ b/pkgs/applications/editors/hecate/default.nix
@@ -21,6 +21,5 @@ buildGoPackage rec {
longDescription = "The Hex Editor From Hell!";
license = with licenses; [ mit ];
maintainers = with maintainers; [ ramkromberg ];
- platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 31551f1b7248..0901c815f161 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -270,12 +270,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "10120y9ccdlhjrpvfnspfj4s7940b3v3yic78r372wj5ns4bsjax"; /* updated by script */
+ sha256 = "10s0jkxi892pg7d2slh7cvrd0ch2223qms3c9v1ax0n6ymfkcw14"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -296,12 +296,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.4"; /* updated by script */
description = "Up and Coming Go IDE";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "00wbl4g1wgb9c287z6i7a48bm5zyb1gkmyqmhasmj0n2vamaq6sz"; /* updated by script */
+ sha256 = "148rs9w0fqr5xzhnq5bd473j4vnb69kf8yxxjmwdp25z2d7x47ip"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@@ -309,12 +309,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "0zkjmvi27b69xrkn4s6f5788n5yn044phgf48kamfqfs37q4xf1d"; /* updated by script */
+ sha256 = "1msfl8qq0aday4ssip73r0y096mrb89mr7z2j4mpqhkzgsmvpjk0"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@@ -322,12 +322,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
- sha256 = "1vac21d9p52z4k1dl903rc2dbbcf873xbg8rx1fp9nsaaphnc9lq"; /* updated by script */
+ sha256 = "0szq8lqp1h7kci8kqd1bb3g16j3p5f4dfmbccbyrrwsram3hvjgi"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@@ -335,12 +335,12 @@ in
mps = buildMps rec {
name = "mps-${version}";
- version = "2020.3.1"; /* updated by script */
+ version = "2020.3.2"; /* updated by script */
description = "Create your own domain-specific language";
- license = lib.licenses.unfree;
+ license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz";
- sha256 = "0qvl724mm53rxfhafl6561rhpwppcadmwr9sh0hpsfgsprh2xznv"; /* updated by script */
+ sha256 = "0vskzia48jq50bjdqw993gizvvd59f3qlszbsdp7xg5a3afbk7p3"; /* updated by script */
};
wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE";
@@ -348,12 +348,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "1dmymlv71syjv8byb9ap9c13fimjl6c3r94dwr9kghdlj3jh7p0k"; /* updated by script */
+ sha256 = "0arff0882xw1azbxpn1n3wbc5ncg8gmfim3jf6rq2dky8kp9ylkm"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@@ -361,12 +361,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2020.3.3"; /* updated by script */
+ version = "2020.3.4"; /* updated by script */
description = "PyCharm Community Edition";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "0p05pgfmr9515sqbqbjiksg7qzvqxcs119lxfc6dsirdvc1qhnli"; /* updated by script */
+ sha256 = "0xh0hb0v3ilgqjljh22c75hkllqgqbpppplni2dz2pv9rb3r5dv5"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@@ -374,12 +374,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2020.3.3"; /* updated by script */
+ version = "2020.3.4"; /* updated by script */
description = "PyCharm Professional Edition";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1yzv1pxpw6pvsjljqvbnf8qgdx34rs5j232zaq4vb5x2ahswf9mm"; /* updated by script */
+ sha256 = "18gkjc52qpghs721rkbsj03kaf6n8c8sxg57b2d82hjckjgm6q10"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@@ -387,12 +387,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.4"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "1dkgbd2nqkjcswf7j3pnrsaq9n5wk42abz2c4wgkrh1zrpgihd0j"; /* updated by script */
+ sha256 = "1v99yqj83aw9j400z3v24n7xnyxzw5vm0b3rwd4yb8w3ajl59gq1"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@@ -413,12 +413,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "1jpa4gfy0xmmscjqca4pvvwvh4h3lg02nbf1m5wcsjdcywbk9y40"; /* updated by script */
+ sha256 = "0szq7qz5p1ksmqdy1rma5rfl0d9dy9qmhz8k5id4zdpyz2jsacfb"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl
index b4a96228db40..6f0a451849a0 100755
--- a/pkgs/applications/editors/jetbrains/update.pl
+++ b/pkgs/applications/editors/jetbrains/update.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i perl -p perl perlPackages.LWPProtocolhttps perlPackages.FileSlurp
+#!nix-shell -i perl -p perl perlPackages.LWPProtocolHttps perlPackages.FileSlurp
use strict;
use List::Util qw(reduce);
diff --git a/pkgs/applications/editors/kakoune/plugins/aliases.nix b/pkgs/applications/editors/kakoune/plugins/aliases.nix
new file mode 100644
index 000000000000..5ff2a03441de
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/aliases.nix
@@ -0,0 +1,46 @@
+# Deprecated aliases - for backward compatibility
+
+lib: overriden:
+
+with overriden;
+
+let
+ # Removing recurseForDerivation prevents derivations of aliased attribute
+ # set to appear while listing all the packages available.
+ removeRecurseForDerivations = alias: with lib;
+ if alias.recurseForDerivations or false then
+ removeAttrs alias ["recurseForDerivations"]
+ else alias;
+
+ # Disabling distribution prevents top-level aliases for non-recursed package
+ # sets from building on Hydra.
+ removeDistribute = alias: with lib;
+ if isDerivation alias then
+ dontDistribute alias
+ else alias;
+
+ # Make sure that we are not shadowing something from
+ # all-packages.nix.
+ checkInPkgs = n: alias: if builtins.hasAttr n overriden
+ then throw "Alias ${n} is still in kakounePlugins"
+ else alias;
+
+ mapAliases = aliases:
+ lib.mapAttrs (n: alias: removeDistribute
+ (removeRecurseForDerivations
+ (checkInPkgs n alias)))
+ aliases;
+
+ deprecations = lib.mapAttrs (old: info:
+ throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}."
+ ) (builtins.fromJSON (builtins.readFile ./deprecated.json));
+
+in
+mapAliases ({
+ kak-auto-pairs = auto-pairs-kak; # backwards compat, added 2021-01-04
+ kak-buffers = kakoune-buffers; # backwards compat, added 2021-01-04
+ kak-fzf = fzf-kak; # backwards compat, added 2021-01-04
+ kak-powerline = powerline-kak; # backwards compat, added 2021-01-04
+ kak-prelude = prelude-kak; # backwards compat, added 2021-01-04
+ kak-vertical-selection = kakoune-vertical-selection; # backwards compat, added 2021-01-04
+} // deprecations)
diff --git a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix
new file mode 100644
index 000000000000..f35a175312c0
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, rtpPath ? "share/kak/autoload/plugins" }:
+rec {
+ buildKakounePlugin = attrs@{
+ name ? "${attrs.pname}-${attrs.version}",
+ namePrefix ? "kakplugin-",
+ src,
+ unpackPhase ? "",
+ configurePhase ? "",
+ buildPhase ? "",
+ preInstall ? "",
+ postInstall ? "",
+ path ? lib.getName name,
+ ...
+ }:
+ stdenv.mkDerivation ((builtins.removeAttrs attrs [ "namePrefix" "path" ]) // {
+ name = namePrefix + name;
+
+ installPhase = ''
+ runHook preInstall
+
+ target=$out/${rtpPath}/${path}
+ mkdir -p $out/${rtpPath}
+ cp -r . $target
+
+ runHook postInstall
+ '';
+ });
+
+ buildKakounePluginFrom2Nix = attrs: buildKakounePlugin ({
+ buildPhase = ":";
+ configurePhase = ":";
+ } // attrs);
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/pkgs/applications/editors/kakoune/plugins/case.kak.nix
deleted file mode 100644
index 3fa91113bbad..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/case.kak.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchFromGitLab }:
-
-stdenv.mkDerivation {
- name = "case.kak";
- version = "unstable-2020-04-06";
-
- src = fetchFromGitLab {
- owner = "FlyingWombat";
- repo = "case.kak";
- rev = "6f1511820aa3abfa118e0f856118adc8113e2185";
- sha256 = "002njrlwgakqgp74wivbppr9qyn57dn4n5bxkr6k6nglk9qndwdp";
- };
-
- installPhase = ''
- mkdir -p $out/share/kak/autoload/plugins
- cp -r rc/case.kak $out/share/kak/autoload/plugins
- '';
-
- meta = with lib; {
- description = "Case convention conversion for Kakoune";
- homepage = "https://gitlab.com/FlyingWombat/case.kak";
- license = licenses.unlicense;
- maintainers = with maintainers; [ eraserhd ];
- platform = platforms.all;
- };
-}
-
diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix
index 98b77338b9b3..1fe16a4e60c1 100644
--- a/pkgs/applications/editors/kakoune/plugins/default.nix
+++ b/pkgs/applications/editors/kakoune/plugins/default.nix
@@ -1,17 +1,25 @@
-{ pkgs, parinfer-rust, rep, kak-lsp }:
+{ callPackage, config, kakouneUtils, lib }:
-{
- inherit parinfer-rust rep kak-lsp;
+let
- case-kak = pkgs.callPackage ./case.kak.nix { };
- kak-ansi = pkgs.callPackage ./kak-ansi.nix { };
- kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { };
- kak-buffers = pkgs.callPackage ./kak-buffers.nix { };
- kak-fzf = pkgs.callPackage ./kak-fzf.nix { };
- kak-plumb = pkgs.callPackage ./kak-plumb.nix { };
- 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 { };
- quickscope-kak = pkgs.callPackage ./quickscope.kak.nix { };
-}
+ inherit (kakouneUtils.override {}) buildKakounePluginFrom2Nix;
+
+ plugins = callPackage ./generated.nix {
+ inherit buildKakounePluginFrom2Nix overrides;
+ };
+
+ # TL;DR
+ # * Add your plugin to ./kakoune-plugin-names
+ # * run ./update.py
+ #
+ # If additional modifications to the build process are required,
+ # add to ./overrides.nix.
+ overrides = callPackage ./overrides.nix {
+ inherit buildKakounePluginFrom2Nix;
+ };
+
+ aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins);
+
+in
+
+plugins // aliases
diff --git a/pkgs/applications/editors/kakoune/plugins/deprecated.json b/pkgs/applications/editors/kakoune/plugins/deprecated.json
new file mode 100644
index 000000000000..0967ef424bce
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/deprecated.json
@@ -0,0 +1 @@
+{}
diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix
new file mode 100644
index 000000000000..3ea3ea514788
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/generated.nix
@@ -0,0 +1,211 @@
+# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!
+{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
+let
+ packages = ( self:
+{
+ active-window-kak = buildKakounePluginFrom2Nix {
+ pname = "active-window-kak";
+ version = "2020-05-13";
+ src = fetchFromGitHub {
+ owner = "greenfork";
+ repo = "active-window.kak";
+ rev = "988db69cfbb88bd741d089bb43b0be551693e7c1";
+ sha256 = "1fv1cp9q212gamf9z2papl5xcl2w31fpcmbgdzbxcxdl1pvfsqp8";
+ };
+ meta.homepage = "https://github.com/greenfork/active-window.kak/";
+ };
+
+ auto-pairs-kak = buildKakounePluginFrom2Nix {
+ pname = "auto-pairs-kak";
+ version = "2020-10-04";
+ src = fetchFromGitHub {
+ owner = "alexherbo2";
+ repo = "auto-pairs.kak";
+ rev = "fd735ec149ef0d9ca5f628a95b1e52858b5afbdc";
+ sha256 = "07795kv9njlnp6mckwv141ny2ns6wyf5r0dfjaxh9ngd105zgif1";
+ };
+ meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/";
+ };
+
+ connect-kak = buildKakounePluginFrom2Nix {
+ pname = "connect-kak";
+ version = "2021-02-13";
+ src = fetchFromGitHub {
+ owner = "alexherbo2";
+ repo = "connect.kak";
+ rev = "0858c0e50c6ca6d214fb088f052385a242548e83";
+ sha256 = "1w4pwybg3v916hcyc49gz0blygv54ivv81x8fxp44ck0sy98idr3";
+ };
+ meta.homepage = "https://github.com/alexherbo2/connect.kak/";
+ };
+
+ fzf-kak = buildKakounePluginFrom2Nix {
+ pname = "fzf-kak";
+ version = "2021-01-27";
+ src = fetchFromGitHub {
+ owner = "andreyorst";
+ repo = "fzf.kak";
+ rev = "e10de405e2a98e910d0808059200d206ba80f865";
+ sha256 = "1hbsm1k8k0cgv7gxqicvnl22n2lb1plhkanniggk694gll22lq68";
+ };
+ meta.homepage = "https://github.com/andreyorst/fzf.kak/";
+ };
+
+ kakoune-buffer-switcher = buildKakounePluginFrom2Nix {
+ pname = "kakoune-buffer-switcher";
+ version = "2020-12-27";
+ src = fetchFromGitHub {
+ owner = "occivink";
+ repo = "kakoune-buffer-switcher";
+ rev = "6a27c45db87a23070c34fab36d2f8d812cd002a6";
+ sha256 = "1rmwy317908v8p54806m721bpzm8sgygb9abri34537ka6r05y5j";
+ };
+ meta.homepage = "https://github.com/occivink/kakoune-buffer-switcher/";
+ };
+
+ kakoune-buffers = buildKakounePluginFrom2Nix {
+ pname = "kakoune-buffers";
+ version = "2020-06-11";
+ src = fetchFromGitHub {
+ owner = "Delapouite";
+ repo = "kakoune-buffers";
+ rev = "67959fbad727ba8470fe8cd6361169560f4fb532";
+ sha256 = "09prhzz4yzf6ryw0npd1gpcfp77681vgawpp1ilfvbf25xgbbz33";
+ };
+ meta.homepage = "https://github.com/Delapouite/kakoune-buffers/";
+ };
+
+ kakoune-easymotion = buildKakounePluginFrom2Nix {
+ pname = "kakoune-easymotion";
+ version = "2020-03-09";
+ src = fetchFromGitHub {
+ owner = "danr";
+ repo = "kakoune-easymotion";
+ rev = "0ca75450023a149efc70e8e383e459b571355c70";
+ sha256 = "15czvl0qj2k767pysr6xk2v31mkhvcbmv76xs2a8yrslchms70b5";
+ };
+ meta.homepage = "https://github.com/danr/kakoune-easymotion/";
+ };
+
+ kakoune-extra-filetypes = buildKakounePluginFrom2Nix {
+ pname = "kakoune-extra-filetypes";
+ version = "2021-01-15";
+ src = fetchFromGitHub {
+ owner = "kakoune-editor";
+ repo = "kakoune-extra-filetypes";
+ rev = "c6f8aaccd8c9cd6b487964c8943416e21fbe7c18";
+ sha256 = "1vkff8xbycfgxv8x09cvc79qcg5fdzn2x77mbmifmkq236khrwrg";
+ };
+ meta.homepage = "https://github.com/kakoune-editor/kakoune-extra-filetypes/";
+ };
+
+ kakoune-rainbow = buildKakounePluginFrom2Nix {
+ pname = "kakoune-rainbow";
+ version = "2020-09-01";
+ src = fetchFromGitHub {
+ owner = "listentolist";
+ repo = "kakoune-rainbow";
+ rev = "d09103e8d268cf4621215bf162a0244c9482be3c";
+ sha256 = "1i3id7xw0j4z1a14mscr68ckpgvcwsjpl86lr864wy7w7qcmblx6";
+ };
+ meta.homepage = "https://github.com/listentolist/kakoune-rainbow/";
+ };
+
+ kakoune-registers = buildKakounePluginFrom2Nix {
+ pname = "kakoune-registers";
+ version = "2020-06-19";
+ src = fetchFromGitHub {
+ owner = "Delapouite";
+ repo = "kakoune-registers";
+ rev = "9531947baecd83c1d4c3bea0adf10f4462f1e120";
+ sha256 = "08v9ndghh7wvr8rsrqm05gksk9ai5vnwvw9gwqasbppb48cv4a8c";
+ };
+ meta.homepage = "https://github.com/Delapouite/kakoune-registers/";
+ };
+
+ kakoune-vertical-selection = buildKakounePluginFrom2Nix {
+ pname = "kakoune-vertical-selection";
+ version = "2019-04-11";
+ src = fetchFromGitHub {
+ owner = "occivink";
+ repo = "kakoune-vertical-selection";
+ rev = "c420f8b867ce47375fac303886e31623669a42b7";
+ sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb";
+ };
+ meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/";
+ };
+
+ openscad-kak = buildKakounePluginFrom2Nix {
+ pname = "openscad-kak";
+ version = "2020-12-10";
+ src = fetchFromGitHub {
+ owner = "mayjs";
+ repo = "openscad.kak";
+ rev = "ba51bbdcd96ccf94bb9239bef1481b6f37125849";
+ sha256 = "15dybd6dnnwla6mj8sw83nwd62para1syxzifznl6rz6kp8vqjjj";
+ };
+ meta.homepage = "https://github.com/mayjs/openscad.kak/";
+ };
+
+ powerline-kak = buildKakounePluginFrom2Nix {
+ pname = "powerline-kak";
+ version = "2021-02-15";
+ src = fetchFromGitHub {
+ owner = "jdugan6240";
+ repo = "powerline.kak";
+ rev = "322a760daa099d519ff50d14c29b27f3e2af00d1";
+ sha256 = "0mb8f8p6g75p05ifp45i0gbq2mib8c8giz7r1xfd0yrwspp4aksc";
+ };
+ meta.homepage = "https://github.com/jdugan6240/powerline.kak/";
+ };
+
+ prelude-kak = buildKakounePluginFrom2Nix {
+ pname = "prelude-kak";
+ version = "2020-09-06";
+ src = fetchFromGitHub {
+ owner = "alexherbo2";
+ repo = "prelude.kak";
+ rev = "f1e0f4d5cb62a36924e3f8ba6824d6aed8c19d23";
+ sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c";
+ };
+ meta.homepage = "https://github.com/alexherbo2/prelude.kak/";
+ };
+
+ replace-mode-kak = buildKakounePluginFrom2Nix {
+ pname = "replace-mode-kak";
+ version = "2020-10-07";
+ src = fetchFromGitHub {
+ owner = "alexherbo2";
+ repo = "replace-mode.kak";
+ rev = "5f4c73cdbaf5aeb964ee35ad4b9081b233af90c0";
+ sha256 = "1cmylx99bm7jwfb4hclb69sdc4n8f29ssyy2byjiw53ni9rnc8q0";
+ };
+ meta.homepage = "https://github.com/alexherbo2/replace-mode.kak/";
+ };
+
+ sleuth-kak = buildKakounePluginFrom2Nix {
+ pname = "sleuth-kak";
+ version = "2020-11-06";
+ src = fetchFromGitHub {
+ owner = "alexherbo2";
+ repo = "sleuth.kak";
+ rev = "911db8bd208ad0d289b8fa15a2ac665ff39bd6bd";
+ sha256 = "0g41c0038fpmihqva71xl4vfbmvsp13i47gp6fnmaikajpynzc51";
+ };
+ meta.homepage = "https://github.com/alexherbo2/sleuth.kak/";
+ };
+
+ tabs-kak = buildKakounePluginFrom2Nix {
+ pname = "tabs-kak";
+ version = "2021-02-16";
+ src = fetchFromGitHub {
+ owner = "enricozb";
+ repo = "tabs.kak";
+ rev = "1aaa8cd89e404cbbd76d44ff8089de0951612fbf";
+ sha256 = "0dfz6j6yxl65jbh4xvpiy2abr2sdjyalynzhl28y7l1gzqv4ni3j";
+ };
+ meta.homepage = "https://github.com/enricozb/tabs.kak/";
+ };
+
+});
+in lib.fix' (lib.extends overrides packages)
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix b/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix
deleted file mode 100644
index f34ee6d29990..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- name = "kak-ansi";
- version = "0.2.1";
-
- src = fetchFromGitHub {
- owner = "eraserhd";
- repo = "kak-ansi";
- rev = "v${version}";
- sha256 = "0ddjih8hfyf6s4g7y46p1355kklaw1ydzzh61141i0r45wyb2d0d";
- };
-
- installPhase = ''
- mkdir -p $out/bin $out/share/kak/autoload/plugins/
- cp kak-ansi-filter $out/bin/
- # Hard-code path of filter and don't try to build when Kakoune boots
- sed '
- /^declare-option.* ansi_filter /i\
-declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter}
- /^declare-option.* ansi_filter /,/^}/d
- ' rc/ansi.kak >$out/share/kak/autoload/plugins/ansi.kak
- '';
-
- meta = with lib; {
- description = "Kakoune support for rendering ANSI code";
- homepage = "https://github.com/eraserhd/kak-ansi";
- license = licenses.unlicense;
- maintainers = with maintainers; [ eraserhd ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
deleted file mode 100644
index 36842f999a56..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation {
- name = "kak-auto-pairs";
- version = "2020-07-14";
- src = fetchFromGitHub {
- owner = "alexherbo2";
- repo = "auto-pairs.kak";
- rev = "5b4b3b723c34c8b7f40cee60868204974349bf9f";
- sha256 = "1wgrv03f1lkzflbbaz8n23glij5rvfxf8pcqysd668mbx1hcrk9i";
- };
-
- installPhase = ''
- mkdir -p $out/share/kak/autoload/plugins
- cp -r rc $out/share/kak/autoload/plugins/auto-pairs
- '';
-
- meta = with lib;
- { description = "Kakoune extension to enable automatic closing of pairs";
- homepage = "https://github.com/alexherbo2/auto-pairs.kak";
- license = licenses.unlicense;
- maintainers = with maintainers; [ nrdxp ];
- platform = platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
deleted file mode 100644
index 7075ae3ef0a3..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchFromGitHub, lib }:
-stdenv.mkDerivation {
- name = "kak-buffers";
- version = "2019-04-03";
- src = fetchFromGitHub {
- owner = "Delapouite";
- repo = "kakoune-buffers";
- rev = "3b35b23ac2be661a37c085d34dd04d066450f757";
- sha256 = "0f3g0v1sjinii3ig9753jjj35v2km4h9bcfw9xgzwz8b10d75bax";
- };
-
- installPhase = ''
- mkdir -p $out/share/kak/autoload/plugins
- cp -r buffers.kak $out/share/kak/autoload/plugins
- '';
-
- meta = with lib;
- { description = "Ease navigation between opened buffers in Kakoune";
- homepage = "https://github.com/Delapouite/kakoune-buffers";
- license = licenses.mit;
- maintainers = with maintainers; [ nrdxp ];
- platform = platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
deleted file mode 100644
index b52584b44562..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fzf }:
-
-assert lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ];
-
-stdenv.mkDerivation {
- name = "kak-fzf";
- version = "2020-07-26";
-
- src = fetchFromGitHub {
- owner = "andreyorst";
- repo = "fzf.kak";
- rev = "f23daa698ad95493fbd675ae153e3cac13ef34e9";
- hash = "sha256-BfXHTJ371ThOizMI/4BAbdJoaltGSP586hz4HqX1KWA=";
- };
-
- configurePhase = ''
- if [[ -x "${fzf}/bin/fzf" ]]; then
- fzfImpl='${fzf}/bin/fzf'
- else
- fzfImpl='${fzf}/bin/sk'
- fi
-
- substituteInPlace rc/fzf.kak \
- --replace \'fzf\' \'"$fzfImpl"\'
- '';
-
- installPhase = ''
- mkdir -p $out/share/kak/autoload/plugins
- cp -r rc $out/share/kak/autoload/plugins/fzf
- '';
-
- meta = with lib;
- { description = "Kakoune plugin that brings integration with fzf";
- homepage = "https://github.com/andreyorst/fzf.kak";
- license = licenses.mit;
- maintainers = with maintainers; [ nrdxp ];
- platform = platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix b/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix
deleted file mode 100644
index 0c59ca9a08f0..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, kakoune-unwrapped, plan9port, ... }:
-
-stdenv.mkDerivation rec {
- pname = "kak-plumb";
- version = "0.1.1";
-
- src = fetchFromGitHub {
- owner = "eraserhd";
- repo = "kak-plumb";
- rev = "v${version}";
- sha256 = "1rz6pr786slnf1a78m3sj09axr4d2lb5rg7sfa4mfg1zcjh06ps6";
- };
-
- installPhase = ''
- mkdir -p $out/bin $out/share/kak/autoload/plugins/
- substitute rc/plumb.kak $out/share/kak/autoload/plugins/plumb.kak \
- --replace '9 plumb' '${plan9port}/bin/9 plumb'
- substitute edit-client $out/bin/edit-client \
- --replace '9 9p' '${plan9port}/bin/9 9p' \
- --replace 'kak -p' '${kakoune-unwrapped}/bin/kak -p'
- chmod +x $out/bin/edit-client
- '';
-
- meta = with lib; {
- description = "Kakoune integration with the Plan 9 plumber";
- homepage = "https://github.com/eraserhd/kak-plumb";
- license = licenses.unlicense;
- maintainers = with maintainers; [ eraserhd ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
deleted file mode 100644
index 318ae2958b61..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, git, fetchFromGitHub, lib }:
-stdenv.mkDerivation {
- name = "kak-powerline";
- version = "2020-08-22";
- src = fetchFromGitHub {
- owner = "jdugan6240";
- repo = "powerline.kak";
- rev = "d641b2cd8024f872bcda23f9256e7aff36da02ae";
- sha256 = "65948f5ef3ab2f46f6d186ad752665c251d887631d439949decc2654a67958a4";
- };
-
- configurePhase = ''
- substituteInPlace rc/modules/git.kak \
- --replace \'git\' \'${git}/bin/git\'
- '';
-
- installPhase = ''
- mkdir -p $out/share/kak/autoload/plugins
- cp -r rc $out/share/kak/autoload/plugins/powerline
- '';
-
- meta = with lib;
- { description = "Kakoune modeline, but with passion";
- homepage = "https://github.com/jdugan6240/powerline.kak";
- license = licenses.mit;
- maintainers = with maintainers; [ nrdxp ];
- platform = platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
deleted file mode 100644
index e6f06f4b8e64..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation {
- name = "kak-prelude";
- version = "2020-06-09";
-
- src = fetchFromGitHub {
- owner = "alexherbo2";
- repo = "prelude.kak";
- rev = "f1e0f4d5cb62a36924e3f8ba6824d6aed8c19d23";
- sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c";
- };
-
- installPhase = ''
- mkdir -p $out/share/kak/autoload/plugins
- cp -r rc $out/share/kak/autoload/plugins/prelude
- '';
-
- meta = with lib;
- { description = "Prelude of shell blocks for Kakoune.";
- homepage = "https://github.com/alexherbo2/prelude.kak";
- license = licenses.unlicense;
- maintainers = with maintainers; [ buffet ];
- platform = platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
deleted file mode 100644
index 2ef9d44854fb..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchFromGitHub, lib }:
-stdenv.mkDerivation {
- name = "kak-vertical-selection";
- version = "2019-04-11";
- src = fetchFromGitHub {
- owner = "occivink";
- repo = "kakoune-vertical-selection";
- rev = "c420f8b867ce47375fac303886e31623669a42b7";
- sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb";
- };
-
- installPhase = ''
- mkdir -p $out/share/kak/autoload/plugins
- cp -r vertical-selection.kak $out/share/kak/autoload/plugins
- '';
-
- meta = with lib;
- { description = "Select up and down lines that match the same pattern in Kakoune";
- homepage = "https://github.com/occivink/kakoune-vertical-selection";
- license = licenses.unlicense;
- maintainers = with maintainers; [ nrdxp ];
- platform = platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
new file mode 100644
index 000000000000..6cd856cb6c25
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
@@ -0,0 +1,17 @@
+alexherbo2/auto-pairs.kak
+alexherbo2/connect.kak
+alexherbo2/prelude.kak
+alexherbo2/replace-mode.kak
+alexherbo2/sleuth.kak
+andreyorst/fzf.kak
+danr/kakoune-easymotion
+Delapouite/kakoune-buffers
+Delapouite/kakoune-registers
+enricozb/tabs.kak@main
+greenfork/active-window.kak
+jdugan6240/powerline.kak
+kakoune-editor/kakoune-extra-filetypes
+listentolist/kakoune-rainbow
+mayjs/openscad.kak
+occivink/kakoune-buffer-switcher
+occivink/kakoune-vertical-selection
diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-utils.nix b/pkgs/applications/editors/kakoune/plugins/kakoune-utils.nix
new file mode 100644
index 000000000000..11a1cc130d6c
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kakoune-utils.nix
@@ -0,0 +1,4 @@
+{ lib, stdenv }:
+{
+ inherit (import ./build-kakoune-plugin.nix { inherit lib stdenv; }) buildKakounePlugin buildKakounePluginFrom2Nix;
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix b/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix
deleted file mode 100644
index 57c1033ebbdd..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, 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 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/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix
new file mode 100644
index 000000000000..2ca24cf661a0
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix
@@ -0,0 +1,161 @@
+{ lib, stdenv, fetchFromGitHub, fetchFromGitLab, fetchgit
+, buildKakounePluginFrom2Nix
+, kak-lsp, parinfer-rust, rep
+, fzf, git, guile, kakoune-unwrapped, lua5_3, plan9port
+}:
+
+self: super: {
+ inherit kak-lsp parinfer-rust rep;
+
+ case-kak = buildKakounePluginFrom2Nix {
+ pname = "case-kak";
+ version = "2020-04-06";
+ src = fetchFromGitLab {
+ owner = "FlyingWombat";
+ repo = "case.kak";
+ rev = "6f1511820aa3abfa118e0f856118adc8113e2185";
+ sha256 = "002njrlwgakqgp74wivbppr9qyn57dn4n5bxkr6k6nglk9qndwdp";
+ };
+ meta.homepage = "https://gitlab.com/FlyingWombat/case.kak";
+ };
+
+ fzf-kak = super.fzf-kak.overrideAttrs(oldAttrs: rec {
+ preFixup = ''
+ if [[ -x "${fzf}/bin/fzf" ]]; then
+ fzfImpl='${fzf}/bin/fzf'
+ else
+ fzfImpl='${fzf}/bin/sk'
+ fi
+
+ substituteInPlace $out/share/kak/autoload/plugins/fzf-kak/rc/fzf.kak \
+ --replace \'fzf\' \'"$fzfImpl"\'
+ '';
+ });
+
+ kak-ansi = stdenv.mkDerivation rec {
+ pname = "kak-ansi";
+ version = "0.2.3";
+
+ src = fetchFromGitHub {
+ owner = "eraserhd";
+ repo = "kak-ansi";
+ rev = "v${version}";
+ sha256 = "pO7M3MjKMJQew9O20KALEvsXLuCKPYGGTtuN/q/kj8Q=";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/kak/autoload/plugins/
+ cp kak-ansi-filter $out/bin/
+ # Hard-code path of filter and don't try to build when Kakoune boots
+ sed '
+ /^declare-option.* ansi_filter /i\
+declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter}
+ /^declare-option.* ansi_filter /,/^}/d
+ ' rc/ansi.kak >$out/share/kak/autoload/plugins/ansi.kak
+ '';
+
+ meta = with lib; {
+ description = "Kakoune support for rendering ANSI code";
+ homepage = "https://github.com/eraserhd/kak-ansi";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ eraserhd ];
+ platforms = platforms.all;
+ };
+ };
+
+ kak-plumb = stdenv.mkDerivation rec {
+ pname = "kak-plumb";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "eraserhd";
+ repo = "kak-plumb";
+ rev = "v${version}";
+ sha256 = "1rz6pr786slnf1a78m3sj09axr4d2lb5rg7sfa4mfg1zcjh06ps6";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/kak/autoload/plugins/
+ substitute rc/plumb.kak $out/share/kak/autoload/plugins/plumb.kak \
+ --replace '9 plumb' '${plan9port}/bin/9 plumb'
+ substitute edit-client $out/bin/edit-client \
+ --replace '9 9p' '${plan9port}/bin/9 9p' \
+ --replace 'kak -p' '${kakoune-unwrapped}/bin/kak -p'
+ chmod +x $out/bin/edit-client
+ '';
+
+ meta = with lib; {
+ description = "Kakoune integration with the Plan 9 plumber";
+ homepage = "https://github.com/eraserhd/kak-plumb";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ eraserhd ];
+ platforms = platforms.all;
+ };
+ };
+
+ kakoune-rainbow = super.kakoune-rainbow.overrideAttrs(oldAttrs: rec {
+ preFixup = ''
+ mkdir -p $out/bin
+ mv $out/share/kak/autoload/plugins/kakoune-rainbow/bin/kak-rainbow.scm $out/bin
+ substituteInPlace $out/bin/kak-rainbow.scm \
+ --replace '/usr/bin/env -S guile' '${guile}/bin/guile'
+ substituteInPlace $out/share/kak/autoload/plugins/kakoune-rainbow/rainbow.kak \
+ --replace '%sh{dirname "$kak_source"}' "'$out'"
+ '';
+ });
+
+ kakoune-state-save = buildKakounePluginFrom2Nix {
+ pname = "kakoune-state-save";
+ version = "2020-02-09";
+
+ src = fetchFromGitLab {
+ owner = "Screwtapello";
+ repo = "kakoune-state-save";
+ rev = "ab7c0c765326a4a80af78857469ee8c80814c52a";
+ sha256 = "AAOCG0TY3G188NnkkwMCSbkkNe487F4gwiFWwG9Yo+A=";
+ };
+
+ meta = with lib; {
+ description = "Help Kakoune save and restore state between sessions";
+ homepage = "https://gitlab.com/Screwtapello/kakoune-state-save";
+ license = licenses.mit;
+ maintainers = with maintainers; [ Flakebi ];
+ platforms = platforms.all;
+ };
+ };
+
+ powerline-kak = super.powerline-kak.overrideAttrs(oldAttrs: rec {
+ preFixup = ''
+ substituteInPlace $out/share/kak/autoload/plugins/powerline-kak/rc/modules/git.kak \
+ --replace ' git ' ' ${git}/bin/git '
+ '';
+ });
+
+ quickscope-kak = buildKakounePluginFrom2Nix rec {
+ pname = "quickscope-kak";
+ version = "1.0.0";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~voroskoi/quickscope.kak";
+ rev = "v${version}";
+ sha256 = "0y1g3zpa2ql8l9rl5i2w84bka8a09kig9nq9zdchaff5pw660mcx";
+ };
+
+ buildInputs = [ lua5_3 ];
+
+ installPhase = ''
+ mkdir -p $out/share/kak/autoload/plugins/
+ cp quickscope.* $out/share/kak/autoload/plugins/
+ # substituteInPlace does not like the pipe
+ sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak
+ '';
+
+ meta = with lib; {
+ description = "Highlight f and t jump positions";
+ homepage = "https://sr.ht/~voroskoi/quickscope.kak/";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ eraserhd ];
+ platforms = platforms.all;
+ };
+ };
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix
deleted file mode 100644
index 8e60e17e7928..000000000000
--- a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchgit, lua5_3 }:
-
-stdenv.mkDerivation rec {
- pname = "quickscope-kak";
- version = "1.0.0";
-
- src = fetchgit {
- url = "https://git.sr.ht/~voroskoi/quickscope.kak";
- rev = "v${version}";
- sha256 = "0y1g3zpa2ql8l9rl5i2w84bka8a09kig9nq9zdchaff5pw660mcx";
- };
-
- buildInputs = [ lua5_3 ];
-
- installPhase = ''
- mkdir -p $out/share/kak/autoload/plugins/
- cp quickscope.* $out/share/kak/autoload/plugins/
- # substituteInPlace does not like the pipe
- sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak
- '';
-
- meta = with lib; {
- description = "Highlight f and t jump positions";
- homepage = "https://sr.ht/~voroskoi/quickscope.kak/";
- license = licenses.unlicense;
- maintainers = with maintainers; [ eraserhd ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py
new file mode 100755
index 000000000000..b6a4bfe4f415
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/update.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3
+
+# format:
+# $ nix run nixpkgs.python3Packages.black -c black update.py
+# type-check:
+# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py
+# linted:
+# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py
+
+import inspect
+import os
+import sys
+from typing import List, Tuple
+from pathlib import Path
+
+# Import plugin update library from maintainers/scripts/pluginupdate.py
+ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
+sys.path.insert(
+ 0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")
+)
+import pluginupdate
+
+GET_PLUGINS = f"""(with import {{}};
+let
+ inherit (kakouneUtils.override {{}}) buildKakounePluginFrom2Nix;
+ generated = callPackage {ROOT}/generated.nix {{
+ inherit buildKakounePluginFrom2Nix;
+ }};
+ hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
+ getChecksum = name: value:
+ if hasChecksum value then {{
+ submodules = value.src.fetchSubmodules or false;
+ sha256 = value.src.outputHash;
+ rev = value.src.rev;
+ }} else null;
+ checksums = lib.mapAttrs getChecksum generated;
+in lib.filterAttrs (n: v: v != null) checksums)"""
+
+HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!"
+
+
+def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
+ sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
+
+ with open(outfile, "w+") as f:
+ f.write(HEADER)
+ f.write(
+ """
+{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
+let
+ packages = ( self:
+{"""
+ )
+ for owner, repo, plugin in sorted_plugins:
+ if plugin.has_submodules:
+ submodule_attr = "\n fetchSubmodules = true;"
+ else:
+ submodule_attr = ""
+
+ f.write(
+ f"""
+ {plugin.normalized_name} = buildKakounePluginFrom2Nix {{
+ pname = "{plugin.normalized_name}";
+ version = "{plugin.version}";
+ src = fetchFromGitHub {{
+ owner = "{owner}";
+ repo = "{repo}";
+ rev = "{plugin.commit}";
+ sha256 = "{plugin.sha256}";{submodule_attr}
+ }};
+ meta.homepage = "https://github.com/{owner}/{repo}/";
+ }};
+"""
+ )
+ f.write(
+ """
+});
+in lib.fix' (lib.extends overrides packages)
+"""
+ )
+ print(f"updated {outfile}")
+
+
+def main():
+ editor = pluginupdate.Editor("kakoune", ROOT, GET_PLUGINS, generate_nix)
+ pluginupdate.update_plugins(editor)
+
+
+if __name__ == "__main__":
+ main()
diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix
index 49dafe8fc1a3..3d3fa196117f 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/pkgs/applications/editors/manuskript/default.nix
@@ -57,6 +57,6 @@ python3Packages.buildPythonApplication rec {
'';
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.steveej ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index e5fde3e501ec..12b66370d506 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
patchFlags = [ "-p2" ];
patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
autoconf automake shared-mime-info intltool
- mono gtk-sharp-2_0 gnome-sharp unzip
+ mono gtk-sharp-2_0 gnome-sharp
dotnetPackages.NUnit
dotnetPackages.NUnitRunners
dotnetPackages.Nuget
diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix
new file mode 100644
index 000000000000..d925ddd2a528
--- /dev/null
+++ b/pkgs/applications/editors/neovim/neovim-qt.nix
@@ -0,0 +1,43 @@
+{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
+, msgpack, neovim, pythonPackages, qtbase }:
+
+mkDerivation rec {
+ pname = "neovim-qt-unwrapped";
+ version = "0.2.16.1";
+
+ src = fetchFromGitHub {
+ owner = "equalsraf";
+ repo = "neovim-qt";
+ rev = "v${version}";
+ sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny";
+ };
+
+ cmakeFlags = [
+ "-DUSE_SYSTEM_MSGPACK=1"
+ "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found
+ ];
+
+ buildInputs = [
+ neovim.unwrapped # only used to generate help tags at build time
+ qtbase
+ ] ++ (with pythonPackages; [
+ jinja2 python msgpack
+ ]);
+
+ nativeBuildInputs = [ cmake doxygen ];
+
+ preCheck = ''
+ # The GUI tests require a running X server, disable them
+ sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d'
+ '';
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Neovim client library and GUI, in Qt5";
+ homepage = "https://github.com/equalsraf/neovim-qt";
+ license = licenses.isc;
+ maintainers = with maintainers; [ peterhoeg ];
+ inherit (neovim.meta) platforms;
+ };
+}
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 8eaa9204c435..5210b6b67c8b 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,79 +1,38 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
-, msgpack, neovim, pythonPackages, qtbase }:
+, msgpack, neovim, pythonPackages, qtbase, neovim-qt-unwrapped }:
let
- unwrapped = mkDerivation rec {
- pname = "neovim-qt-unwrapped";
- version = "0.2.16.1";
-
- src = fetchFromGitHub {
- owner = "equalsraf";
- repo = "neovim-qt";
- rev = "v${version}";
- sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny";
- };
-
- cmakeFlags = [
- "-DUSE_SYSTEM_MSGPACK=1"
- "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found
- ];
-
- buildInputs = [
- neovim.unwrapped # only used to generate help tags at build time
- qtbase
- ] ++ (with pythonPackages; [
- jinja2 python msgpack
- ]);
-
- nativeBuildInputs = [ cmake doxygen ];
-
- preCheck = ''
- # The GUI tests require a running X server, disable them
- sed -i ../test/CMakeLists.txt \
- -e '/^add_xtest_gui/d'
- '';
-
- doCheck = true;
-
- meta = with lib; {
- description = "Neovim client library and GUI, in Qt5";
- homepage = "https://github.com/equalsraf/neovim-qt";
- license = licenses.isc;
- maintainers = with maintainers; [ peterhoeg ];
- inherit (neovim.meta) platforms;
- inherit version;
- };
- };
+ unwrapped = neovim-qt-unwrapped;
in
- stdenv.mkDerivation {
- pname = "neovim-qt";
- version = unwrapped.version;
- buildCommand = if stdenv.isDarwin then ''
- mkdir -p $out/Applications
- cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications
+stdenv.mkDerivation {
+ pname = "neovim-qt";
+ version = unwrapped.version;
+ buildCommand = if stdenv.isDarwin then ''
+ mkdir -p $out/Applications
+ cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications
- chmod -R a+w "$out/Applications/nvim-qt.app/Contents/MacOS"
- wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \
- --prefix PATH : "${neovim}/bin"
- '' else ''
- makeWrapper '${unwrapped}/bin/nvim-qt' "$out/bin/nvim-qt" \
- --prefix PATH : "${neovim}/bin"
+ chmod -R a+w $out/Applications/nvim-qt.app/Contents/MacOS
+ wrapProgram $out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt \
+ --prefix PATH : ${neovim}/bin
+ '' else ''
+ makeWrapper ${unwrapped}/bin/nvim-qt $out/bin/nvim-qt \
+ --prefix PATH : ${neovim}/bin
- # link .desktop file
- mkdir -p "$out/share/pixmaps"
- ln -s '${unwrapped}/share/applications' "$out/share/applications"
- ln -s '${unwrapped}/share/pixmaps/nvim-qt.png' "$out/share/pixmaps/nvim-qt.png"
- '';
+ # link .desktop file
+ mkdir -p $out/share/pixmaps
+ ln -s ${unwrapped}/share/applications $out/share/applications
+ ln -s ${unwrapped}/share/pixmaps/nvim-qt.png $out/share/pixmaps/nvim-qt.png
+ '';
- preferLocalBuild = true;
+ preferLocalBuild = true;
- nativeBuildInputs = [
- makeWrapper
- ];
+ nativeBuildInputs = [
+ makeWrapper
+ ];
- passthru = {
- inherit unwrapped;
- };
+ passthru = {
+ inherit unwrapped;
+ };
- inherit (unwrapped) meta;
- }
+ inherit (unwrapped) meta;
+}
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index f968b85c6ff1..83c5bb6f9309 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "12.2";
+ version = "12.3";
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
- sha512 = "b25cda9830e8fe1d05687b08cc5fa9bcac7e8e6d12776998a4da7e483b3be0d04493345e56be7e6198fa8f86428d57d4459bfa7372c2e3f918f4a1101d0a31a7";
+ sha512 = "2fy696qrfbdkzmq4cwd6l7v6rsc0bf9akh61w3azc544bq3vxl3v6s31hvg3ba0nsh0jv3nbdrk6jp1l4hwgcg9zg7kf2012a1vv2nk";
};
buildCommand = ''
@@ -56,8 +56,8 @@ stdenv.mkDerivation {
ln -s ${desktopItem}/share/applications/* $out/share/applications
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ perl python unzip libicns imagemagick ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ perl python libicns imagemagick ];
meta = {
description = "An integrated development environment for Java, C, C++ and PHP";
diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix
index 1c6f005863b0..22e6185b22f1 100644
--- a/pkgs/applications/editors/poke/default.nix
+++ b/pkgs/applications/editors/poke/default.nix
@@ -10,7 +10,7 @@
, readline
, guiSupport ? false, tcl, tcllib, tk
, miSupport ? true, json_c
-, nbdSupport ? true, libnbd
+, nbdSupport ? !stdenv.isDarwin, libnbd
, textStylingSupport ? true
, dejagnu
}:
@@ -19,11 +19,11 @@ let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
in stdenv.mkDerivation rec {
pname = "poke";
- version = "1.0";
+ version = "1.1";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- hash = "sha256-3pMLhwDAdys8LNDQyjX1D9PXe9+CxiUetRa0noyiWwo=";
+ hash = "sha256-zWjfY8dBtBYLEsvqAvJ8RxWCeUZuNEOTDSU1pFLAatY=";
};
postPatch = ''
diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix
index 19cc7bc29708..533e353a43e6 100644
--- a/pkgs/applications/editors/retext/default.nix
+++ b/pkgs/applications/editors/retext/default.nix
@@ -33,6 +33,10 @@ in python3.pkgs.buildPythonApplication {
paths = map (path: "${path}/lib/aspell") enchantAspellDicts;
}}"
)
+
+ substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
+ --replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \
+ --replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg"
'';
meta = with lib; {
diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix
index 9d86bdc4c5bf..fe22f3424f2e 100644
--- a/pkgs/applications/editors/textadept/10/default.nix
+++ b/pkgs/applications/editors/textadept/10/default.nix
@@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
version = "10.8";
pname = "textadept";
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
- gtk2 ncurses glib unzip zip
+ gtk2 ncurses glib zip
];
src = fetchhg {
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 3c55cffdcf12..a9afc774bc05 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -17,11 +17,11 @@ let
in
stdenv.mkDerivation rec {
pname = "typora";
- version = "0.9.95";
+ version = "0.9.98";
src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "0kgzk7z707vlbjrvykrnw2h6wscmc3h5hxycyz1z1j2cz26fns4p";
+ sha256 = "sha256-JiqjxT8ZGttrcJrcQmBoGPnRuuYWZ9u2083RxZoLMus=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 734b189d1e48..4215b20180e3 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -75,7 +75,6 @@ in stdenv.mkDerivation rec {
patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch;
configureFlags = [
- "--enable-gui=${guiSupport}"
"--with-features=${features}"
"--disable-xsmp" # XSMP session management
"--disable-xsmp_interact" # XSMP interaction
@@ -95,6 +94,7 @@ in stdenv.mkDerivation rec {
"--disable-carbon_check"
"--disable-gtktest"
]
+ ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}"
++ lib.optional stdenv.isDarwin
(if darwinSupport then "--enable-darwin" else "--disable-darwin")
++ lib.optionals luaSupport [
@@ -127,8 +127,22 @@ in stdenv.mkDerivation rec {
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook
;
- buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
- libXmu glib libICE ]
+ buildInputs = [
+ ncurses
+ glib
+ ]
+ # All X related dependencies
+ ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
+ libSM
+ libICE
+ libX11
+ libXext
+ libXpm
+ libXt
+ libXaw
+ libXau
+ libXmu
+ ]
++ lib.optional (guiSupport == "gtk2") gtk2-x11
++ lib.optional (guiSupport == "gtk3") gtk3-x11
++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 470683bad43f..370d5b1561ce 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem
-, unzip, libsecret, libXScrnSaver, wrapGAppsHook
+, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu
@@ -60,14 +60,12 @@ in
'';
};
- buildInputs = (if stdenv.isDarwin
- then [ unzip ]
- else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
- ++ [ libsecret libXScrnSaver ];
+ buildInputs = [ libsecret libXScrnSaver libxshmfence ]
+ ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages);
runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
- nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
+ nativeBuildInputs = [unzip] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook;
dontBuild = true;
dontConfigure = true;
diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh
index d1ae71cd11e2..68249c20d132 100755
--- a/pkgs/applications/editors/vscode/update-vscode.sh
+++ b/pkgs/applications/editors/vscode/update-vscode.sh
@@ -19,18 +19,18 @@ fi
VSCODE_VER=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases/latest | jq --raw-output .tag_name)
sed -i "s/version = \".*\"/version = \"${VSCODE_VER}\"/" "$ROOT/vscode.nix"
-VSCODE_LINUX_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-x64/stable"
+VSCODE_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-x64/stable"
VSCODE_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_URL})
sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" "$ROOT/vscode.nix"
-VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable"
+VSCODE_DARWIN_URL="https://update.code.visualstudio.com/${VSCODE_VER}/darwin/stable"
VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL})
sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix"
-VSCODE_LINUX_AARCH64_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-arm64/stable"
+VSCODE_LINUX_AARCH64_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-arm64/stable"
VSCODE_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_AARCH64_URL})
sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscode.nix"
-VSCODE_LINUX_ARMV7L_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-armhf/stable"
+VSCODE_LINUX_ARMV7L_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-armhf/stable"
VSCODE_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_ARMV7L_URL})
sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscode.nix"
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index ba03bb65c267..988bcf412ef8 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "1px6x99cv8nb8lcy3vgcicr4ar0bfj5rfnc5a1yw8rs5p1qnflgw";
- x86_64-darwin = "0grzivqb2fyvwh0fjh9vr205fjcsrd1iqhkwk3mgv792zfrb7ksf";
- aarch64-linux = "0p0msxgc13kqmpq7wk61igc1qbgmgg9463s44dp4ii3630iyr4lw";
- armv7l-linux = "147lki1wr5nzsg1mq12jmdjq9qr6vbdpmzbpr5nrvq23cak94ff8";
+ x86_64-linux = "0fpa3b807hy3wrb98h5s0p6ljya279bikv2qwq30nvr0f4zn48bk";
+ x86_64-darwin = "0bw7pdzn0a0zr7x8fpwck7v73dq5vh71ja00z11mhjrkjnvmmd9k";
+ aarch64-linux = "04wrqcmyamhwiwcyay1z0q0dvf6g7k3pcs93x7hahy16l65w7s2c";
+ armv7l-linux = "1hkc9i4z021jwjn275w790bppfvi63g0cnwvkssqdh1c94939rhv";
}.${system};
in
callPackage ./generic.nix rec {
@@ -25,7 +25,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.54.2";
+ version = "1.54.3";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
@@ -34,7 +34,7 @@ in
src = fetchurl {
name = "VSCode_${version}_${plat}.${archive_fmt}";
- url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable";
+ url = "https://update.code.visualstudio.com/${version}/${plat}/stable";
inherit sha256;
};
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index bdc5552a64f9..06613485e7f9 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "1b9pzfi034idhi6f3n0sz3fckf95ckf2qx3sgfn9fx2g52r9m9z1";
- x86_64-darwin = "1983d8hn04xl5vw7p6842cv5x08q7vilqg7nhvy5yg3lj9q2rpp0";
- aarch64-linux = "09l32abkq110ib4hjd0yv9avr8a2vg5vs7w4jpk0p499gzrysh2l";
- armv7l-linux = "1s0gbq1fapq2i905c0xxfyh0656qnb7dmg00khlwbplxzd6i6m18";
+ x86_64-linux = "1577wxmm8623aj513hxqcfim4d9p1r9wbla9my0c0c1x6pik0h8h";
+ x86_64-darwin = "1n8q626nlqw78wlpfppzj365gmlz2swll6csg3ic7p4ik3nak95b";
+ aarch64-linux = "1a7rkmhz456rsqw95lrknp1wqsdp63pkzh76vhzy5bazb1h081v0";
+ armv7l-linux = "1qjik1r41c8n9fs7p09p0zdj8c5xgqjniwv23hcy6mp28i4whclr";
}.${system};
sourceRoot = {
@@ -33,7 +33,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.53.2";
+ version = "1.54.3";
pname = "vscodium";
executableName = "codium";
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 81e81c88537d..21b4cfa94b13 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, mkDerivation
, fetchFromGitHub
+, fetchpatch
, substituteAll
, gdal
, cmake
@@ -19,7 +20,7 @@
mkDerivation rec {
pname = "OpenOrienteering-Mapper";
- version = "0.9.4";
+ version = "0.9.5";
buildInputs = [
gdal
@@ -38,14 +39,21 @@ mkDerivation rec {
owner = "OpenOrienteering";
repo = "mapper";
rev = "v${version}";
- sha256 = "13k9dirqm74lknhr8w121zr1hjd9gm1y73cj4rrj98rx44dzmk7b";
+ sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5";
};
- patches = (substituteAll {
- # See https://github.com/NixOS/nixpkgs/issues/86054
- src = ./fix-qttranslations-path.diff;
- inherit qttranslations;
- });
+ patches = [
+ # https://github.com/NixOS/nixpkgs/issues/86054
+ (substituteAll {
+ src = ./fix-qttranslations-path.diff;
+ inherit qttranslations;
+ })
+ # https://github.com/OpenOrienteering/mapper/pull/1907
+ (fetchpatch {
+ url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch";
+ sha256 = "1bkckapzccn6k0ri6bgrr0nhis9498fnwj7b32s2ysym8zcg0355";
+ })
+ ];
cmakeFlags = [
# Building the manual and bundling licenses fails
@@ -81,7 +89,8 @@ mkDerivation rec {
and provides a free alternative to the existing proprietary solution.
'';
homepage = "https://www.openorienteering.org/apps/mapper/";
- license = licenses.gpl3;
+ changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}";
+ license = licenses.gpl3Plus;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ mpickering sikmir ];
};
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 96c2e8066820..c67abe1a7438 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -32,11 +32,11 @@
mkDerivation rec {
pname = "saga";
- version = "7.8.2";
+ version = "7.9.0";
src = fetchurl {
url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
- sha256 = "1008l8f4733vsxy3y6d1yg8m4h8pp65d2p48ljc9kp5nyrg5vfy5";
+ sha256 = "sha256-ob23JbQnBxNO1QA8zUhLjgo5YBR90pwm8JT62bsPBdg=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix
index a6b4af7892d6..de96650167f0 100644
--- a/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
- version = "6.9.12-1";
+ version = "6.9.12-3";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick6";
rev = version;
- sha256 = "1s1zr0fqnm9jl1ni07if2klvf2lfg26dgxdbspksq5xdhsxxn841";
+ sha256 = "sha256-h9c0N9AcFVpNYpKl+95q1RVJWuacN4N4kbAJIKJp8Jc=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -81,6 +81,7 @@ stdenv.mkDerivation rec {
changelog = "https://legacy.imagemagick.org/script/changelog.php";
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ platforms.darwin;
+ maintainers = with maintainers; [ erictapen ];
license = licenses.asl20;
};
}
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 0a90b84892e9..0e4f182ea50f 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
comment = "The bridge between designers and developers";
};
- nativeBuildInputs = [makeWrapper wrapGAppsHook];
- buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme ];
+ nativeBuildInputs = [makeWrapper wrapGAppsHook unzip];
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
# src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder
diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
index 4b5974825543..a88209bfbd89 100644
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "batik";
- version = "1.13";
+ version = "1.14";
src = fetchurl {
url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz";
- sha256 = "16sq90nbs6psgm3xz30sbs6r5dnpd3qzsvr1xvnp4yipwjcmhmkw";
+ sha256 = "sha256-D06qgb5wdS5AahnznDnAGISPCZY/CPqJdGQFRwUsRhg=";
};
meta = with lib; {
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index d9de3eb7fc12..d07904c8597b 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages,
-libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
+libxml2, gettext, python2, libxml2Python, docbook5, docbook_xsl,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
gtk-mac-integration-gtk2 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
];
buildInputs =
- [ gtk2 libxml2 gettext python libxml2Python docbook5
+ [ gtk2 libxml2 gettext python2 libxml2Python docbook5
libxslt docbook_xsl libart_lgpl ]
++ lib.optional withGNOME libgnomeui
++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix
new file mode 100644
index 000000000000..6b8f465a1061
--- /dev/null
+++ b/pkgs/applications/graphics/eddy/default.nix
@@ -0,0 +1,47 @@
+{ python3Packages
+, fetchFromGitHub
+, lib
+, jre
+, qt5
+, wrapQtAppsHook
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "eddy";
+ version = "1.2.1";
+
+ src = fetchFromGitHub {
+ owner = "obdasystems";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "12j77bbva5py9bd57c80cmjvf8vll40h19n81h16lvv2r2r7jynh";
+ };
+
+ propagatedBuildInputs = [
+ qt5.qtbase
+ wrapQtAppsHook
+ python3Packages.setuptools
+ python3Packages.rfc3987
+ python3Packages.JPype1
+ python3Packages.pyqt5
+ ];
+
+ # Tests fail with: ImportError: cannot import name 'QtXmlPatterns' from 'PyQt5'
+ doCheck = false;
+
+ preBuild = ''
+ export HOME=/tmp
+ '';
+
+ preFixup = ''
+ wrapQtApp "$out/bin/eddy" --prefix JAVA_HOME : ${jre}
+ '';
+
+ meta = with lib; {
+ homepage = "http://www.obdasystems.com/eddy";
+ description = "Graphical editor for the specification and visualization of Graphol ontologies";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ koslambrou ];
+ };
+}
diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix
index 49e8fee513d7..04ac87c55da9 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.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "calo001";
repo = pname;
rev = version;
- sha256 = "sha256-eGHgZm9Q6JnY6OQNAyrFvRsuyuFnruMJNckOCCiO4Ug=";
+ sha256 = "sha256-EATZRmYSGUzWYaPqFT4mLTGGvwUp+Mn93yMF2JsPaYo=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 57d1f794d0f6..56994e172114 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,48 +1,114 @@
-{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
-xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook,
-opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
-gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi,
-spaceNavSupport ? true, libspnav, qtx11extras }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, ninja
+, GitPython
+, boost
+, coin3d
+, eigen
+, gfortran
+, gts
+, hdf5
+, libGLU
+, libXmu
+, libf2c
+, libspnav
+, matplotlib
+, medfile
+, mpi
+, ode
+, opencascade-occt
+, pivy
+, pkg-config
+, pycollada
+, pyside2
+, pyside2-tools
+, python
+, pyyaml
+, qtbase
+, qttools
+, qtwebengine
+, qtx11extras
+, qtxmlpatterns
+, scipy
+, shiboken2
+, soqt
+, spaceNavSupport ? true
+, swig
+, vtk
+, wrapQtAppsHook
+, xercesc
+, zlib
+}:
-let
- pythonPackages = python3Packages;
-in mkDerivation rec {
- pname = "freecad-unstable";
- version = "2020-12-08";
+mkDerivation rec {
+ pname = "freecad";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
- rev = "daea30341ea2d5eaf2bfb65614128a5fa2abc8b7";
- sha256 = "1fza64lygqq35v7kzgqmiq5dvl5rpgkhlzv06f9dszdz44hznina";
+ rev = version;
+ hash = "sha256-itIrO+/mKXOPNs+2POKT8u4YZuqx/QAwVBWrHgKP1qQ=";
};
nativeBuildInputs = [
cmake
ninja
pkg-config
- pythonPackages.pyside2-tools
+ pyside2-tools
wrapQtAppsHook
];
buildInputs = [
- coin3d xercesc ode eigen opencascade-occt gts
- zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
- libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns
- ] ++ (with pythonPackages; [
- matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
GitPython # for addon manager
- scipy pyyaml # (at least for) PyrateWorkbench
- ]) ++ lib.optionals spaceNavSupport [ libspnav qtx11extras ];
+ boost
+ coin3d
+ eigen
+ gfortran
+ gts
+ hdf5
+ libGLU
+ libXmu
+ libf2c
+ matplotlib
+ medfile
+ mpi
+ ode
+ opencascade-occt
+ pivy
+ pycollada
+ pyside2
+ pyside2-tools
+ python
+ pyyaml # (at least for) PyrateWorkbench
+ qtbase
+ qttools
+ qtwebengine
+ qtxmlpatterns
+ scipy
+ shiboken2
+ soqt
+ swig
+ vtk
+ xercesc
+ zlib
+ ] ++ lib.optionals spaceNavSupport [
+ libspnav
+ qtx11extras
+ ];
cmakeFlags = [
+ "-DBUILD_FLAT_MESH:BOOL=ON"
"-DBUILD_QT5=ON"
- "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"
+ "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
- ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include"
- + ";${pythonPackages.pyside2}/include/PySide2/QtCore"
- + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets"
- + ";${pythonPackages.pyside2}/include/PySide2/QtGui"
+ ("-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
+ + ";${pyside2}/include/PySide2/QtCore"
+ + ";${pyside2}/include/PySide2/QtWidgets"
+ + ";${pyside2}/include/PySide2/QtGui"
)
"-DPYSIDE_LIBRARY=PySide2::pyside2"
];
@@ -65,13 +131,31 @@ in mkDerivation rec {
postFixup = ''
mv $out/share/doc $out
+ ln -s $out/bin/FreeCAD $out/bin/freecad
+ ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
'';
meta = with lib; {
- description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
homepage = "https://www.freecadweb.org/";
+ description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
+ longDescription = ''
+ FreeCAD is an open-source parametric 3D modeler made primarily to design
+ real-life objects of any size. Parametric modeling allows you to easily
+ modify your design by going back into your model history and changing its
+ parameters.
+
+ FreeCAD allows you to sketch geometry constrained 2D shapes and use them
+ as a base to build other objects. It contains many components to adjust
+ dimensions or extract design details from 3D models to create high quality
+ production ready drawings.
+
+ FreeCAD is designed to fit a wide range of uses including product design,
+ mechanical engineering and architecture. Whether you are a hobbyist, a
+ programmer, an experienced CAD user, a student or a teacher, you will feel
+ right at home with FreeCAD.
+ '';
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ viric gebner ];
+ maintainers = with maintainers; [ viric gebner AndersonTorres ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 62f1a3627716..2491d8d3a8ab 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
+, fetchpatch
, substituteAll
, autoreconfHook
, pkg-config
@@ -72,6 +73,12 @@ in stdenv.mkDerivation rec {
# Use absolute paths instead of relying on PATH
# to make sure plug-ins are loaded by the correct interpreter.
./hardcode-plugin-interpreters.patch
+
+ # Fix crash without dot.
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04.patch";
+ sha256 = "POuvBhOSStO7hBGp4HgNx5F9pElFRoqN3W+i3u4zOnk=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index f5b8b8062155..365dbb66b653 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -8,16 +8,16 @@
, pythonPackages
}:
-pythonPackages.buildPythonPackage {
+pythonPackages.buildPythonPackage rec {
pname = "hydrus";
- version = "426";
+ version = "431";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
- rev = "1acdc258e5bb2ae22f5eafaf3dac8d9265dba5e2";
- sha256 = "1snihd433hx36s6d5hsnq4qg0xs6ag4822lwm5fqak64n22ad2qb";
+ rev = "v${version}";
+ sha256 = "0mfql27n725k6ynvhkgzmxxpfbjlzil2fjpy082gz257kb0880zy";
};
nativeBuildInputs = [
@@ -44,6 +44,7 @@ pythonPackages.buildPythonPackage {
matplotlib
qtpy
pyside2
+ mpv
];
checkInputs = with pythonPackages; [ nose httmock ];
diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix
index 312316b33974..65d3c9735dfd 100644
--- a/pkgs/applications/graphics/imagej/default.nix
+++ b/pkgs/applications/graphics/imagej/default.nix
@@ -15,8 +15,7 @@ let
url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";
sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
inherit jre;
# JAR files that are intended to be used by other packages
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 39a287900a9a..9c16e23ebb59 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -1,31 +1,53 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, fetchurl
+, qmake
+, qttools
+, zlib
+}:
+
/*
To use aditional parts libraries
set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
*/
-{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }:
+let
+ parts = fetchurl {
+ url = "https://web.archive.org/web/20190715142541/https://www.ldraw.org/library/updates/complete.zip";
+ sha256 = "sha256-PW3XCbFwRaNkx4EgCnl2rXH7QgmpNgjTi17kZ5bladA=";
+ };
-stdenv.mkDerivation rec {
+in
+mkDerivation rec {
pname = "leocad";
- version = "19.07.1";
+ version = "21.03";
src = fetchFromGitHub {
owner = "leozide";
repo = "leocad";
rev = "v${version}";
- sha256 = "02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2";
+ sha256 = "sha256-69Ocfk5dBXwcRqAZWEP9Xg41o/tAQo76dIOk9oYhCUE=";
};
- nativeBuildInputs = [ qmake4Hook ];
- buildInputs = [ qt4 zlib ];
- postPatch = ''
- export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
- '';
+ nativeBuildInputs = [ qmake qttools ];
+
+ buildInputs = [ zlib ];
+
+ qmakeFlags = [
+ "INSTALL_PREFIX=${placeholder "out"}"
+ "DISABLE_UPDATE_CHECK=1"
+ ];
+
+ qtWrapperArgs = [
+ "--set-default LEOCAD_LIB ${parts}"
+ ];
meta = with lib; {
description = "CAD program for creating virtual LEGO models";
homepage = "https://www.leocad.org/";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix
index 18fe87b128de..e839650af9a7 100644
--- a/pkgs/applications/graphics/lightburn/default.nix
+++ b/pkgs/applications/graphics/lightburn/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
- version = "0.9.20";
+ version = "0.9.21";
nativeBuildInputs = [
p7zip
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
- sha256 = "sha256-FtkBIoz5u70DbZZBH4uSaAkmOphWA9H0uYuukIPVGUM=";
+ sha256 = "sha256-Tnv+vfKOdDWIU36T9ZqwdTwuMd2AOGyKBY0IkPfrZlc=";
};
buildInputs = [
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 67b64ee575c0..8633494a4ca4 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -1,7 +1,6 @@
{ mkDerivation
, lib
, fetchFromGitHub
-, fetchpatch
, libGLU
, qtbase
, qtscript
@@ -19,13 +18,13 @@
mkDerivation rec {
pname = "meshlab";
- version = "2020.07";
+ version = "2020.12";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "meshlab";
rev = "Meshlab-${version}";
- sha256 = "0vj849b57zk3k6lx35zzcjhr9gdy4hxqnnkb8chwy7hw262cm3ri";
+ sha256 = "QrnqXEVqI1ADUYWalZ0h/0+xS+gDZTinm0weT39onw0=";
fetchSubmodules = true; # for vcglib
};
@@ -46,17 +45,11 @@ mkDerivation rec {
nativeBuildInputs = [ cmake ];
- patches = [
- # Make cmake use the system qhull. The next meshlab will not need this patch because it is already in master.
- (fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/cnr-isti-vclab/meshlab/pull/747.patch";
- sha256 = "0wx9f6zn458xz3lsqcgvsbwh1pgi3g0lah93nlbsb0sagng7n565";
- })
- ];
-
preConfigure = ''
- substituteAll ${./meshlab.desktop} install/linux/resources/meshlab.desktop
- cd src
+ substituteAll ${./meshlab.desktop} scripts/Linux/resources/meshlab.desktop
+ cmakeDir=$PWD/src
+ mkdir ../build
+ cd ../build
'';
cmakeFlags = [
@@ -75,19 +68,12 @@ mkDerivation rec {
postFixup = ''
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
- patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlabserver-wrapped
'';
- # Meshlab is not format-security clean; without disabling hardening, we get:
- # src/common/GLLogStream.h:61:37: error: format not a string literal and no format arguments [-Werror=format-security]
- # 61 | int chars_written = snprintf(buf, buf_size, f, std::forward(ts)...);
- # |
- hardeningDisable = [ "format" ];
-
meta = {
description = "A system for processing and editing 3D triangular meshes";
homepage = "https://www.meshlab.net/";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux;
};
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix
index f5595da47adf..5982e4abe0f7 100644
--- a/pkgs/applications/graphics/openimageio/2.x.nix
+++ b/pkgs/applications/graphics/openimageio/2.x.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
-, fetchpatch
, boost
, cmake
, ilmbase
@@ -11,26 +10,20 @@
, openexr
, robin-map
, unzip
+, fmt
}:
stdenv.mkDerivation rec {
pname = "openimageio";
- version = "2.1.9.0";
+ version = "2.2.12.0";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
- sha256 = "1bbxx3bcc5jlb90ffxbk29gb8227097rdr8vg97vj9axw2mjd5si";
+ sha256 = "16z8lnsqhljbfaarfwx9rc95p0a9wxf4p271j6kxdfknjb88p56i";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/OpenImageIO/oiio/pull/2441/commits/e9bdd69596103edf41b659ad8ab0ca4ce002f6f5.patch";
- sha256 = "0x1wmjf1jrm19d1izhs1cs3y1if9al1zx48lahkfswyjag3r5dn0";
- })
- ];
-
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [
@@ -47,6 +40,7 @@ stdenv.mkDerivation rec {
opencolorio
openexr
robin-map
+ fmt
];
cmakeFlags = [
diff --git a/pkgs/applications/graphics/openimageio/2539_backport.patch b/pkgs/applications/graphics/openimageio/2539_backport.patch
new file mode 100644
index 000000000000..c484b2ef9cf9
--- /dev/null
+++ b/pkgs/applications/graphics/openimageio/2539_backport.patch
@@ -0,0 +1,31 @@
+diff --git a/src/libOpenImageIO/exif.cpp b/src/libOpenImageIO/exif.cpp
+index 10b75c21..0287d9c5 100644
+--- a/src/libOpenImageIO/exif.cpp
++++ b/src/libOpenImageIO/exif.cpp
+@@ -213,6 +213,9 @@ static const EXIF_tag_info exif_tag_table[] = {
+
+
+
++// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define
++// them ourselves.
++#ifndef GPSTAG_VERSIONID
+ enum GPSTag {
+ GPSTAG_VERSIONID = 0,
+ GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2,
+@@ -237,6 +240,7 @@ enum GPSTag {
+ GPSTAG_DIFFERENTIAL = 30,
+ GPSTAG_HPOSITIONINGERROR = 31
+ };
++#endif
+
+ static const EXIF_tag_info gps_tag_table[] = {
+ { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 },
+@@ -270,7 +274,7 @@ static const EXIF_tag_info gps_tag_table[] = {
+ { GPSTAG_AREAINFORMATION, "GPS:AreaInformation", TIFF_UNDEFINED, 1 },
+ { GPSTAG_DATESTAMP, "GPS:DateStamp", TIFF_ASCII, 0 },
+ { GPSTAG_DIFFERENTIAL, "GPS:Differential", TIFF_SHORT, 1 },
+- { GPSTAG_HPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 },
++ { GPSTAG_GPSHPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 },
+ { -1, NULL } // signal end of table
+ };
+
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index 8bd82c783932..2461fcc27657 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
"dist_dir="
];
+ patches = [
+ # Backported from https://github.com/OpenImageIO/oiio/pull/2539 for 1.8.17
+ ./2539_backport.patch
+ ];
+
meta = with lib; {
homepage = "http://www.openimageio.org";
description = "A library and tools for reading and writing images";
diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix
index 303f5170d8e6..b0719631c096 100644
--- a/pkgs/applications/graphics/photoflare/default.nix
+++ b/pkgs/applications/graphics/photoflare/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "photoflare";
- version = "1.6.6";
+ version = "1.6.7";
src = fetchFromGitHub {
owner = "PhotoFlare";
repo = "photoflare";
rev = "v${version}";
- sha256 = "07lrlxagv1bljj607s8m0zsbzx9jrvi18bnxahnm7r4i5car5x2d";
+ sha256 = "sha256-Gx3YP29NrNHp0p05a1O4Xb9kqkA6pQLTJZ3/wOx+BWY=";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index f444ebfe5be3..9fd629ca8e9c 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -81,7 +81,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "Photo and video importer for cameras, phones, and memory cards";
homepage = "https://www.damonlynch.net/rapid/";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ jfrankenau ];
};
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index c51794881e94..626610728ae6 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.11";
+ version = "1.12";
pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
- sha256 = "01r4fq03fpyhwvn47wx3dw29vcadcd0qml00h36q38cq3pi9x42j";
+ sha256 = "4k0WsTsz4WwPZC8Dj85l2ntJOZkLgmBBOJcX9Bb4U7I=";
};
buildInputs = [
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index ad2681d25fe5..821a97e35871 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -1,10 +1,107 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, lib, fetchurl, runtimeShell
+, gettext, pkg-config, python3
+, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
+, curl, systemd, libxml2, poppler
-callPackage ./generic.nix (args // rec {
- version = "1.0.30";
+# List of { src name backend } attibute sets - see installFirmware below:
+, extraFirmware ? []
+
+# For backwards compatibility with older setups; use extraFirmware instead:
+, gt68xxFirmware ? null, snapscanFirmware ? null
+}:
+
+stdenv.mkDerivation {
+ pname = "sane-backends";
+ version = "1.0.32";
src = fetchurl {
- url = "https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-${version}.tar.gz";
- sha256 = "18vryaycps3zpjzxh0wjgg8nv2f4pdvcfxxmdfj28qbzqjlrcp9z";
+ # raw checkouts of the repo do not work because, the configure script is
+ # only functional in manually uploaded release tarballs.
+ # https://gitlab.com/sane-project/backends/-/issues/440
+ # unfortunately this make the url unpredictable on update, to find the link
+ # go to https://gitlab.com/sane-project/backends/-/releases and choose
+ # the link with other in the URL.
+ url = "https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz";
+ sha256 = "055iicihxa6b28iv5fnz13n67frdr5nrydq2c846f9x7q0vw4a1s";
};
-})
+
+ outputs = [ "out" "doc" "man" ];
+
+ nativeBuildInputs = [
+ gettext
+ pkg-config
+ python3
+ ];
+
+ buildInputs = [
+ avahi
+ libgphoto2
+ libieee1284
+ libjpeg
+ libpng
+ libtiff
+ libusb1
+ libv4l
+ net-snmp
+ curl
+ systemd
+ libxml2
+ poppler
+ ];
+
+ enableParallelBuilding = true;
+
+ configureFlags =
+ lib.optional (avahi != null) "--with-avahi"
+ ++ lib.optional (libusb1 != null) "--with-usb"
+ ;
+
+ postInstall = let
+
+ compatFirmware = extraFirmware
+ ++ lib.optional (gt68xxFirmware != null) {
+ src = gt68xxFirmware.fw;
+ inherit (gt68xxFirmware) name;
+ backend = "gt68xx";
+ }
+ ++ lib.optional (snapscanFirmware != null) {
+ src = snapscanFirmware;
+ name = "your-firmwarefile.bin";
+ backend = "snapscan";
+ };
+
+ installFirmware = f: ''
+ mkdir -p $out/share/sane/${f.backend}
+ ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name}
+ '';
+
+ in ''
+ mkdir -p $out/etc/udev/rules.d/
+ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
+ cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
+ # the created 49-libsane references /bin/sh
+ substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
+ --replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}"
+
+ substituteInPlace $out/lib/libsane.la \
+ --replace "-ljpeg" "-L${lib.getLib libjpeg}/lib -ljpeg"
+
+ # net.conf conflicts with the file generated by the nixos module
+ rm $out/etc/sane.d/net.conf
+ '' + lib.concatStrings (builtins.map installFirmware compatFirmware);
+
+ meta = with lib; {
+ description = "SANE (Scanner Access Now Easy) backends";
+ longDescription = ''
+ Collection of open-source SANE backends (device drivers).
+ SANE is a universal scanner interface providing standardized access to
+ any raster image scanner hardware: flatbed scanners, hand-held scanners,
+ video- and still-cameras, frame-grabbers, etc. For a list of supported
+ scanners, see http://www.sane-project.org/sane-backends.html.
+ '';
+ homepage = "http://www.sane-project.org/";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ peti ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
deleted file mode 100644
index 88d47b58932a..000000000000
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ lib, stdenv
-, gettext, pkg-config
-, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
-
-# List of { src name backend } attibute sets - see installFirmware below:
-, extraFirmware ? []
-
-# For backwards compatibility with older setups; use extraFirmware instead:
-, gt68xxFirmware ? null, snapscanFirmware ? null
-
-# Passed from versioned package (e.g. default.nix, git.nix):
-, version, src, ...
-}:
-
-stdenv.mkDerivation {
- inherit src version;
-
- name = "sane-backends-${version}";
-
- outputs = [ "out" "doc" "man" ];
-
- nativeBuildInputs = [
- gettext
- pkg-config
- ];
-
- buildInputs = [
- avahi
- libgphoto2
- libieee1284
- libjpeg
- libpng
- libtiff
- libusb1
- libv4l
- net-snmp
- ];
-
- enableParallelBuilding = true;
-
- configureFlags = []
- ++ lib.optional (avahi != null) "--enable-avahi"
- ++ lib.optional (libusb1 != null) "--with-usb"
- ;
-
- postInstall = let
-
- compatFirmware = extraFirmware
- ++ lib.optional (gt68xxFirmware != null) {
- src = gt68xxFirmware.fw;
- inherit (gt68xxFirmware) name;
- backend = "gt68xx";
- }
- ++ lib.optional (snapscanFirmware != null) {
- src = snapscanFirmware;
- name = "your-firmwarefile.bin";
- backend = "snapscan";
- };
-
- installFirmware = f: ''
- mkdir -p $out/share/sane/${f.backend}
- ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name}
- '';
-
- in ''
- mkdir -p $out/etc/udev/rules.d/
- ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
- cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
- # the created 49-libsane references /bin/sh
- substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
- --replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}"
-
- substituteInPlace $out/lib/libsane.la \
- --replace "-ljpeg" "-L${libjpeg.out}/lib -ljpeg"
-
- # net.conf conflicts with the file generated by the nixos module
- rm -f $out/etc/sane.d/net.conf
- '' + lib.concatStrings (builtins.map installFirmware compatFirmware);
-
- meta = with lib; {
- description = "SANE (Scanner Access Now Easy) backends";
- longDescription = ''
- Collection of open-source SANE backends (device drivers).
- SANE is a universal scanner interface providing standardized access to
- any raster image scanner hardware: flatbed scanners, hand-held scanners,
- video- and still-cameras, frame-grabbers, etc. For a list of supported
- scanners, see http://www.sane-project.org/sane-backends.html.
- '';
- homepage = "http://www.sane-project.org/";
- license = licenses.gpl2Plus;
-
- maintainers = with maintainers; [ peti ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
deleted file mode 100644
index 2edd739068d9..000000000000
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // {
- version = "2017-12-01";
- src = fetchgit {
- sha256 = "0qf7d7268kdxnb723c03m6icxhbgx0vw8gqvck2q1w5b948dy9g8";
- rev = "e895ee55bec8a3320a0e972b32c05d35b47fe226";
- url = "https://gitlab.com/sane-project/backends.git";
- };
-})
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix
index c47c41a1cdc7..b5fc70494fcd 100644
--- a/pkgs/applications/graphics/zgrviewer/default.nix
+++ b/pkgs/applications/graphics/zgrviewer/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip";
sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23";
};
- buildInputs = [jre unzip];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [jre];
buildPhase = "";
installPhase = ''
mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm}
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index d659c551bd68..861cd5f83561 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.1/src -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.2/src -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index f78d29db6bc9..c1def1bd613b 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -4,1795 +4,1795 @@
{
akonadi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-20.12.1.tar.xz";
- sha256 = "1173365c84fq5vn58blsmbdp9x34gf2yrwvsi89i0l7xhpz8zx5k";
- name = "akonadi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-20.12.2.tar.xz";
+ sha256 = "0659vgj8y77i0axdwwajaw6kxfa48j6s56nl6xhnv8686ss8plkw";
+ name = "akonadi-20.12.2.tar.xz";
};
};
akonadi-calendar = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-20.12.1.tar.xz";
- sha256 = "0zzy4f03zypj4crjy0fhk5xjgipflal3gpfibav2wcmgx034znw5";
- name = "akonadi-calendar-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-20.12.2.tar.xz";
+ sha256 = "0vzv4yycb2nnz5ifsydv0k080wgnhjzim6lfd6qrh38mgxpb2hzw";
+ name = "akonadi-calendar-20.12.2.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-tools-20.12.1.tar.xz";
- sha256 = "1x5zmv32iaf17n9b8y034yhwq0dhwjwxw3i5cj97k4dpyar5s72q";
- name = "akonadi-calendar-tools-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-tools-20.12.2.tar.xz";
+ sha256 = "06bzha5h14x6m4xzbbz2h3s00v4pc2a8d716dav9bqi0pvvq3cj0";
+ name = "akonadi-calendar-tools-20.12.2.tar.xz";
};
};
akonadiconsole = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadiconsole-20.12.1.tar.xz";
- sha256 = "0rf7ckra0yjkwspmd4401lssiss2p8qrw9rd6j5gbw7kii05bcmz";
- name = "akonadiconsole-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadiconsole-20.12.2.tar.xz";
+ sha256 = "12fslhpxah99fzvg3a1g67n69mi4xvgz9ra787pdvzrs0lca9xa0";
+ name = "akonadiconsole-20.12.2.tar.xz";
};
};
akonadi-contacts = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-contacts-20.12.1.tar.xz";
- sha256 = "0gxcs8nn07y6ln5ymsbdhcm63zqxcq2ja2sxziim65bfg9g85arl";
- name = "akonadi-contacts-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-contacts-20.12.2.tar.xz";
+ sha256 = "05y1rpvq1shiqlgql56k052glsslawy742q4n2hs301xhg0izavz";
+ name = "akonadi-contacts-20.12.2.tar.xz";
};
};
akonadi-import-wizard = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-import-wizard-20.12.1.tar.xz";
- sha256 = "1wdhgvv2zblyhcxrvby7ic3449hdmcnn3hvcswgwrgbcy4bzz7zz";
- name = "akonadi-import-wizard-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-import-wizard-20.12.2.tar.xz";
+ sha256 = "1gqjr5k6kkxi77vq0f6mc5mr31qvjsiicj6sxwpbm0c34vydfzym";
+ name = "akonadi-import-wizard-20.12.2.tar.xz";
};
};
akonadi-mime = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-mime-20.12.1.tar.xz";
- sha256 = "1xsrc8572zlslabn47km58sr48wdb0pmfrh3jbn9227w9iwir3z5";
- name = "akonadi-mime-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-mime-20.12.2.tar.xz";
+ sha256 = "0zdgkny32zwa2r2yhi285f56jkj0ini6p3sv5hi7f43mi7r5m994";
+ name = "akonadi-mime-20.12.2.tar.xz";
};
};
akonadi-notes = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-notes-20.12.1.tar.xz";
- sha256 = "15d23wm0kymifcxcbip0hpnzwmzdjwxmcvqvmwgq00vy81j6k7wm";
- name = "akonadi-notes-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-notes-20.12.2.tar.xz";
+ sha256 = "0rbg2vwk0a1zbfw5cmz0jx3yzap7j6yi7c0igq1fgg3an7sw4j2v";
+ name = "akonadi-notes-20.12.2.tar.xz";
};
};
akonadi-search = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-search-20.12.1.tar.xz";
- sha256 = "065qp3nf8274fh0bna8hjs28p030wgfnr3gnp7b2791kzp25l488";
- name = "akonadi-search-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-search-20.12.2.tar.xz";
+ sha256 = "0m7l7f26gj018d5pipbgmmxiqky98avpypxbydrms6afdglvi5ja";
+ name = "akonadi-search-20.12.2.tar.xz";
};
};
akregator = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akregator-20.12.1.tar.xz";
- sha256 = "0xs5adbq9ra0ziccl1z0nsm6kvrf8vjwa8djd3nwc2csjw8wim5k";
- name = "akregator-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akregator-20.12.2.tar.xz";
+ sha256 = "11y2mmf2svbxvqb1bjwzrivkq8w508fwg7513bzl62pbjqa8g3gk";
+ name = "akregator-20.12.2.tar.xz";
};
};
analitza = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/analitza-20.12.1.tar.xz";
- sha256 = "1qnqqbrjpzndbffjwqlyfqmxxxz04fi3i2g8dx6y8q79z927fzkd";
- name = "analitza-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/analitza-20.12.2.tar.xz";
+ sha256 = "09qpqjyps9h8wc8dvbnj8iz2xc4naxjdicqxsbfwfly5wbf8xq6x";
+ name = "analitza-20.12.2.tar.xz";
};
};
ark = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ark-20.12.1.tar.xz";
- sha256 = "18zaaawwhlci23hkzjl535qsi8wdjc05hij3r76225jb1jb6cwrm";
- name = "ark-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ark-20.12.2.tar.xz";
+ sha256 = "1p8ylvk4g1x2mmfdprz911iivcvr4mciam427b6ygdrhqc7rbbqb";
+ name = "ark-20.12.2.tar.xz";
};
};
artikulate = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/artikulate-20.12.1.tar.xz";
- sha256 = "1cvpya408r521p9398mk0xn8pb6awqm74qcjy2r0ylx0l6bkv3ca";
- name = "artikulate-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/artikulate-20.12.2.tar.xz";
+ sha256 = "0s6vjhipb4i6bv9ff7nzm9gza8jghih9kf7f7ynq10109fk8gy6i";
+ name = "artikulate-20.12.2.tar.xz";
};
};
audiocd-kio = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/audiocd-kio-20.12.1.tar.xz";
- sha256 = "1rlr1w0cy3q31jsaqiv50frqcl3x5jq31pnrkmyhgy23mays8ly1";
- name = "audiocd-kio-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/audiocd-kio-20.12.2.tar.xz";
+ sha256 = "0kd7yxl571pwrijwn78pigdclwqpmd50b5cj4lna481q78f91zsa";
+ name = "audiocd-kio-20.12.2.tar.xz";
};
};
baloo-widgets = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/baloo-widgets-20.12.1.tar.xz";
- sha256 = "115y0cdlsdzx6c017gr8x6in9jxyw0sqyamakqgfyy5phn203yr3";
- name = "baloo-widgets-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/baloo-widgets-20.12.2.tar.xz";
+ sha256 = "0w9jrx2mz1kyn2az6jx4kympl6zd950waz4zj97cjrcq2dg5a85g";
+ name = "baloo-widgets-20.12.2.tar.xz";
};
};
blinken = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/blinken-20.12.1.tar.xz";
- sha256 = "05dbmh1lk1ag735yiv7vql6fx15lw9a3qihxflzhbfrgng7dsxks";
- name = "blinken-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/blinken-20.12.2.tar.xz";
+ sha256 = "0a0nkmbx1bkqjs7cf5qqm877wqvzdx9cxm9395jfxcycn5pyfps9";
+ name = "blinken-20.12.2.tar.xz";
};
};
bomber = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/bomber-20.12.1.tar.xz";
- sha256 = "07iy6b8hwklb5mgrf8sagmrza78p3yf7i4x7w9lb2z9v2x5qw22y";
- name = "bomber-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/bomber-20.12.2.tar.xz";
+ sha256 = "08lyj6rn9jhhwzpwh2c14v8jiwishi1wk19nm5wazy2iajbd88jv";
+ name = "bomber-20.12.2.tar.xz";
};
};
bovo = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/bovo-20.12.1.tar.xz";
- sha256 = "1wrw81xrayhjadvjfi0zdc0vw445f4zmd32n0rca78i68ls5qbxv";
- name = "bovo-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/bovo-20.12.2.tar.xz";
+ sha256 = "05xx11rqqsxm084hfxnx1wzmr2wdpny3w608h8g5vby2jgdj47b7";
+ name = "bovo-20.12.2.tar.xz";
};
};
calendarsupport = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/calendarsupport-20.12.1.tar.xz";
- sha256 = "1accj2vx6zvqp632i5c85q4rzpg54xlihzf1rs80sdb9lch8nwrp";
- name = "calendarsupport-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/calendarsupport-20.12.2.tar.xz";
+ sha256 = "0gz3p4az49430zwgmlqjcfzjlgnaf7cl1x0qaaxyl8il14ambrbd";
+ name = "calendarsupport-20.12.2.tar.xz";
};
};
cantor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/cantor-20.12.1.tar.xz";
- sha256 = "1qj6lmcgmqr110qw2r906b0kp73f9gzvm75ry1gdb77bza5g67x2";
- name = "cantor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/cantor-20.12.2.tar.xz";
+ sha256 = "1w513a06xshdw4fcn6wmliygpjsyvqcbmfjg2bdibpsnznmk4y4p";
+ name = "cantor-20.12.2.tar.xz";
};
};
cervisia = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/cervisia-20.12.1.tar.xz";
- sha256 = "0hnpysp01z5a3gmm2jr2m1y7a5hcfl32lhmnrm0rg589pdxb30xf";
- name = "cervisia-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/cervisia-20.12.2.tar.xz";
+ sha256 = "08m962r6wkvih1yfj22z3nyfx6r3ac9pcc7i7dxxdkfcxhqpprhb";
+ name = "cervisia-20.12.2.tar.xz";
};
};
dolphin = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/dolphin-20.12.1.tar.xz";
- sha256 = "0n2g8mqq28xrjy17jyja4siaf2ac2b8gppqc19wjxn981zs545mp";
- name = "dolphin-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/dolphin-20.12.2.tar.xz";
+ sha256 = "19mss2vs074xv5qc644y87f8v99mdndhhd7hclqgq6gckxcjzy2r";
+ name = "dolphin-20.12.2.tar.xz";
};
};
dolphin-plugins = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/dolphin-plugins-20.12.1.tar.xz";
- sha256 = "0kn79c3w6qx70d7f8kdavl5ifq1pmcs4dc88i0zma8hskgvcjvcj";
- name = "dolphin-plugins-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/dolphin-plugins-20.12.2.tar.xz";
+ sha256 = "0zjy429cqb6nspmiharvszjhpn662y23s9wbdqs04h2p6pi8raxn";
+ name = "dolphin-plugins-20.12.2.tar.xz";
};
};
dragon = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/dragon-20.12.1.tar.xz";
- sha256 = "0nj2cba4w7q4q1w7lv63s9zgqrvha5figp5w9apklqps4z1d2p0s";
- name = "dragon-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/dragon-20.12.2.tar.xz";
+ sha256 = "0yssqbfgm92bls5cfy0xcqnqfqx00ns2i6rlwdlx38kfh0r47cag";
+ name = "dragon-20.12.2.tar.xz";
};
};
elisa = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/elisa-20.12.1.tar.xz";
- sha256 = "1lmgxi7xdyzjyi15ighkp2ylc6riqzgjmnfjc7p6na88vl2h2diy";
- name = "elisa-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/elisa-20.12.2.tar.xz";
+ sha256 = "1sl55kynkwxaypdm6zjdk85yxxq9754xm6ybxm7qdafq691g9zjr";
+ name = "elisa-20.12.2.tar.xz";
};
};
eventviews = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/eventviews-20.12.1.tar.xz";
- sha256 = "10nq8gx1bybhjx5dnrx2x5gslg8nw3vazy22jz03slgspm0gsajc";
- name = "eventviews-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/eventviews-20.12.2.tar.xz";
+ sha256 = "1g4aqhh2b5s45m0qqp46wazcc7rzcp3mmds4q9x3isckqpijzp39";
+ name = "eventviews-20.12.2.tar.xz";
};
};
ffmpegthumbs = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ffmpegthumbs-20.12.1.tar.xz";
- sha256 = "17p9xqyfsaibhkfkhbx9mxjkdl5xdc3h91gsrkkwkqyfa5vs9c5g";
- name = "ffmpegthumbs-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ffmpegthumbs-20.12.2.tar.xz";
+ sha256 = "0iw1g7x31jkbmniawvjwy8wk573rv05idk08q1vavxa5vixxqsbg";
+ name = "ffmpegthumbs-20.12.2.tar.xz";
};
};
filelight = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/filelight-20.12.1.tar.xz";
- sha256 = "0k7ia3q1j520n3i1va7v4nhdfycxv54sis6vq62ihm53kb0jrj4i";
- name = "filelight-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/filelight-20.12.2.tar.xz";
+ sha256 = "0m38il0rz7zip9rxing4j5fppwyrjgv1d7n3vrp3x4wnmd08j46q";
+ name = "filelight-20.12.2.tar.xz";
};
};
granatier = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/granatier-20.12.1.tar.xz";
- sha256 = "0mhqjg0wznvf1dc7f9dmw6ccva84g09cds2jls37zzblqbfdnzw3";
- name = "granatier-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/granatier-20.12.2.tar.xz";
+ sha256 = "0gssfcqq1czh5l1dwi5lpj0f9bgv2jf0wma9i5j0aqrf9b086g7f";
+ name = "granatier-20.12.2.tar.xz";
};
};
grantlee-editor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/grantlee-editor-20.12.1.tar.xz";
- sha256 = "1684k6gpmvbbxjha5qkvfvas2lws0zm5v5s41z6yjxyshrbc29jh";
- name = "grantlee-editor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/grantlee-editor-20.12.2.tar.xz";
+ sha256 = "0fbb9zia4kjc7rw4s27vsy6isvkx56k50gn6y1cyfl0gqy70v4cw";
+ name = "grantlee-editor-20.12.2.tar.xz";
};
};
grantleetheme = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/grantleetheme-20.12.1.tar.xz";
- sha256 = "1w87pz09lb3n511w0qir70c317j4gqgc7iyw3cgs2pqzz9f19vcx";
- name = "grantleetheme-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/grantleetheme-20.12.2.tar.xz";
+ sha256 = "1cv23ias36mp4zm84fk21f3f7nx3jz7xpiyz0nvz6xcsiww77762";
+ name = "grantleetheme-20.12.2.tar.xz";
};
};
gwenview = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/gwenview-20.12.1.tar.xz";
- sha256 = "0xjipr1ib8r42xsd75ack2198q6gf3xxl1zc9ir2ihdk3sg6lsb1";
- name = "gwenview-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/gwenview-20.12.2.tar.xz";
+ sha256 = "0cr6jjnvin8jv6hnajxg6zlph5syg2zjrcwd784dlzv23hna9v5n";
+ name = "gwenview-20.12.2.tar.xz";
};
};
incidenceeditor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/incidenceeditor-20.12.1.tar.xz";
- sha256 = "1hdyy1sisavxjhwgpxh4ab4a3cvsvjj6hfa9w8kn8ypipd6nmqac";
- name = "incidenceeditor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/incidenceeditor-20.12.2.tar.xz";
+ sha256 = "1q48ydma2rcpn3dnf9p08mqfs481n5fhc9m5wl2cvm6as54sfmp8";
+ name = "incidenceeditor-20.12.2.tar.xz";
};
};
itinerary = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/itinerary-20.12.1.tar.xz";
- sha256 = "02mmbj32ankv06mlgdrfyppkfi1dkgy9ky22d6bnz3l1vyld76s9";
- name = "itinerary-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/itinerary-20.12.2.tar.xz";
+ sha256 = "1dkgsiqww9z6k0xbvn15w630jdhmxr1kkz5dcv1n9yl7bgj32s35";
+ name = "itinerary-20.12.2.tar.xz";
};
};
juk = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/juk-20.12.1.tar.xz";
- sha256 = "0rx4dmnk15xrf9knwsvjmf963xn59rlzwwsa6wrjjpi8r6br8x4r";
- name = "juk-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/juk-20.12.2.tar.xz";
+ sha256 = "1dc6n07hkd8as2q1i2l3jzqcijw3qd4ihx1205nzn7z256bby58n";
+ name = "juk-20.12.2.tar.xz";
};
};
k3b = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/k3b-20.12.1.tar.xz";
- sha256 = "02ybzn8gg82r7i7rg8swyza30zwsf3fassmp6hqffn15g4kc2lrp";
- name = "k3b-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/k3b-20.12.2.tar.xz";
+ sha256 = "0gqg8r2p6nksbdg4c8wqz57dj8d1cw7cmrgzc1l2pin4v3qdx94g";
+ name = "k3b-20.12.2.tar.xz";
};
};
kaccounts-integration = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-integration-20.12.1.tar.xz";
- sha256 = "01xy3ih2fw4xnf5jkadrbq1dzmvvvrslbq4afj9501vhzyfqgm92";
- name = "kaccounts-integration-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-integration-20.12.2.tar.xz";
+ sha256 = "15py7fp6sajvx0c7zi7zhfx16sqn8kkkvglkvcq0b9kglswpvkfj";
+ name = "kaccounts-integration-20.12.2.tar.xz";
};
};
kaccounts-providers = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-providers-20.12.1.tar.xz";
- sha256 = "1f3gr63jwm7b8nkpdmpkgvsrhrpaxf7wcl0gczhdli1v6svjv8vq";
- name = "kaccounts-providers-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-providers-20.12.2.tar.xz";
+ sha256 = "0205l3k3nzx6cnar90zrbgmabapyry4a991lqflkpxgdrkh0ajc0";
+ name = "kaccounts-providers-20.12.2.tar.xz";
};
};
kaddressbook = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kaddressbook-20.12.1.tar.xz";
- sha256 = "0j6mjj902h5zpipywp5xhbifrbgrb1lz1cg317md7ya4wc7z36fp";
- name = "kaddressbook-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kaddressbook-20.12.2.tar.xz";
+ sha256 = "0xqsl7fav1vqq4iqy2m02s92rnr28pi1ak3sv0ra7q1gb89rhi0y";
+ name = "kaddressbook-20.12.2.tar.xz";
};
};
kajongg = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kajongg-20.12.1.tar.xz";
- sha256 = "0v9sq5l6w3x78dpimdlbm36g9n4qy06xr0bzfzn2jf3bzgzrn2zk";
- name = "kajongg-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kajongg-20.12.2.tar.xz";
+ sha256 = "0vh6qb3d54nnxrxacq9fn7jq1hshhhnvw9ff0wgh214jlr0gnbqk";
+ name = "kajongg-20.12.2.tar.xz";
};
};
kalarm = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kalarm-20.12.1.tar.xz";
- sha256 = "0k4fxrzxb6vvpdqlln4g7iz1s34d9jkk415c44f1i34kl2mfsyq0";
- name = "kalarm-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kalarm-20.12.2.tar.xz";
+ sha256 = "1lpg1viwn868hw0dd8zs11iafkhzlr3cydfplnh4ss6visga50kb";
+ name = "kalarm-20.12.2.tar.xz";
};
};
kalarmcal = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kalarmcal-20.12.1.tar.xz";
- sha256 = "104fbq2mf20p67rs7x76h36qk8d0srkkll2pq39ln4hc7nhsrws5";
- name = "kalarmcal-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kalarmcal-20.12.2.tar.xz";
+ sha256 = "17lll9671318dxhxpnjaih31xz5b971gw6kmrgz2ljq5nz1l027b";
+ name = "kalarmcal-20.12.2.tar.xz";
};
};
kalgebra = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kalgebra-20.12.1.tar.xz";
- sha256 = "10y9zygpik418y5781xmy5xysvf3xa97sbzdbch8lrvxwprbmkzm";
- name = "kalgebra-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kalgebra-20.12.2.tar.xz";
+ sha256 = "0dwvm4b0wpkd3i79q3xs2v3majwa56hgq8r4vv071a8ci8fn27bz";
+ name = "kalgebra-20.12.2.tar.xz";
};
};
kalzium = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kalzium-20.12.1.tar.xz";
- sha256 = "1n1ar12zq2maa4dn5yq7m6l3m60n7c98c460mrd6rp7f73kadnsj";
- name = "kalzium-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kalzium-20.12.2.tar.xz";
+ sha256 = "0jdg0akxmylbvh80cz31cycrdqvyafsv9j7hfpdhrizdy7vvqywg";
+ name = "kalzium-20.12.2.tar.xz";
};
};
kamera = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kamera-20.12.1.tar.xz";
- sha256 = "1bj01d9h26ifq8nsa1bw49xfihmisnbk7p557zpqvixxayq6v8dq";
- name = "kamera-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kamera-20.12.2.tar.xz";
+ sha256 = "1licmi05g1qpfh88annqd89av77jsmhxnsidgkvf4ffczwd097l6";
+ name = "kamera-20.12.2.tar.xz";
};
};
kamoso = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kamoso-20.12.1.tar.xz";
- sha256 = "087m9lphj6s0xssaryyh91gh9v3ji5423rjd549dkd3vscgda4lb";
- name = "kamoso-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kamoso-20.12.2.tar.xz";
+ sha256 = "0ar19nlw2bxrbn4wky8ky3x5m70rf7fb0fviniblqcrggyymgmb9";
+ name = "kamoso-20.12.2.tar.xz";
};
};
kanagram = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kanagram-20.12.1.tar.xz";
- sha256 = "0bflybrm3kz1p1n6fksihvd8m0h0jj968b2wjz88663bs48jqf6q";
- name = "kanagram-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kanagram-20.12.2.tar.xz";
+ sha256 = "00p2mpprbq9zi1zzscb4d0fdj2knnfkjxclf3q982jz4laxyqalf";
+ name = "kanagram-20.12.2.tar.xz";
};
};
kapman = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kapman-20.12.1.tar.xz";
- sha256 = "1hs88q4h5l58fvr09vb5ns9pdj4k064ax5ccnj9yan4bn0s9b4f9";
- name = "kapman-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kapman-20.12.2.tar.xz";
+ sha256 = "1fs33p9g52k5nywpih7nns3mh0apfhnn174k9711vwnamr73ph6k";
+ name = "kapman-20.12.2.tar.xz";
};
};
kapptemplate = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kapptemplate-20.12.1.tar.xz";
- sha256 = "1a8fpwbvs2zmmak7zyv75z67ja31vx68s9lz9vldmiik9rrslyy6";
- name = "kapptemplate-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kapptemplate-20.12.2.tar.xz";
+ sha256 = "19rnxw0q8w890ns237vpaapipm3zjz7n0rn9yzxa5cqaf30l7jv5";
+ name = "kapptemplate-20.12.2.tar.xz";
};
};
kate = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kate-20.12.1.tar.xz";
- sha256 = "13m24b3fxb1d1k9rg2xfa7i28cjx68g9dbjrbd34acmpg01vp6vk";
- name = "kate-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kate-20.12.2.tar.xz";
+ sha256 = "1kdznizqh28parijpsi67jmb8mlx4gn7z4szlh5kjd1mv9rikvm7";
+ name = "kate-20.12.2.tar.xz";
};
};
katomic = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/katomic-20.12.1.tar.xz";
- sha256 = "15s5kwddd1m9g5lhpc61bj6yzxpwzcc8fm24yhslb8l44nk685id";
- name = "katomic-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/katomic-20.12.2.tar.xz";
+ sha256 = "1sxh6x09is33b3zdgj3d6zn9z19qc25v4hskffmw5xivnwz9vzfl";
+ name = "katomic-20.12.2.tar.xz";
};
};
kbackup = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kbackup-20.12.1.tar.xz";
- sha256 = "043dkgpdk56jmx0z8izlgj8r9j8h9rvjc3yalpqd5nrlgmj0smym";
- name = "kbackup-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kbackup-20.12.2.tar.xz";
+ sha256 = "138x20p27a0yx4n6xamc660nk0zzrap7zhkkwpy9ayh07rgh1222";
+ name = "kbackup-20.12.2.tar.xz";
};
};
kblackbox = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kblackbox-20.12.1.tar.xz";
- sha256 = "001yf4j14xzpabwg37yisls5na9rpxpgs45d4wdlqa90d50syzl7";
- name = "kblackbox-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kblackbox-20.12.2.tar.xz";
+ sha256 = "1c6by0hi9bzs6j1y0qxrvz6ahdxhzivnw9hg4jndmhgbsqqix4q5";
+ name = "kblackbox-20.12.2.tar.xz";
};
};
kblocks = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kblocks-20.12.1.tar.xz";
- sha256 = "029dxqg2d6c08r99ng16lc3b1dnnrj5bpz25zgv90aygzx31qq4s";
- name = "kblocks-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kblocks-20.12.2.tar.xz";
+ sha256 = "06slcac3hvdmb5lymyqb1z8mn3r756xz2ghwdqz1d2mn3n2jd0bw";
+ name = "kblocks-20.12.2.tar.xz";
};
};
kbounce = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kbounce-20.12.1.tar.xz";
- sha256 = "1vdc7xhbh0wpvk66sqs0xly0mmbpw922vg4kjjn21awamv4r52pm";
- name = "kbounce-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kbounce-20.12.2.tar.xz";
+ sha256 = "19xvvxmbwpwkwsm0mxjnh92m352lkshsjgi8yrax1hdblymr60v1";
+ name = "kbounce-20.12.2.tar.xz";
};
};
kbreakout = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kbreakout-20.12.1.tar.xz";
- sha256 = "11bx32lffagmyvxx2wss794fy3icz9k5yq4mjs2qxpf9pyvg6qgd";
- name = "kbreakout-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kbreakout-20.12.2.tar.xz";
+ sha256 = "1n1vrj08j1drc1apikhgwdbmb5daypgnkw6yxhqc3xi2a3wglkqz";
+ name = "kbreakout-20.12.2.tar.xz";
};
};
kbruch = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kbruch-20.12.1.tar.xz";
- sha256 = "06sbr6wrn4nh69hq96i5rgzbr9g0rc6c54h9g2zpnpff339lnsqi";
- name = "kbruch-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kbruch-20.12.2.tar.xz";
+ sha256 = "0hjwmzsdlpg8przlmpp0xsa19v7376bpjk5kwyajywhayzzw99xp";
+ name = "kbruch-20.12.2.tar.xz";
};
};
kcachegrind = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcachegrind-20.12.1.tar.xz";
- sha256 = "0v06y1mybda4rmvjrjxhmxp7bj0wp6v45xahn08j253d20k7qixi";
- name = "kcachegrind-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcachegrind-20.12.2.tar.xz";
+ sha256 = "0ich4hxfmq909zkn06p8pgxpf7sg9ndq51b533h2clbq3m9qwy2w";
+ name = "kcachegrind-20.12.2.tar.xz";
};
};
kcalc = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcalc-20.12.1.tar.xz";
- sha256 = "1p59i6k0kq4xgcfsgcsb9z3yrrzgk564fh0apwmbawrmg6pp78dw";
- name = "kcalc-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcalc-20.12.2.tar.xz";
+ sha256 = "0dv8519wnlfdp2d2ml2r5qx3gjh8g6im742vqqk7m1660ijgc8zx";
+ name = "kcalc-20.12.2.tar.xz";
};
};
kcalutils = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcalutils-20.12.1.tar.xz";
- sha256 = "0b7w9n8sf31qbpxiw998xd4dls46mxf2bvl4n937vgzisfwb5sxs";
- name = "kcalutils-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcalutils-20.12.2.tar.xz";
+ sha256 = "1k4cr1iq945zs6c35f3s1w8kfm3kh7aybmk5py3lsz0zmlab36hc";
+ name = "kcalutils-20.12.2.tar.xz";
};
};
kcharselect = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcharselect-20.12.1.tar.xz";
- sha256 = "1ss5zwp0zggk9phdccj7bcn8h49p9avzg8qm38c3wnwddgaw1pdb";
- name = "kcharselect-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcharselect-20.12.2.tar.xz";
+ sha256 = "0fqf6bw98l499a144xk7hslxm6zdlpa0lcq0bgwnfsd0fs03wlp3";
+ name = "kcharselect-20.12.2.tar.xz";
};
};
kcolorchooser = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcolorchooser-20.12.1.tar.xz";
- sha256 = "07qvwk8amvmgiwxrl6gbyf25ms666hradmg1vl8lf3hmfxx6j40z";
- name = "kcolorchooser-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcolorchooser-20.12.2.tar.xz";
+ sha256 = "08y4qzr43nikgzli14yzj7w8vqzl905f0rwx0ri5247259jna3rk";
+ name = "kcolorchooser-20.12.2.tar.xz";
};
};
kcron = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcron-20.12.1.tar.xz";
- sha256 = "01xabwaxhxgwk6kh44rz3fm20jis2f6g9mrska5s03gxk7n0p1dc";
- name = "kcron-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcron-20.12.2.tar.xz";
+ sha256 = "025a647zl125568l8vqnljir110jbnkxd4921a892ip7pnhp0v95";
+ name = "kcron-20.12.2.tar.xz";
};
};
kdebugsettings = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdebugsettings-20.12.1.tar.xz";
- sha256 = "1jlxp6v6yci4cff1mcz0w7dz0hfjig0wck9cc9maaw1a9swqc3r1";
- name = "kdebugsettings-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdebugsettings-20.12.2.tar.xz";
+ sha256 = "1dzdvscklgbcfjalcc1mfh3vgiai2dvbsz00b4c96r8jxpm7bvcn";
+ name = "kdebugsettings-20.12.2.tar.xz";
};
};
kdeconnect-kde = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdeconnect-kde-20.12.1.tar.xz";
- sha256 = "0q11319ydibn1jgch98r66gzh3n6nb67l7xgzg0crdalm3dvf5gw";
- name = "kdeconnect-kde-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdeconnect-kde-20.12.2.tar.xz";
+ sha256 = "0wcx1bn121b62pwdkf7k24sa03kgixvrbp5y5iy11im7kj5i3ji1";
+ name = "kdeconnect-kde-20.12.2.tar.xz";
};
};
kde-dev-scripts = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-scripts-20.12.1.tar.xz";
- sha256 = "0hlabgf75qmww1161nd4ggqccp6h9ibsfkzpxdqvgxr9f1f31zz5";
- name = "kde-dev-scripts-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-scripts-20.12.2.tar.xz";
+ sha256 = "03kqd01yhii2b6g4gsjg09vwmzv53vr5d7y3d4db13kgg0f1z352";
+ name = "kde-dev-scripts-20.12.2.tar.xz";
};
};
kde-dev-utils = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-utils-20.12.1.tar.xz";
- sha256 = "1bir6ifq5wlwgdna48s5c1al7hfq6vl9pi2yvbnzf0rz4ix1sw4r";
- name = "kde-dev-utils-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-utils-20.12.2.tar.xz";
+ sha256 = "105pp4yhgynn3gq0bi7q1vyy1qn8pcd0hgx17v674hf8afy4627r";
+ name = "kde-dev-utils-20.12.2.tar.xz";
};
};
kdeedu-data = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdeedu-data-20.12.1.tar.xz";
- sha256 = "1hzrwkb2333dkvp1n50p18gfci21klafibaknm4hdrk96b3s4fxp";
- name = "kdeedu-data-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdeedu-data-20.12.2.tar.xz";
+ sha256 = "04x8papz62m5kanrqpjddzijda761i4j8y4cmqpnxkg2jrwfqqls";
+ name = "kdeedu-data-20.12.2.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-mobipocket-20.12.1.tar.xz";
- sha256 = "1n3x4cf5ck0lfn70d9g0iiy4pddc0r49gwir71q5six5l4pz21hd";
- name = "kdegraphics-mobipocket-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-mobipocket-20.12.2.tar.xz";
+ sha256 = "02a4ivpvfziaa464l8c9ivydagcb912ld95isgvc5jl4g85lm166";
+ name = "kdegraphics-mobipocket-20.12.2.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-thumbnailers-20.12.1.tar.xz";
- sha256 = "0lrijvphyc6wbkb499zf0gjpmqrjgrx5li93kvpsil1ivfpflv7w";
- name = "kdegraphics-thumbnailers-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-thumbnailers-20.12.2.tar.xz";
+ sha256 = "1p47fvb6mdk23rx9jhm9x60sny9z6plgdjih5lzy9k3hvl0sl8zk";
+ name = "kdegraphics-thumbnailers-20.12.2.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdenetwork-filesharing-20.12.1.tar.xz";
- sha256 = "0axi5vdgqkjdcbq0x34b3lnh1497vk54p9aca9d2wfhkd55zjbcv";
- name = "kdenetwork-filesharing-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdenetwork-filesharing-20.12.2.tar.xz";
+ sha256 = "0y60az09hkhd1hvwa7h7c834dc0mfnd89f78v8m31il8g2xniziz";
+ name = "kdenetwork-filesharing-20.12.2.tar.xz";
};
};
kdenlive = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdenlive-20.12.1.tar.xz";
- sha256 = "0n543nswn0gxasc1445nqg35z5466a3ssivigxz4acqw66nj4vlv";
- name = "kdenlive-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdenlive-20.12.2.tar.xz";
+ sha256 = "0gh1cjhakdl7hx236rsxiv62mafd2vvvpg5ndwlp0zfpsx7kzjrz";
+ name = "kdenlive-20.12.2.tar.xz";
};
};
kdepim-addons = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdepim-addons-20.12.1.tar.xz";
- sha256 = "1dc5sl9ksk5i2sgs2vf41blb5cdpl8fv3vzmrrz9sl3r75pga5m0";
- name = "kdepim-addons-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdepim-addons-20.12.2.tar.xz";
+ sha256 = "0zj22ggn98sqz3nnvzffhbv2cq672j885f2p8qla6swhyw91cq8n";
+ name = "kdepim-addons-20.12.2.tar.xz";
};
};
kdepim-runtime = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdepim-runtime-20.12.1.tar.xz";
- sha256 = "1np7xbdhm2wczm04cmsr25a74421i28iln39myiybq01im2ahapq";
- name = "kdepim-runtime-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdepim-runtime-20.12.2.tar.xz";
+ sha256 = "0p5c4l4xixcvpzx7mri2jxa3nwk4824lp5sy93sspf2nlgdv3zsn";
+ name = "kdepim-runtime-20.12.2.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-kioslaves-20.12.1.tar.xz";
- sha256 = "18yy2s39sxfzi5lcky1jvlv7z77ygidhnfa4zhwas27yhcc6h0w4";
- name = "kdesdk-kioslaves-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-kioslaves-20.12.2.tar.xz";
+ sha256 = "1xgp3fi6nnygjw2p832ylmhsj70dm33c4rf3h79sc2dp7aihnapy";
+ name = "kdesdk-kioslaves-20.12.2.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-thumbnailers-20.12.1.tar.xz";
- sha256 = "1hgqd2d2a9iwaxvd4xd7sdj7pyf3p3v2xg6v9dyy9y39q2f1qs23";
- name = "kdesdk-thumbnailers-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-thumbnailers-20.12.2.tar.xz";
+ sha256 = "0jk2x2b8qwhfbf9hy8j0yslggn3zwp18q21ip299b4cpx1w72bgq";
+ name = "kdesdk-thumbnailers-20.12.2.tar.xz";
};
};
kdf = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdf-20.12.1.tar.xz";
- sha256 = "0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1";
- name = "kdf-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdf-20.12.2.tar.xz";
+ sha256 = "0fx9b5njsmvzznrgz2r9xz8yh977v865zvsih60hdrz6gaflg1rx";
+ name = "kdf-20.12.2.tar.xz";
};
};
kdialog = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdialog-20.12.1.tar.xz";
- sha256 = "13n6bc3aqi9v6i4p4vkwzjv4rsqinx45n028ls6ndlapayd750f4";
- name = "kdialog-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdialog-20.12.2.tar.xz";
+ sha256 = "1v2yflxpqg2h2jgxql1mnk8c1v1n4ljard5bgh1dw898r7b8g2xd";
+ name = "kdialog-20.12.2.tar.xz";
};
};
kdiamond = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdiamond-20.12.1.tar.xz";
- sha256 = "0iaq3cai1sn3vlym4zshfziviy9k4s7pm92c7bzwa9adfak6y9h4";
- name = "kdiamond-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdiamond-20.12.2.tar.xz";
+ sha256 = "17z1g2jxz26pqx5xjc5h7w5s2xy72p00ydnfhsv1bi1kfd79ry8k";
+ name = "kdiamond-20.12.2.tar.xz";
};
};
keditbookmarks = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/keditbookmarks-20.12.1.tar.xz";
- sha256 = "1a41zpl2wzqdmp13m915agcc2nlxndyamy5aqyn98y3s8k5n6d9p";
- name = "keditbookmarks-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/keditbookmarks-20.12.2.tar.xz";
+ sha256 = "0slma1vrm0cmr2v970ingbckqa3viw6jgfss0z7fpx4bilw65bd7";
+ name = "keditbookmarks-20.12.2.tar.xz";
};
};
kfind = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kfind-20.12.1.tar.xz";
- sha256 = "0rlxq4dl221ycxcybav7yf88wz23v07n5yzp7jgrd602lk5k8jdp";
- name = "kfind-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kfind-20.12.2.tar.xz";
+ sha256 = "0vfi5ipwncq7d4z1gbilw6kyyrn5d986wr3f2zhsyhpwmsh9ycnb";
+ name = "kfind-20.12.2.tar.xz";
};
};
kfloppy = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kfloppy-20.12.1.tar.xz";
- sha256 = "1wpcv2ipx0izg60rbgf8qwhys3bhw8i36qpsvh8bihkzij28xc84";
- name = "kfloppy-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kfloppy-20.12.2.tar.xz";
+ sha256 = "1sz6bgw54w8s4bdyyajy0zgxw5kcm45p0gizf7ghw33x5vxryg4g";
+ name = "kfloppy-20.12.2.tar.xz";
};
};
kfourinline = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kfourinline-20.12.1.tar.xz";
- sha256 = "1fv68smci1f59xzqzqj36qry2ibgr0ps731vhvafn210q8h2f5b5";
- name = "kfourinline-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kfourinline-20.12.2.tar.xz";
+ sha256 = "1ld2srgmriab70j08nvqbaswjp2miljwd8rbpy2dyvzfprmci3xk";
+ name = "kfourinline-20.12.2.tar.xz";
};
};
kgeography = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kgeography-20.12.1.tar.xz";
- sha256 = "13jsrfv17lzlwi9rg7i8q2sfl8n19k15qdbv1y5lggykvf8prp8h";
- name = "kgeography-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kgeography-20.12.2.tar.xz";
+ sha256 = "0v1355y3fwzq63hq0wz9rskzncnlfdybmqcx23pk57jazsmv6ndi";
+ name = "kgeography-20.12.2.tar.xz";
};
};
kget = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kget-20.12.1.tar.xz";
- sha256 = "03s8wpfrzl3j6whxbfbmbydghaghcnr8xbskf4wkyk9kvyk4bqha";
- name = "kget-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kget-20.12.2.tar.xz";
+ sha256 = "1xya4raai9jqqzb3kga3mrm7jznkaa0fr4sq8j28qd45bgx2385p";
+ name = "kget-20.12.2.tar.xz";
};
};
kgoldrunner = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kgoldrunner-20.12.1.tar.xz";
- sha256 = "0n96clxf0bmhm8hlyvd7q9w1zhjn5irvh2vrf9d79ng44zgygjvh";
- name = "kgoldrunner-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kgoldrunner-20.12.2.tar.xz";
+ sha256 = "1ai5hfhwlsiw6ywpmwg9q85hsn3ih44v7n3wj70fsrldh87cn9ps";
+ name = "kgoldrunner-20.12.2.tar.xz";
};
};
kgpg = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kgpg-20.12.1.tar.xz";
- sha256 = "05wwdbx90wg3rm6hcin1dykbrbzz82g01dxnkgh21zzab72wmx8a";
- name = "kgpg-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kgpg-20.12.2.tar.xz";
+ sha256 = "1szg6fmmnxi94s5r2gxn4mlsiqahharyh05bisy5w7cl9w9c70xg";
+ name = "kgpg-20.12.2.tar.xz";
};
};
khangman = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/khangman-20.12.1.tar.xz";
- sha256 = "0ljavjbh69qyp2323pqlkibzjkwgddmdjd35m0m5n4nwvnz3l5y7";
- name = "khangman-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/khangman-20.12.2.tar.xz";
+ sha256 = "1bhcdr2v6zgawn819vbqnvgrm52xymgjyr396qbx5mc0srz88bzk";
+ name = "khangman-20.12.2.tar.xz";
};
};
khelpcenter = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/khelpcenter-20.12.1.tar.xz";
- sha256 = "1cba8siq3g78xjap4mhfkgvk9n031qy81ir08fpwk6zp9fkkgqb6";
- name = "khelpcenter-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/khelpcenter-20.12.2.tar.xz";
+ sha256 = "1mxs0imw64av8dybh91xxy4mmdcikjkqv6apsw29pp3s29irxpdx";
+ name = "khelpcenter-20.12.2.tar.xz";
};
};
kidentitymanagement = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kidentitymanagement-20.12.1.tar.xz";
- sha256 = "1f8l8xbwy7qk5hadvknr45ihhg1j7zpqvpf5wxj3h6zg9fmadly9";
- name = "kidentitymanagement-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kidentitymanagement-20.12.2.tar.xz";
+ sha256 = "1vcpfcriinx0ywz3jz26810h2cqmlfvyyxd0mzh3jp7rl0kkasgj";
+ name = "kidentitymanagement-20.12.2.tar.xz";
};
};
kig = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kig-20.12.1.tar.xz";
- sha256 = "0ns4rhk822p7jjqy9wnhkbrbais4ih1viw405rl5r5xlqn9bvsiz";
- name = "kig-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kig-20.12.2.tar.xz";
+ sha256 = "08wvgykrhzf2j4qb0fz4irbyaxjp5ka7jmmjn8y27srz0x4zgkrz";
+ name = "kig-20.12.2.tar.xz";
};
};
kigo = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kigo-20.12.1.tar.xz";
- sha256 = "0lvcc423mw3gs6c5x4lrlny07q93pa8ivaqphq6y4771n5y5dqqa";
- name = "kigo-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kigo-20.12.2.tar.xz";
+ sha256 = "1a4hv5g2wdpvf56zrr0rna6hdvm2cy6sz1jlhj7hf1lcx3lgfj9g";
+ name = "kigo-20.12.2.tar.xz";
};
};
killbots = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/killbots-20.12.1.tar.xz";
- sha256 = "0cdlixd7rakcxa8f5pf3pmq86mlipg7yhygnii858165v0gwkpx3";
- name = "killbots-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/killbots-20.12.2.tar.xz";
+ sha256 = "01lmkflndqmrzyrabmh5jqrk2zywcn5s82aag3m0wdqbyrqc5pas";
+ name = "killbots-20.12.2.tar.xz";
};
};
kimagemapeditor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kimagemapeditor-20.12.1.tar.xz";
- sha256 = "0vj2w3bgkq020gdi5q1zh650ipf4zc0hvzx5fpjknx4hd8b52rf8";
- name = "kimagemapeditor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kimagemapeditor-20.12.2.tar.xz";
+ sha256 = "06awvhcjg8nd0wjcqqzccnlpci6cd35flvfs3k05czk70sgqzysq";
+ name = "kimagemapeditor-20.12.2.tar.xz";
};
};
kimap = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kimap-20.12.1.tar.xz";
- sha256 = "1x6lapmb3srw3pddi7rmlzjdsw54x94pkr6jyrncpfpqqsgb3l4v";
- name = "kimap-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kimap-20.12.2.tar.xz";
+ sha256 = "14kjgn6b1qnfr3zsr3r73wf15n47qqx9vw5z11yv161andrr105d";
+ name = "kimap-20.12.2.tar.xz";
};
};
kio-extras = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kio-extras-20.12.1.tar.xz";
- sha256 = "1ym07jzy4w21frf3j5aadxg8ny7bgrm5dbhrc3xdyyj2rwh3iygg";
- name = "kio-extras-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kio-extras-20.12.2.tar.xz";
+ sha256 = "1r2sw8i7lf0zyb5bvz4002vdi2bf9jv01735caiw9smxr1lgcz93";
+ name = "kio-extras-20.12.2.tar.xz";
};
};
kio-gdrive = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kio-gdrive-20.12.1.tar.xz";
- sha256 = "0axh8138rcfpa0a7s5w8zi8i6chz3z1q7560v497x6rd3d1z2zp0";
- name = "kio-gdrive-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kio-gdrive-20.12.2.tar.xz";
+ sha256 = "0rwwakhsn9bnmxxnr0620jyp00x7iqqsaz5nd2lmhyjkc4mqv2km";
+ name = "kio-gdrive-20.12.2.tar.xz";
};
};
kipi-plugins = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kipi-plugins-20.12.1.tar.xz";
- sha256 = "0pv5f6v37n75vrz4vaw755bjyyqk1mm9dla26k0jy3qr76g8bg9d";
- name = "kipi-plugins-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kipi-plugins-20.12.2.tar.xz";
+ sha256 = "120yi7kfqv74368c78s4gfg7fp2h32v1c3jic2lnsy5y3iad22l8";
+ name = "kipi-plugins-20.12.2.tar.xz";
};
};
kirigami-gallery = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kirigami-gallery-20.12.1.tar.xz";
- sha256 = "00f3alhlvlphcz81465nfrdvvabbzy5n1s06bvwzsvf290h5chbh";
- name = "kirigami-gallery-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kirigami-gallery-20.12.2.tar.xz";
+ sha256 = "039ddgrvw1l4jvc3yjs0c6fi8kss5ma8hs6cbs8xvw0cyi9604qw";
+ name = "kirigami-gallery-20.12.2.tar.xz";
};
};
kiriki = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kiriki-20.12.1.tar.xz";
- sha256 = "07qsmyf1ylgcwy704s8x9g1h4kalsipqz4z3bj1z5m5a2y9l8y8q";
- name = "kiriki-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kiriki-20.12.2.tar.xz";
+ sha256 = "0bslysqnnxkjfyxv8vkfmvwjhlw2zdlghbngg21k1ljvgr2jfx6j";
+ name = "kiriki-20.12.2.tar.xz";
};
};
kiten = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kiten-20.12.1.tar.xz";
- sha256 = "0dfz2wdscgn0f967lnhzpyb3iz1iw068x0l10542pm5dh32afs4m";
- name = "kiten-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kiten-20.12.2.tar.xz";
+ sha256 = "18p4g9cqn25s2zjygwvi9s81ma0b8rhfj9z0i2kd415b2sxalk3y";
+ name = "kiten-20.12.2.tar.xz";
};
};
kitinerary = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kitinerary-20.12.1.tar.xz";
- sha256 = "07zjd3ikbx6rw39ndy04aia8q35r75p5n52fijwnc4fkfc40xyxz";
- name = "kitinerary-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kitinerary-20.12.2.tar.xz";
+ sha256 = "0z9jyj9wlda44qdncjnp6cyp7dwk89dl9nj68j5birmn83ykaawp";
+ name = "kitinerary-20.12.2.tar.xz";
};
};
kjumpingcube = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kjumpingcube-20.12.1.tar.xz";
- sha256 = "0li9bq7j30fbdzg981i6jkpxgrv1z84bpig8m5mxfyfhs5c55j69";
- name = "kjumpingcube-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kjumpingcube-20.12.2.tar.xz";
+ sha256 = "04qry2b82yk2k4v1pj8pvqi27my42k5ssmc5rpzkh0vq8pzwgkjh";
+ name = "kjumpingcube-20.12.2.tar.xz";
};
};
kldap = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kldap-20.12.1.tar.xz";
- sha256 = "02w4hk9j1f1d81k0j8dzrj4hxwk2xwrf48305hzmm658wjvkv4k3";
- name = "kldap-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kldap-20.12.2.tar.xz";
+ sha256 = "1njgsxbqgz0grqagf695qv285x8slgnp4rg377jz1cnz597nzl6b";
+ name = "kldap-20.12.2.tar.xz";
};
};
kleopatra = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kleopatra-20.12.1.tar.xz";
- sha256 = "1g06mq8vl1jhkyrjfrgsbl44v7yq04m8xbb8dxlyhyv40dwlz7l6";
- name = "kleopatra-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kleopatra-20.12.2.tar.xz";
+ sha256 = "12ayl3gar9bi06v418sflr6fr5k86m8x2ls4laig1ymansbvnwlz";
+ name = "kleopatra-20.12.2.tar.xz";
};
};
klettres = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/klettres-20.12.1.tar.xz";
- sha256 = "0k66xdkyv6i1zgk9nvz9633pmxygv1bwm4nkbg3izlh4g23rn3kk";
- name = "klettres-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/klettres-20.12.2.tar.xz";
+ sha256 = "0ixykb36a7hgz89zxc8x7fp0di67vmalvpa9rivdff3lp7il87n3";
+ name = "klettres-20.12.2.tar.xz";
};
};
klickety = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/klickety-20.12.1.tar.xz";
- sha256 = "17ml80p02sndhac5q6lkf7bb1kz9snsia991fghhahcjvd1g2qn6";
- name = "klickety-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/klickety-20.12.2.tar.xz";
+ sha256 = "0dgv6bnz7aw95nxjqkhcanl06hpdx4g8qwkrvnfsiphjbldhfig7";
+ name = "klickety-20.12.2.tar.xz";
};
};
klines = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/klines-20.12.1.tar.xz";
- sha256 = "1ba71n90x0s8nf300p53libzfjd0j9r6m0fng636m1qjaz6z9a3c";
- name = "klines-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/klines-20.12.2.tar.xz";
+ sha256 = "14mrqfw7y5xcq237a6prfqy8pj34iz5mnfqs373p0jbvdqkc5843";
+ name = "klines-20.12.2.tar.xz";
};
};
kmag = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmag-20.12.1.tar.xz";
- sha256 = "0m4zy1ybk2p4wzdfrdf64n06ck39sn7s0nb82miizcpscaxqswhj";
- name = "kmag-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmag-20.12.2.tar.xz";
+ sha256 = "1vwn5n3c8kq3d3d7sssqpq8iz9g0af4xnvcvjqh4s7fcxmsr3ryv";
+ name = "kmag-20.12.2.tar.xz";
};
};
kmahjongg = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmahjongg-20.12.1.tar.xz";
- sha256 = "1hszrp81pffg7rp0rk54qx49v3acmqfdi0if47kh9w124iicsi3z";
- name = "kmahjongg-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmahjongg-20.12.2.tar.xz";
+ sha256 = "055nihkvfij6a71qn6lw3sbb74zz5r7cp2dghlkai9405ri4gdyc";
+ name = "kmahjongg-20.12.2.tar.xz";
};
};
kmail = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmail-20.12.1.tar.xz";
- sha256 = "128l57x29mqg3fcx50hviqydl7gw6n2zbjnmzrj7fzgl6gafcdgw";
- name = "kmail-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmail-20.12.2.tar.xz";
+ sha256 = "09idfdh04687jzh125jw2244ymaqhx6j3563m2cbf2spph0r1vqj";
+ name = "kmail-20.12.2.tar.xz";
};
};
kmail-account-wizard = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmail-account-wizard-20.12.1.tar.xz";
- sha256 = "1gl4pvn7lyyc9rsk70yp5mikpdbakp4zgwx3plypqhmqd1z92pin";
- name = "kmail-account-wizard-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmail-account-wizard-20.12.2.tar.xz";
+ sha256 = "0a9pz1m3jabi21nrlcj0fqrj1hsgmarw91sxx5qvs74fp2b59368";
+ name = "kmail-account-wizard-20.12.2.tar.xz";
};
};
kmailtransport = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmailtransport-20.12.1.tar.xz";
- sha256 = "08i4fmhkpxil7q6vn045xha54x00jkm19kibphx2q3sb3c6s3plm";
- name = "kmailtransport-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmailtransport-20.12.2.tar.xz";
+ sha256 = "11knn52fc5r637s1w3fzbkapjx6xs1n9v9933ji17zhry7c5rlzv";
+ name = "kmailtransport-20.12.2.tar.xz";
};
};
kmbox = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmbox-20.12.1.tar.xz";
- sha256 = "1w172gqanhpkmcd9hc62lsmrkylg8mlfyk3nq3n89k6m2dkcfvqd";
- name = "kmbox-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmbox-20.12.2.tar.xz";
+ sha256 = "0r76s03g4da2sds6y632gvg228gwsl7gs8ml9rf0fdjb8ymql1hl";
+ name = "kmbox-20.12.2.tar.xz";
};
};
kmime = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmime-20.12.1.tar.xz";
- sha256 = "0hr5mh8a4b9bi0dqs055x4mpig7awqy9sd6j0i8lxix4cngcb6a2";
- name = "kmime-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmime-20.12.2.tar.xz";
+ sha256 = "1jpfhsac2pji80cad0yab59lq7q7c1han0gajvwys1j15jyj11gi";
+ name = "kmime-20.12.2.tar.xz";
};
};
kmines = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmines-20.12.1.tar.xz";
- sha256 = "18jzzn03c6mlmc02qg5fimid77b8gs0h4lci6wmj11fmb94g1hic";
- name = "kmines-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmines-20.12.2.tar.xz";
+ sha256 = "0378cd1zh6w8slap4wry8m69l27nvi7j2dwz2vwkl76zh31q4pwi";
+ name = "kmines-20.12.2.tar.xz";
};
};
kmix = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmix-20.12.1.tar.xz";
- sha256 = "1q1jz33mwnr5nr2mw92g40g7paclaxhwcvqik91la6dnvl0vpi8p";
- name = "kmix-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmix-20.12.2.tar.xz";
+ sha256 = "12kij1y2lbyx71bg32pwb9s9p928pyw44flz9bv2jrzkkf4zwfxk";
+ name = "kmix-20.12.2.tar.xz";
};
};
kmousetool = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmousetool-20.12.1.tar.xz";
- sha256 = "1nahq9cgffcd4llqc8lwkicxjw8nwphvpws9xkalwsswb7ai9jrk";
- name = "kmousetool-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmousetool-20.12.2.tar.xz";
+ sha256 = "0ybrczxsmfrj43nr931ylbdgpqmcfx47ifbv2qjn72i8iggrv0cl";
+ name = "kmousetool-20.12.2.tar.xz";
};
};
kmouth = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmouth-20.12.1.tar.xz";
- sha256 = "0qhparw2qszv7z7lrzb76kyvkcgr9sgry9ir9965dd0sp4c1fhgc";
- name = "kmouth-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmouth-20.12.2.tar.xz";
+ sha256 = "1vq41r1vhr5iaxlb5dzpq3vwqk1rn1zxw3k4j7g2xq5xxmibj944";
+ name = "kmouth-20.12.2.tar.xz";
};
};
kmplot = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmplot-20.12.1.tar.xz";
- sha256 = "0iz61jjr7z0j5bh5nqdv9nbdbiz0jhda89bxjds0n9636q42rifm";
- name = "kmplot-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmplot-20.12.2.tar.xz";
+ sha256 = "0l6j68zg9xdrgglw7gnji0spjf7pcggym90cccw67jdn2wxc8g6q";
+ name = "kmplot-20.12.2.tar.xz";
};
};
knavalbattle = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/knavalbattle-20.12.1.tar.xz";
- sha256 = "0k7kqnc8zp3n0ckrmmih12x6h1vgn9s7hrgp7n37bns2g39ij0xn";
- name = "knavalbattle-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/knavalbattle-20.12.2.tar.xz";
+ sha256 = "0x47rzs7afqygcy45crc10ix4dsivnpmxis9r0w4lpzbq3qzd585";
+ name = "knavalbattle-20.12.2.tar.xz";
};
};
knetwalk = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/knetwalk-20.12.1.tar.xz";
- sha256 = "0px8yfi5h9nipgdjcgskrm66dr23yg5ks0kyxjsly6mv41qxjiw8";
- name = "knetwalk-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/knetwalk-20.12.2.tar.xz";
+ sha256 = "11h7b5amm4bcng0h8hfcn1r1nkd82h0rl47wvnqczsgjqp2r9h6a";
+ name = "knetwalk-20.12.2.tar.xz";
};
};
knights = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/knights-20.12.1.tar.xz";
- sha256 = "098ywblshbr3qx7b8m4qj0036dq3c3mackmsbjnr85acb0204bjb";
- name = "knights-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/knights-20.12.2.tar.xz";
+ sha256 = "1p5w61x4ldb5sp77l1c0v7aczi62xpvf1084316byhb5cqmxsqm9";
+ name = "knights-20.12.2.tar.xz";
};
};
knotes = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/knotes-20.12.1.tar.xz";
- sha256 = "11gfk2p240a2gqxgkn9ymf7ds2zpij8h2vbbkax6ariddmhmlqk0";
- name = "knotes-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/knotes-20.12.2.tar.xz";
+ sha256 = "11dvczl04lmzlhbmqp508bqrsrqqmmprp3nsvakmmidpgnvcm26l";
+ name = "knotes-20.12.2.tar.xz";
};
};
kolf = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kolf-20.12.1.tar.xz";
- sha256 = "12b424dl6rizj2pdcd4cr01lmp4kmirii79k40v22hn0yn6a9qdv";
- name = "kolf-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kolf-20.12.2.tar.xz";
+ sha256 = "1jw22m7a2jdw9zmssiihwm35zpq7bg8zk0a68fh5nxbyv43q8fj5";
+ name = "kolf-20.12.2.tar.xz";
};
};
kollision = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kollision-20.12.1.tar.xz";
- sha256 = "1hxv4qd5dl61d5440r4hnd9r24prn78ibmnk3m06c15zc3hfdsdn";
- name = "kollision-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kollision-20.12.2.tar.xz";
+ sha256 = "0g0mf9p1pz9wahc92k9iw1vb8v64y1kj7zgiyzmil6qr1pjyzlgm";
+ name = "kollision-20.12.2.tar.xz";
};
};
kolourpaint = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kolourpaint-20.12.1.tar.xz";
- sha256 = "1a2wgrf9hirvj61k2nd8x7rv5v8i9r1vrvpdmi9ik4qdg6lpvqay";
- name = "kolourpaint-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kolourpaint-20.12.2.tar.xz";
+ sha256 = "13pb09r9qrgwaii9x3a6qk3qgk288a821p4xgiwaiv9lcbjz56fn";
+ name = "kolourpaint-20.12.2.tar.xz";
};
};
kompare = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kompare-20.12.1.tar.xz";
- sha256 = "13di8dzp7xzlfacas5f92h1vwiqf64cd0rkc4yv4l2g8aq2jzcqh";
- name = "kompare-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kompare-20.12.2.tar.xz";
+ sha256 = "18n5sw52kwwmbgyb2q5lizpa57by8gmx665bj68wi2hvzdihmxmv";
+ name = "kompare-20.12.2.tar.xz";
};
};
konqueror = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/konqueror-20.12.1.tar.xz";
- sha256 = "026f8fybr8azq3diw2k3p3qpmqj9lk6n9ipcl3xkwdss7i5v5w3y";
- name = "konqueror-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/konqueror-20.12.2.tar.xz";
+ sha256 = "0zvr71yz2053y341b12zw92v0yk5whgivcr0iyz488lfw9wq0n4d";
+ name = "konqueror-20.12.2.tar.xz";
};
};
konquest = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/konquest-20.12.1.tar.xz";
- sha256 = "1s08mvj7z91r86i0zwkcv05fnnr4lzhp596qr38d2yv6rxf5vr57";
- name = "konquest-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/konquest-20.12.2.tar.xz";
+ sha256 = "0p4y7s37a3vchplpidlv4bc94gwnsm4k7sl4s2ra0prqga83yxbj";
+ name = "konquest-20.12.2.tar.xz";
};
};
konsole = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/konsole-20.12.1.tar.xz";
- sha256 = "1v39sx00c115apnm32wn00yir69z1h0y3lblmjmvbjk24hwvx45n";
- name = "konsole-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/konsole-20.12.2.tar.xz";
+ sha256 = "0wq8xbppg4fla8x669rvkz4mrpbpaplr0ysdvnc4djbwnzabs6zw";
+ name = "konsole-20.12.2.tar.xz";
};
};
kontact = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kontact-20.12.1.tar.xz";
- sha256 = "0dr59jj97zxkgc61zgwa8i26m81sfxvymxcrh5midwd24z8nslkz";
- name = "kontact-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kontact-20.12.2.tar.xz";
+ sha256 = "05pvrbsbrz39znim2jrcslnji8n4imig8f717jv89nlmllp5sk2i";
+ name = "kontact-20.12.2.tar.xz";
};
};
kontactinterface = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kontactinterface-20.12.1.tar.xz";
- sha256 = "0sdlgmwvir2s9ys466i4bj4raf2af43w838and64jwsr9qb1hg4j";
- name = "kontactinterface-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kontactinterface-20.12.2.tar.xz";
+ sha256 = "0i3kxim4rc4mvqlq06g0a8h106gb93v4s0kymysd4a4yw3pq4fas";
+ name = "kontactinterface-20.12.2.tar.xz";
};
};
kontrast = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kontrast-20.12.1.tar.xz";
- sha256 = "0cs31sn4va2hhfi7ps3bz9sy2hlxb8cawn5vijfdhzb9mmc962br";
- name = "kontrast-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kontrast-20.12.2.tar.xz";
+ sha256 = "0cqqclyqm0z59n296jh6pnb2zdzligmvsd2icb1qzxn2r69inipa";
+ name = "kontrast-20.12.2.tar.xz";
};
};
konversation = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/konversation-20.12.1.tar.xz";
- sha256 = "1x6pyiv73avc3qmxlbnwwzk3gz6qbr991p896f9yb4rqfqj8j7j4";
- name = "konversation-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/konversation-20.12.2.tar.xz";
+ sha256 = "0m13qpvzxm5arawsqh2hygs266jv9915lhc3xhs0b1wbhjb3ii8l";
+ name = "konversation-20.12.2.tar.xz";
};
};
kopete = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kopete-20.12.1.tar.xz";
- sha256 = "1cfbl3jalmaphwrzw443l4q5k1fx4nja65ajgrv3nly8rfabfnfl";
- name = "kopete-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kopete-20.12.2.tar.xz";
+ sha256 = "0ahcxkvi5ibdl3krm3aw5gamcyfi4s4af2wl6r3sk73l7q4kpxvi";
+ name = "kopete-20.12.2.tar.xz";
};
};
korganizer = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/korganizer-20.12.1.tar.xz";
- sha256 = "1ci6ca6w3a77gf3d7fh9rjkblm5qa2jic176rwmax79qgvjjq8wm";
- name = "korganizer-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/korganizer-20.12.2.tar.xz";
+ sha256 = "1f2j60gdx3hxz64lhx9cyi7sa75s2qr8zghhk8h1wgdwaz9hvjz8";
+ name = "korganizer-20.12.2.tar.xz";
};
};
kosmindoormap = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kosmindoormap-20.12.1.tar.xz";
- sha256 = "186kfqaznxyxqchwqsrb4dvk4v69rhqwfg93fcjsp43l14ml5rnx";
- name = "kosmindoormap-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kosmindoormap-20.12.2.tar.xz";
+ sha256 = "0rr6lgfbjdvnxipx0dnzp4hlrvq61ha015mz7qkly88ckwp6m05q";
+ name = "kosmindoormap-20.12.2.tar.xz";
};
};
kpat = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpat-20.12.1.tar.xz";
- sha256 = "1kd3i7qhjwxi04x8dkc7q9rgx73zyx3njm5rhq0hc1v32m8nn659";
- name = "kpat-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpat-20.12.2.tar.xz";
+ sha256 = "1gcv343aabwcgx3kb9khkvilnxipq200pz14d8qdj41lsa71cynx";
+ name = "kpat-20.12.2.tar.xz";
};
};
kpimtextedit = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpimtextedit-20.12.1.tar.xz";
- sha256 = "15m26qssw80nxv1m51jq3q629nginhh4hb69a5y15jgvrv4k59b4";
- name = "kpimtextedit-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpimtextedit-20.12.2.tar.xz";
+ sha256 = "1ccvzwbxbsbb4b5hfjvf30fv44b1byjzb08x4vagbrqb47ck763y";
+ name = "kpimtextedit-20.12.2.tar.xz";
};
};
kpkpass = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpkpass-20.12.1.tar.xz";
- sha256 = "09idbgf9gnzyr520indlzhwb9pr5hx3dag26qrfi7l8ywzdkrsr2";
- name = "kpkpass-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpkpass-20.12.2.tar.xz";
+ sha256 = "1m0cqlrpjmfam0lyjjzpd8wgsv9v0x6fr76qr5ndyrfbfcv0qin3";
+ name = "kpkpass-20.12.2.tar.xz";
};
};
kpmcore = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpmcore-20.12.1.tar.xz";
- sha256 = "0nyqz1jfr9h9n80npvp7yyizbyga6iv8yljq52myk6b40vs9q41v";
- name = "kpmcore-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpmcore-20.12.2.tar.xz";
+ sha256 = "1z8fln51jsgar69m2x8rb95zxbq6r28cycpa7y52gaiywahbsin4";
+ name = "kpmcore-20.12.2.tar.xz";
};
};
kpublictransport = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpublictransport-20.12.1.tar.xz";
- sha256 = "0saqykqb9rrm3ngvcx910dmhyh1hc3n0x3qfzlzrxlq678ag94hq";
- name = "kpublictransport-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpublictransport-20.12.2.tar.xz";
+ sha256 = "1n7gy9pnykxd39ralfxrrvbsgxn68f1jzvbmkyvj759xrl2na1kq";
+ name = "kpublictransport-20.12.2.tar.xz";
};
};
kqtquickcharts = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kqtquickcharts-20.12.1.tar.xz";
- sha256 = "0025vj4n0k3g5bsmjq6ydx80izvpx6g73jxz27hp69vbl8p4ylpc";
- name = "kqtquickcharts-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kqtquickcharts-20.12.2.tar.xz";
+ sha256 = "06lrvckmddyxl11kyic99dhfn8il88hs1vsnr89y3m8543ij885n";
+ name = "kqtquickcharts-20.12.2.tar.xz";
};
};
krdc = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/krdc-20.12.1.tar.xz";
- sha256 = "067xrhs55di2ff0lxvcl2x7qblmv2pbrgjkc5bjsx6ai6w9bv4dh";
- name = "krdc-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/krdc-20.12.2.tar.xz";
+ sha256 = "0wzv25pdalwgcb74dav4jkxpvak0nix46njn04w2vhy3rdlgplzr";
+ name = "krdc-20.12.2.tar.xz";
};
};
kreversi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kreversi-20.12.1.tar.xz";
- sha256 = "1yw9lxzqyxk6fsh2lzsrp2cmdw545hszdz9253lm6b5ppax6z42a";
- name = "kreversi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kreversi-20.12.2.tar.xz";
+ sha256 = "1c0xisbbq6p6ghl5rvhiddpgsa91m4bq8hmrpdw8s02j4g8aix39";
+ name = "kreversi-20.12.2.tar.xz";
};
};
krfb = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/krfb-20.12.1.tar.xz";
- sha256 = "0pfxd0nci9g4wkh4qcgk3yhm9rl9yx2d4jpfxgdmiacfp9hkqxj6";
- name = "krfb-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/krfb-20.12.2.tar.xz";
+ sha256 = "0js84sc9s8h7b1zkdg2k83qhh2q3dz5yfk17am480b3889pyjyd8";
+ name = "krfb-20.12.2.tar.xz";
};
};
kross-interpreters = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kross-interpreters-20.12.1.tar.xz";
- sha256 = "1csk3xkkkqvffms5ivy08hyd2mizg7ywcrdapxx40m5kwsn6vpxs";
- name = "kross-interpreters-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kross-interpreters-20.12.2.tar.xz";
+ sha256 = "04g8fqcr88k7b8sivkqasj8d5fywhmm69g4spv1rpm4m89gr70jn";
+ name = "kross-interpreters-20.12.2.tar.xz";
};
};
kruler = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kruler-20.12.1.tar.xz";
- sha256 = "1jiz9s647bndpi4gg3f7wwg0c0cv8wf1myjxwdpx5a0ggdr2xh3q";
- name = "kruler-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kruler-20.12.2.tar.xz";
+ sha256 = "0xayhfav4723m5z5bgv4zxa95zvsfgvfh0wf80y8c7wwfgsyn9ja";
+ name = "kruler-20.12.2.tar.xz";
};
};
kshisen = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kshisen-20.12.1.tar.xz";
- sha256 = "1awnpj66080g2y41014g2pgb5llyqw56b54z6ydhfya4a0a8gsds";
- name = "kshisen-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kshisen-20.12.2.tar.xz";
+ sha256 = "079sr9k8zg01imy2c54wx371fcxlzsm122ng0zl4cn69dndczjkf";
+ name = "kshisen-20.12.2.tar.xz";
};
};
ksirk = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksirk-20.12.1.tar.xz";
- sha256 = "11bcmxjjyf095i790f5r3cr5hskw2x9458vwfm7yd57qx3r01axz";
- name = "ksirk-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksirk-20.12.2.tar.xz";
+ sha256 = "10ksb77ljwfm25m8jrxh4cbss0lrjdmiigjbmyppxcls1rz8a6cn";
+ name = "ksirk-20.12.2.tar.xz";
};
};
ksmtp = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksmtp-20.12.1.tar.xz";
- sha256 = "1yahcgchfhk742n6hmpr2b2fll6jrw0vs1hrfvms3n7w7vxnkyxg";
- name = "ksmtp-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksmtp-20.12.2.tar.xz";
+ sha256 = "0rcs5zcrj8sscr0h0vx4ndbj3ziyxns5glk5bzpj1092b11pwllw";
+ name = "ksmtp-20.12.2.tar.xz";
};
};
ksnakeduel = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksnakeduel-20.12.1.tar.xz";
- sha256 = "1647m2a918kr762fmvffj2ipamhvcihc8yg8z80b8lwinpspcdfc";
- name = "ksnakeduel-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksnakeduel-20.12.2.tar.xz";
+ sha256 = "1cd1nldrmhimc1f059hqjkb8g8yjri7gf9cyxz7j0p48dxg93ns4";
+ name = "ksnakeduel-20.12.2.tar.xz";
};
};
kspaceduel = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kspaceduel-20.12.1.tar.xz";
- sha256 = "17i2saa48xq62j0aca555lqjxf6ry3wkxw5vm5v32g3kwkr10m78";
- name = "kspaceduel-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kspaceduel-20.12.2.tar.xz";
+ sha256 = "0mz3s5q8fyl76ck8b9s65w2q90a5cz2p4clnbxam8f72fk2g0g1v";
+ name = "kspaceduel-20.12.2.tar.xz";
};
};
ksquares = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksquares-20.12.1.tar.xz";
- sha256 = "085bvcx5p13j32017c0vm3zvcr0r0dzcbxpp21mvrp1xzy2dw7v2";
- name = "ksquares-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksquares-20.12.2.tar.xz";
+ sha256 = "11mfyyjrdlh8dzpzwvyr48rfg758hr14sb0cw1zvd7d7cz86dr31";
+ name = "ksquares-20.12.2.tar.xz";
};
};
ksudoku = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksudoku-20.12.1.tar.xz";
- sha256 = "0a0i87ddxa75admnxl181dsqmab4cwbb6pncl34z4sppf272z8km";
- name = "ksudoku-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksudoku-20.12.2.tar.xz";
+ sha256 = "01i4niy1nlikbw1j7qlwldcaniwb1pl4hr4p6icgsvfzr8pjl09z";
+ name = "ksudoku-20.12.2.tar.xz";
};
};
ksystemlog = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksystemlog-20.12.1.tar.xz";
- sha256 = "0535s6sq4wccdxv0xw12x3zzjkp0746s3hmlk93sginwq5fixxc0";
- name = "ksystemlog-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksystemlog-20.12.2.tar.xz";
+ sha256 = "1fyrpkk5ipp5q8sairmyx9bayndbbr9srrwdhp7grhbiw8kbjlc7";
+ name = "ksystemlog-20.12.2.tar.xz";
};
};
kteatime = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kteatime-20.12.1.tar.xz";
- sha256 = "0j9c3wy398z61ciyf91hv7l3bxski827di9ib94wyjkwqd6516zx";
- name = "kteatime-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kteatime-20.12.2.tar.xz";
+ sha256 = "18rpnvagrcmd62qss31rkv81kkjcz9kcisj9q0j41p770jvan8id";
+ name = "kteatime-20.12.2.tar.xz";
};
};
ktimer = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktimer-20.12.1.tar.xz";
- sha256 = "0iac06mzszg6g1flbs0mzj8ddnvh6kdgbhakjxl969in4c1frz9w";
- name = "ktimer-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktimer-20.12.2.tar.xz";
+ sha256 = "17sw7wl9844sg180h0x2skaj4bnkv6qin6cwklsp058wyf06w5wy";
+ name = "ktimer-20.12.2.tar.xz";
};
};
ktnef = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktnef-20.12.1.tar.xz";
- sha256 = "1pq4mabh7glpxl2iwj5rrfwim4x6xfg2vlpx7z0d0n13gh85b4fd";
- name = "ktnef-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktnef-20.12.2.tar.xz";
+ sha256 = "147dxalzgqfmacr0f44pbxg0ks5p7ck607gkbzf5asxgn4dlvgxq";
+ name = "ktnef-20.12.2.tar.xz";
};
};
ktorrent = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktorrent-20.12.1.tar.xz";
- sha256 = "0m43wsz0k87ncvg3zdffsp06nwdrlfnw52fi1ry12z2rnkcm4pwc";
- name = "ktorrent-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktorrent-20.12.2.tar.xz";
+ sha256 = "1fvbg3700my5algzif4dyy7zsc74qrby7ldfbj7snlxa4scws042";
+ name = "ktorrent-20.12.2.tar.xz";
};
};
ktouch = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktouch-20.12.1.tar.xz";
- sha256 = "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib";
- name = "ktouch-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktouch-20.12.2.tar.xz";
+ sha256 = "0j3xzm5ghnfvqb98xwrjzkrdm991af8rgnay38s081ykvj2hxj3n";
+ name = "ktouch-20.12.2.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-accounts-kcm-20.12.1.tar.xz";
- sha256 = "0440s2rrh03x8h5bp6xywidngrb1pinndsigaj4k4yvz122j2y53";
- name = "ktp-accounts-kcm-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-accounts-kcm-20.12.2.tar.xz";
+ sha256 = "0dyr3600yrd2hjs2s54210h1kj95w5mz9pl2fpwzcqgkmmd9vss5";
+ name = "ktp-accounts-kcm-20.12.2.tar.xz";
};
};
ktp-approver = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-approver-20.12.1.tar.xz";
- sha256 = "14ygpqvjhyzryrlinz0i2a6nyn1gnxs0hwx35imiz8hg4sb9402k";
- name = "ktp-approver-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-approver-20.12.2.tar.xz";
+ sha256 = "1h3fi19qqmik6f7h12manb8yval0qqj7jdhrpp07ck67m7mibwzr";
+ name = "ktp-approver-20.12.2.tar.xz";
};
};
ktp-auth-handler = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-auth-handler-20.12.1.tar.xz";
- sha256 = "1bysipq957kqbl33zj88m1g987b02v25gmh5lpnmrnlqznxw0ws7";
- name = "ktp-auth-handler-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-auth-handler-20.12.2.tar.xz";
+ sha256 = "158n88pcxj7hdmsmhcqbfpqc4lhrpzighxgb4wdrzizi9dwpxb3h";
+ name = "ktp-auth-handler-20.12.2.tar.xz";
};
};
ktp-call-ui = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-call-ui-20.12.1.tar.xz";
- sha256 = "154zgg84ln823al40s5fwxf10k3p73mz4fjn2lyhdqgsx68l08sy";
- name = "ktp-call-ui-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-call-ui-20.12.2.tar.xz";
+ sha256 = "0xhf79gqr6b8hiscv6jnmjnl8nb7c6vsvxn7hzvri9nm7hfmldya";
+ name = "ktp-call-ui-20.12.2.tar.xz";
};
};
ktp-common-internals = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-common-internals-20.12.1.tar.xz";
- sha256 = "1f8l1ywccxga3ff8qvf4ybabkd57apidkx7ky49dfi785kgvym16";
- name = "ktp-common-internals-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-common-internals-20.12.2.tar.xz";
+ sha256 = "06m8g80lj2cnx5cnfi6m1fy6pg6rm78kxg7v1493xcsfzizlc276";
+ name = "ktp-common-internals-20.12.2.tar.xz";
};
};
ktp-contact-list = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-list-20.12.1.tar.xz";
- sha256 = "122p2xp6wqmvk7mbplgnilsbnk6hfzrgbxpr39n462pkwbmvs44j";
- name = "ktp-contact-list-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-list-20.12.2.tar.xz";
+ sha256 = "037si47l8nc18d7yzh6d7i3gy710y5npxv4wcal6yg8mlr2qzjli";
+ name = "ktp-contact-list-20.12.2.tar.xz";
};
};
ktp-contact-runner = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-runner-20.12.1.tar.xz";
- sha256 = "1w8jp1nmjwaaqpim2jfpbv3d7w9asn93qi2ag2d6wx6mcc2q84jb";
- name = "ktp-contact-runner-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-runner-20.12.2.tar.xz";
+ sha256 = "1pv7smf5mld5rgld2nsqjwgl7vwsf99f3z4hamlbq6bpdg02w936";
+ name = "ktp-contact-runner-20.12.2.tar.xz";
};
};
ktp-desktop-applets = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-desktop-applets-20.12.1.tar.xz";
- sha256 = "0z3vv7q5kk27fm32bmhffpj6w72mldcdxsq6p3d33zf6rkz2rb74";
- name = "ktp-desktop-applets-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-desktop-applets-20.12.2.tar.xz";
+ sha256 = "1mx1q1gk756pkbpwghsvkspj3npgfzp2lf4jqldkyygvyqn3gxx4";
+ name = "ktp-desktop-applets-20.12.2.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-filetransfer-handler-20.12.1.tar.xz";
- sha256 = "0b8ha1jxhrdk67mzwrd0ypz99shlfr6sanxbbv0j3xh77sjcqpq3";
- name = "ktp-filetransfer-handler-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-filetransfer-handler-20.12.2.tar.xz";
+ sha256 = "16ys5cyx1pzcv0affy8agp0sbci9rkvpknfffldrvlgqppxza5rd";
+ name = "ktp-filetransfer-handler-20.12.2.tar.xz";
};
};
ktp-kded-module = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-kded-module-20.12.1.tar.xz";
- sha256 = "1hbb5pj3gaw9sg5rj2rb7a8xqrixfhr040rcdjsln337zyy98iqf";
- name = "ktp-kded-module-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-kded-module-20.12.2.tar.xz";
+ sha256 = "1wkvi5l9fvq24c3vdflg0azjxykid61i6mi59cnrnr866a1rbgrg";
+ name = "ktp-kded-module-20.12.2.tar.xz";
};
};
ktp-send-file = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-send-file-20.12.1.tar.xz";
- sha256 = "1vgfqa062h5yxdsz71h2zz247mzv6mn0zm7dz1v8p4pzns9kscq1";
- name = "ktp-send-file-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-send-file-20.12.2.tar.xz";
+ sha256 = "0j32c81rabbxh3m0jnnahny01qz2h7yc7l90w39r2jkv9r5f3yvf";
+ name = "ktp-send-file-20.12.2.tar.xz";
};
};
ktp-text-ui = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-text-ui-20.12.1.tar.xz";
- sha256 = "13cx2pv4wqmrgbi4sg51fhp418r50ajjhc9yz5mv7ad2gxml5c61";
- name = "ktp-text-ui-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-text-ui-20.12.2.tar.xz";
+ sha256 = "09wkpyadf3dvnrbxrasr66yw4hqnb3kbk6va9bs836fvcaiwagwd";
+ name = "ktp-text-ui-20.12.2.tar.xz";
};
};
ktuberling = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktuberling-20.12.1.tar.xz";
- sha256 = "06la1cvwvpiqjdwv7icdg55dd8pkc587bfwwjdq2fhp2pyh3ws6j";
- name = "ktuberling-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktuberling-20.12.2.tar.xz";
+ sha256 = "0yndqhgw9s2hydfsz2x3lr1m22ii2whc4kcp2jbkj9ssiymp8s68";
+ name = "ktuberling-20.12.2.tar.xz";
};
};
kturtle = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kturtle-20.12.1.tar.xz";
- sha256 = "12jr4sbchjpvc730cy4bp2cccdsd8vw901dgyq0nar8p0pvg4ybb";
- name = "kturtle-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kturtle-20.12.2.tar.xz";
+ sha256 = "1a46c6j7jng9l789wdpp7qj639872dfj268hj8nq63n27f82whr0";
+ name = "kturtle-20.12.2.tar.xz";
};
};
kubrick = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kubrick-20.12.1.tar.xz";
- sha256 = "1hdkm9vw9wpc8b3mw0yy9cz5ylm0h75zbg51rw4glai48bb3gs8i";
- name = "kubrick-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kubrick-20.12.2.tar.xz";
+ sha256 = "0g3zxdbj5l28msvs8gpn15g739pwwids7wxmky6w3b4qyn427j8m";
+ name = "kubrick-20.12.2.tar.xz";
};
};
kwalletmanager = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kwalletmanager-20.12.1.tar.xz";
- sha256 = "0nsg2xjzz6qvjqpxj1bbzzikvcl1ipqjwwab2kdwg71vlp99ravj";
- name = "kwalletmanager-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kwalletmanager-20.12.2.tar.xz";
+ sha256 = "02lx3p7860pigslx6s3bjg54sjjv1q93f9aknv5d32iblv2gaxiw";
+ name = "kwalletmanager-20.12.2.tar.xz";
};
};
kwave = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kwave-20.12.1.tar.xz";
- sha256 = "1w5r7di9401dm60p3bkp8qg41pvlz4226szki5s6pmmq89dixdgq";
- name = "kwave-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kwave-20.12.2.tar.xz";
+ sha256 = "0nankggamy1jxllnsv642kav57kwkbxpkd2mz6rarjinfnnqi7kd";
+ name = "kwave-20.12.2.tar.xz";
};
};
kwordquiz = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kwordquiz-20.12.1.tar.xz";
- sha256 = "1dvbvfwaja4n2v9binj8pbdjizqz4zp49fiq8b4k5jxygcsgnx2p";
- name = "kwordquiz-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kwordquiz-20.12.2.tar.xz";
+ sha256 = "1iik5khnsarxjipmd8znbiqs20bd65hanhmdmp7awqs7p0k4a0sq";
+ name = "kwordquiz-20.12.2.tar.xz";
};
};
libgravatar = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libgravatar-20.12.1.tar.xz";
- sha256 = "12byf7p0fwsfy61gcv112bhq3zczjy5n1dm32x2lrjyis2dh2z9j";
- name = "libgravatar-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libgravatar-20.12.2.tar.xz";
+ sha256 = "07pnj708wrvfmmy7j2vsx9j1sl9wx3hd7vfnpqa4zd24ci7x7y3d";
+ name = "libgravatar-20.12.2.tar.xz";
};
};
libkcddb = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkcddb-20.12.1.tar.xz";
- sha256 = "07ky4ly72689gb58jxqqzq5bgmb9wslxkqj0ldam6v82ldk8ss7k";
- name = "libkcddb-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkcddb-20.12.2.tar.xz";
+ sha256 = "1px7cgc75ypxaqknamqgxps4796388j99ycrbgrlyrhzws1mva8k";
+ name = "libkcddb-20.12.2.tar.xz";
};
};
libkcompactdisc = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkcompactdisc-20.12.1.tar.xz";
- sha256 = "101szps2js8dhxdn913mj9b2z953rp47ikkbrrdjl1fq1i8dh6ib";
- name = "libkcompactdisc-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkcompactdisc-20.12.2.tar.xz";
+ sha256 = "0yj2gkl1d76mf2lp02apxh4lmb9rnzvp0c8y0992ssnfsrivalp4";
+ name = "libkcompactdisc-20.12.2.tar.xz";
};
};
libkdcraw = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkdcraw-20.12.1.tar.xz";
- sha256 = "1vkjyccyax622a3jvqdfnppansabxaxplyk9prn302zqmgvl05h3";
- name = "libkdcraw-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkdcraw-20.12.2.tar.xz";
+ sha256 = "1hgw087frq9yzzwp2mkl3xqz2gd4v82kyiym2316i1xpmbkgcqfm";
+ name = "libkdcraw-20.12.2.tar.xz";
};
};
libkdegames = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkdegames-20.12.1.tar.xz";
- sha256 = "1zy44k98xjjydsa35bagf152kfb394wxpdx0c06vcf404jkhk7ng";
- name = "libkdegames-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkdegames-20.12.2.tar.xz";
+ sha256 = "0fcl06z5zl1hycj8f8q9dz6fc9lb0dqd5ciha4yig98ybzi3zn8r";
+ name = "libkdegames-20.12.2.tar.xz";
};
};
libkdepim = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkdepim-20.12.1.tar.xz";
- sha256 = "0kp2xssl1qbl3ziskxl3hhvyp8nc35d2fijk6hl99j3sxpdi2s4f";
- name = "libkdepim-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkdepim-20.12.2.tar.xz";
+ sha256 = "0f9c96w7ijlvfg9dr0w9wwaf05fn0z32zx8nn8jp42pzcbn6yr56";
+ name = "libkdepim-20.12.2.tar.xz";
};
};
libkeduvocdocument = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkeduvocdocument-20.12.1.tar.xz";
- sha256 = "0kqnhaabfi91clqg7nlnjcybl5ca0p3ysn5zlwhxz1fcjxm83g4w";
- name = "libkeduvocdocument-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkeduvocdocument-20.12.2.tar.xz";
+ sha256 = "0lki60mv82ygss2bxgwg178xabvfn85zlg0pwk2gj30zg0jiaw66";
+ name = "libkeduvocdocument-20.12.2.tar.xz";
};
};
libkexiv2 = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkexiv2-20.12.1.tar.xz";
- sha256 = "1vylyl3gxk3xais7c640kdnp4s4jwd9y2xxkwmf36ax0dv8wdcv0";
- name = "libkexiv2-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkexiv2-20.12.2.tar.xz";
+ sha256 = "10j82xk7y7vf9y9ss83hc9fd9c1dbd55nwjf28bj7myqaji4wdpb";
+ name = "libkexiv2-20.12.2.tar.xz";
};
};
libkgapi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkgapi-20.12.1.tar.xz";
- sha256 = "0cx8lbzq8ambz2lbslakczzcfmhri4268p7zf7hnf3ymd17a5y8d";
- name = "libkgapi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkgapi-20.12.2.tar.xz";
+ sha256 = "1yaas07ixxjnb5a37dq93skqs0vk08rdr9ll30jr7kdll311s5ni";
+ name = "libkgapi-20.12.2.tar.xz";
};
};
libkipi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkipi-20.12.1.tar.xz";
- sha256 = "1ln4f1n9ghiqb9h4lpw6qcwz7wrvm8jlcqn1ingjh9s58zw8wqsg";
- name = "libkipi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkipi-20.12.2.tar.xz";
+ sha256 = "1axjvkrmjszxyh0fdm9k25g4gpzmn4hsw222k2qj3smvnhdj37zk";
+ name = "libkipi-20.12.2.tar.xz";
};
};
libkleo = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkleo-20.12.1.tar.xz";
- sha256 = "0dq86pg0jchlpsynk0355wwq3pggqkj0mxhyvgi6a0xb2riy2r4a";
- name = "libkleo-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkleo-20.12.2.tar.xz";
+ sha256 = "0xsljfiqqggdp31c7irjn6lgacdds5kb7sr3khg24bsgip9488k1";
+ name = "libkleo-20.12.2.tar.xz";
};
};
libkmahjongg = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkmahjongg-20.12.1.tar.xz";
- sha256 = "0cq0bcl7hkgj1v7giqzbrvlds2933ji52fg53cakz29fkgxibj3x";
- name = "libkmahjongg-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkmahjongg-20.12.2.tar.xz";
+ sha256 = "1yl2smx0ybr164pl8nv5a7jibq3pmpf0v4ijvardp53j51bs2c2q";
+ name = "libkmahjongg-20.12.2.tar.xz";
};
};
libkomparediff2 = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkomparediff2-20.12.1.tar.xz";
- sha256 = "04klqvhh8zl5lyblpqgm92wycq4r0hh6gx18nqnsgx6lknlrx9y3";
- name = "libkomparediff2-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkomparediff2-20.12.2.tar.xz";
+ sha256 = "03fn3l1qhzivck7jzfp7fwpgix701paj03rzvc46rs4f1bfmb1d9";
+ name = "libkomparediff2-20.12.2.tar.xz";
};
};
libksane = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libksane-20.12.1.tar.xz";
- sha256 = "07xsfs0lkh35nj0fy7y1r46nkdmm26nbpsm846v18lh7wflxi36j";
- name = "libksane-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libksane-20.12.2.tar.xz";
+ sha256 = "1bhwfsyfd2z4hagfggz3ckxbyqrifcbwyn79h59qpng7nkzsgw4b";
+ name = "libksane-20.12.2.tar.xz";
};
};
libksieve = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libksieve-20.12.1.tar.xz";
- sha256 = "07zgcsdl38fdy5pskp51rj5p7m3pz9szwidyg24mdyzb08k5xpdz";
- name = "libksieve-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libksieve-20.12.2.tar.xz";
+ sha256 = "0rjchcpc4sx53siv3b9hq6s12qh96rrb4xmnk3gjhsvqq9gmyq3j";
+ name = "libksieve-20.12.2.tar.xz";
};
};
libktorrent = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libktorrent-20.12.1.tar.xz";
- sha256 = "18mcrb064gizqb699cs9bvm918gg06wm6sq33pi87kwki5cniamv";
- name = "libktorrent-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libktorrent-20.12.2.tar.xz";
+ sha256 = "15ywv00vklvqw7x6id4vycf4rmi4j3s6z70c68h1b6v8n9j3rz3b";
+ name = "libktorrent-20.12.2.tar.xz";
};
};
lokalize = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/lokalize-20.12.1.tar.xz";
- sha256 = "0mxzk9s0yrjf8gj70dpl1wbvnrkzc3ncqab2bj3yx0xk05hagjlx";
- name = "lokalize-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/lokalize-20.12.2.tar.xz";
+ sha256 = "1ms7x5aw5z63q2xy6f3x8dl1k39yjqbabzh8qznaqs172bwmwzz7";
+ name = "lokalize-20.12.2.tar.xz";
};
};
lskat = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/lskat-20.12.1.tar.xz";
- sha256 = "0p8n2cgfdxxjbx4jcpqf85h6k36nggj32h982yj3ig5dh1csym5d";
- name = "lskat-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/lskat-20.12.2.tar.xz";
+ sha256 = "087zrwy5pabyy7zpkplxn9is2msr9kpa8r7bpc6kxylx85sd4nsr";
+ name = "lskat-20.12.2.tar.xz";
};
};
mailcommon = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/mailcommon-20.12.1.tar.xz";
- sha256 = "191d6l314njlj227qhz7qqmkjkz9zm7xnvm9rlfj302san90a338";
- name = "mailcommon-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/mailcommon-20.12.2.tar.xz";
+ sha256 = "0qbbr5m5glcp7rh3aljkrfs27ypdcb5b72q602irivhbgv56c6v5";
+ name = "mailcommon-20.12.2.tar.xz";
};
};
mailimporter = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/mailimporter-20.12.1.tar.xz";
- sha256 = "0jqdckpwlipc4zxxwnvysl44ri19h0hgr37dp36k99sxa3688jxc";
- name = "mailimporter-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/mailimporter-20.12.2.tar.xz";
+ sha256 = "16alrfyvgwih9i7fzvmfhbmlsp0l942qml43w2rwkg974g8188yv";
+ name = "mailimporter-20.12.2.tar.xz";
};
};
marble = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/marble-20.12.1.tar.xz";
- sha256 = "0w398igxx7pmyd4bj65ppbxfc4fiz4hsjmcffya88dnxxz73djb5";
- name = "marble-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/marble-20.12.2.tar.xz";
+ sha256 = "0kgiwsx58yhng92v5c90bz02vsn70p6y7gf6qr5fvljbldrxq3a2";
+ name = "marble-20.12.2.tar.xz";
};
};
markdownpart = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/markdownpart-20.12.1.tar.xz";
- sha256 = "1389hswbhcssl9ybb605h9i50fv6jajggldkiyfwqxbi7aysghwk";
- name = "markdownpart-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/markdownpart-20.12.2.tar.xz";
+ sha256 = "08fifhw40q2xhi3lp76a3b7jgipq3v1gvp1f5id83jvv9bg5m85k";
+ name = "markdownpart-20.12.2.tar.xz";
};
};
mbox-importer = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/mbox-importer-20.12.1.tar.xz";
- sha256 = "1kgbiq933f93sb8m2nqmpp1x6qkqqcm2hcb3ihk5741dcpdmxx9n";
- name = "mbox-importer-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/mbox-importer-20.12.2.tar.xz";
+ sha256 = "1jiapp7pblanra83p720nj1rzqd566ij28za9jrkn3nj3xv2zm62";
+ name = "mbox-importer-20.12.2.tar.xz";
};
};
messagelib = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/messagelib-20.12.1.tar.xz";
- sha256 = "0yjh7s80ksyyi78vxjw4i5f1bmsfziphwm6flgnw18gfzj3pyyy7";
- name = "messagelib-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/messagelib-20.12.2.tar.xz";
+ sha256 = "07mzwsn0bmfsrsn6wlmz7kwrix4d33b007jvx37nckmarr6xcx54";
+ name = "messagelib-20.12.2.tar.xz";
};
};
minuet = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/minuet-20.12.1.tar.xz";
- sha256 = "13jlz2m57x379zyv4x5zk2h6jc0qcz1zymkyrzs431bfmhyhdna2";
- name = "minuet-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/minuet-20.12.2.tar.xz";
+ sha256 = "00d08qwfa4pvlcysp1af3n91bwb8idkl6gjwxrin3kliwns0ivfj";
+ name = "minuet-20.12.2.tar.xz";
};
};
okular = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/okular-20.12.1.tar.xz";
- sha256 = "0gpm7n47yijsjg4yba561j5pbvd98hgvr93w1kvzk851nb87m89c";
- name = "okular-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/okular-20.12.2.tar.xz";
+ sha256 = "1959flll9rrwsgb3gpifvsciyvl70j46xb0acfx9zrvsddvbpabq";
+ name = "okular-20.12.2.tar.xz";
};
};
palapeli = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/palapeli-20.12.1.tar.xz";
- sha256 = "05d3f0snbg0iz78ggxk7hv1qn3blvpnpclhrhzcw1c5znr7al2xm";
- name = "palapeli-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/palapeli-20.12.2.tar.xz";
+ sha256 = "1z80892gp6hg75vl6aicfvf5013412b5xglrpsp86lbx2r7d6ikw";
+ name = "palapeli-20.12.2.tar.xz";
};
};
parley = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/parley-20.12.1.tar.xz";
- sha256 = "00xc1dv3fj783brfqh3ggvrwv26m840k35vrx2izzq5lqx2g1p5a";
- name = "parley-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/parley-20.12.2.tar.xz";
+ sha256 = "16lymvvwglzvrfl74p7w9l2vahhrkm58fn6iicn5w1751bavjiq7";
+ name = "parley-20.12.2.tar.xz";
};
};
partitionmanager = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/partitionmanager-20.12.1.tar.xz";
- sha256 = "1zypkah2smmqclni2r8571sd6qd5cbc0915r6gzf800yyccsfb65";
- name = "partitionmanager-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/partitionmanager-20.12.2.tar.xz";
+ sha256 = "1f0nmz99fhp6c48sg92fwssxdvmwx2bj4l7phb0gqfnfqk4sw1xd";
+ name = "partitionmanager-20.12.2.tar.xz";
};
};
picmi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/picmi-20.12.1.tar.xz";
- sha256 = "0aiaq99sb57vvz5wjwdwm0jj456nj26qs4m6vwibb1f0f8js4i03";
- name = "picmi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/picmi-20.12.2.tar.xz";
+ sha256 = "024afpylfb6n6dd0g1iif257a0mgzmmmjl24h2riz4cyfvd26mkc";
+ name = "picmi-20.12.2.tar.xz";
};
};
pimcommon = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/pimcommon-20.12.1.tar.xz";
- sha256 = "1w5avmvssqnvxl31xrlh1xfns6q386w8ixlzfbzjkz5m95m4wr57";
- name = "pimcommon-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/pimcommon-20.12.2.tar.xz";
+ sha256 = "0fbmahp9m1jzi626rggmp09j3338z8f86hszvwfnk7ydn16hy5rs";
+ name = "pimcommon-20.12.2.tar.xz";
};
};
pim-data-exporter = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/pim-data-exporter-20.12.1.tar.xz";
- sha256 = "0k9lh3llkzx0n5x8q14hkbjjrkczm10kr246bzr1zz8lcv1za1jc";
- name = "pim-data-exporter-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/pim-data-exporter-20.12.2.tar.xz";
+ sha256 = "13z8r2rq1453zprvpjnf5y5v3x1828l8gyvbivf0dmfhb3hi1bih";
+ name = "pim-data-exporter-20.12.2.tar.xz";
};
};
pim-sieve-editor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/pim-sieve-editor-20.12.1.tar.xz";
- sha256 = "0lifarfkpcpdvwmn61gmfd45k5i0dbf3sjrb0z1yaqsq7m158di1";
- name = "pim-sieve-editor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/pim-sieve-editor-20.12.2.tar.xz";
+ sha256 = "11ji1033yq4lwpi2b331i4f5kpak66h6zyviv344wyab05ljkyhd";
+ name = "pim-sieve-editor-20.12.2.tar.xz";
};
};
poxml = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/poxml-20.12.1.tar.xz";
- sha256 = "1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk";
- name = "poxml-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/poxml-20.12.2.tar.xz";
+ sha256 = "1hnm13x102fq7g4pginhdpq473dw9y52kw497773b72my94yj2zz";
+ name = "poxml-20.12.2.tar.xz";
};
};
print-manager = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/print-manager-20.12.1.tar.xz";
- sha256 = "1nx442bi41gd64i4j0nc8hx0wdv6ayvnp2wydn4l7sgsf0ms4x6y";
- name = "print-manager-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/print-manager-20.12.2.tar.xz";
+ sha256 = "1r19fsgnqdlmrpgbby13nj4v97nqlxlx8c0f7yv3izgncpavr0id";
+ name = "print-manager-20.12.2.tar.xz";
};
};
rocs = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/rocs-20.12.1.tar.xz";
- sha256 = "11gg2pmx21wfrw63qv7w8bjzcsxf86j5ripa2dwqfl3355wvi5mb";
- name = "rocs-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/rocs-20.12.2.tar.xz";
+ sha256 = "06sy6g32cigls1znvh5wvs7gw9h492d8zjqm6b50wsw0hbx61kvz";
+ name = "rocs-20.12.2.tar.xz";
};
};
signon-kwallet-extension = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/signon-kwallet-extension-20.12.1.tar.xz";
- sha256 = "0m48a5mqmwrjl4wc4m30n5csl7fwp8g70pv0nib0v36lp0424xjb";
- name = "signon-kwallet-extension-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/signon-kwallet-extension-20.12.2.tar.xz";
+ sha256 = "0ycr0dn8bp51dc510gqxik0rm0wk5728px7cps9csy33izfjpx9p";
+ name = "signon-kwallet-extension-20.12.2.tar.xz";
};
};
spectacle = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/spectacle-20.12.1.tar.xz";
- sha256 = "04jsm0ipfaccc80qxnhhbfc9fn009cxa7dys89iqfqza6ssvq51l";
- name = "spectacle-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/spectacle-20.12.2.tar.xz";
+ sha256 = "0v0vzspr0vwqi7m7yhnhavxzkfqdnz1g06ispfl1lmpjg1xh90by";
+ name = "spectacle-20.12.2.tar.xz";
};
};
step = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/step-20.12.1.tar.xz";
- sha256 = "05xj4zv4r82nnz5rzb0rmrps4dagnkw9f5lapil5mi1i1gwqfi2k";
- name = "step-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/step-20.12.2.tar.xz";
+ sha256 = "1drdv95rimdsgarcc00jlfm3jmcan2ln32yq0q2nbbxsj0c502k7";
+ name = "step-20.12.2.tar.xz";
};
};
svgpart = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/svgpart-20.12.1.tar.xz";
- sha256 = "09n0pf5saww8gppmd501i3dfr13yvn4r2rfbdz42zlvcpcpgxdry";
- name = "svgpart-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/svgpart-20.12.2.tar.xz";
+ sha256 = "1v1qd5sgb89gkvb62jad8ava2y599a4acb6hkqyh758y798ylgwj";
+ name = "svgpart-20.12.2.tar.xz";
};
};
sweeper = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/sweeper-20.12.1.tar.xz";
- sha256 = "06a9a9vbkfhmlcc927ysa0qnp5qqbl5iywhkgbvyz90nsdaw3jjl";
- name = "sweeper-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/sweeper-20.12.2.tar.xz";
+ sha256 = "0yh6dqw37v8l54635k7g27dnsrl319kfxrkiiy09cx6pjzf87k1h";
+ name = "sweeper-20.12.2.tar.xz";
};
};
umbrello = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/umbrello-20.12.1.tar.xz";
- sha256 = "07fxxyw5zn1xj05kjr16rkgpj7ms9xvgpj4zlg428037gfa8g9vl";
- name = "umbrello-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/umbrello-20.12.2.tar.xz";
+ sha256 = "0zzic469brh0w41w4ni66mfrj0p44xm1h32iwbb7imgnpw6dqksf";
+ name = "umbrello-20.12.2.tar.xz";
};
};
yakuake = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/yakuake-20.12.1.tar.xz";
- sha256 = "02pal9xx1wbpw7dimvs2aw1xnyjqlvbjlybkkfhf8x7c6m1r63aa";
- name = "yakuake-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/yakuake-20.12.2.tar.xz";
+ sha256 = "16irzxl6xfyanr7lrvap0ng911lml10bbjr0axk2a7m0gc1llrn4";
+ name = "yakuake-20.12.2.tar.xz";
};
};
zeroconf-ioslave = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/zeroconf-ioslave-20.12.1.tar.xz";
- sha256 = "1lx94qgrqhyva3nv7sgzy0blbdgx3b6m0g0i0psg74qckdh8glas";
- name = "zeroconf-ioslave-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/zeroconf-ioslave-20.12.2.tar.xz";
+ sha256 = "0yqni8vwwwya3cv006cf5svs1jhn6369clvrl6m79iacy0iirynk";
+ name = "zeroconf-ioslave-20.12.2.tar.xz";
};
};
}
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix
index fc653953e54b..0b3e21cc03a0 100644
--- a/pkgs/applications/misc/1password-gui/default.nix
+++ b/pkgs/applications/misc/1password-gui/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
- version = "8.0.27";
+ version = "8.0.30";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- hash = "sha256-qzZXs7ak4052Igq+YWuzgDqJ7143q5qw5P3b3eN3NkU=";
+ hash = "sha256-j+fp/f8nta+OOuOFU4mmUrGYlVmAqdaXO4rLJ0in+m8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix
index 8646a6716a45..70b3c71c0b39 100644
--- a/pkgs/applications/misc/archivy/default.nix
+++ b/pkgs/applications/misc/archivy/default.nix
@@ -1,15 +1,15 @@
-{ lib, python3, fetchPypi, appdirs, attrs, requests,
-beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf,
-pypandoc, python-dotenv, python-frontmatter, tinydb, validators,
-watchdog, wtforms, html2text, flask-compress }:
+{ lib, buildPythonApplication, fetchPypi, appdirs, attrs
+, beautifulsoup4, click-plugins, elasticsearch, flask-compress
+, flask_login, flask_wtf, html2text, python-dotenv, python-frontmatter
+, requests, tinydb, validators, werkzeug, wtforms }:
-python3.pkgs.buildPythonApplication rec {
+buildPythonApplication rec {
pname = "archivy";
- version = "1.0.2";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "6f706b925175852d8101a4afe2304ab7ee7d56e9658538b9a8e49e925978b87e";
+ sha256 = "sha256-yUXsTPb5oJYZA9MlHz7eLowRjD/ltq5VLTHeOMqcL/M=";
};
# Relax some dependencies
@@ -30,18 +30,17 @@ python3.pkgs.buildPythonApplication rec {
beautifulsoup4
click-plugins
elasticsearch
+ flask-compress
flask_login
flask_wtf
- pypandoc
+ html2text
python-dotenv
python-frontmatter
- tinydb
requests
+ tinydb
validators
- watchdog
+ werkzeug
wtforms
- html2text
- flask-compress
];
# __init__.py attempts to mkdir in read-only file system
diff --git a/pkgs/applications/misc/audio/soxr/arm64-check.patch b/pkgs/applications/misc/audio/soxr/arm64-check.patch
new file mode 100644
index 000000000000..ac16a214c3aa
--- /dev/null
+++ b/pkgs/applications/misc/audio/soxr/arm64-check.patch
@@ -0,0 +1,79 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Misty De Meo
+Date: Tue, 15 Sep 2020 16:57:26 -0700
+Subject: [PATCH] Check for __arm64__, not just __arm__
+
+On at least one 64-bit ARM processor I've tested (Apple Silicon on macOS),
+__arm__ isn't defined but __arm64__ is. As a result, some of the
+ARM-specific macros are missing and calls to them fail.
+---
+ src/cr-core.c | 2 +-
+ src/dev32s.h | 2 +-
+ src/pffft-wrap.c | 2 +-
+ src/pffft.c | 4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/cr-core.c b/src/cr-core.c
+index 159a5d9..fe5ea8a 100644
+--- a/src/cr-core.c
++++ b/src/cr-core.c
+@@ -80,7 +80,7 @@ static void cubic_stage_fn(stage_t * p, fifo_t * output_fifo)
+ #define DEFINED_X86 0
+ #endif
+
+-#if defined __arm__
++#if defined(__arm__) || defined(__arm64__)
+ #define DEFINED_ARM 1
+ #else
+ #define DEFINED_ARM 0
+diff --git a/src/dev32s.h b/src/dev32s.h
+index 7edae86..a14d7ad 100644
+--- a/src/dev32s.h
++++ b/src/dev32s.h
+@@ -31,7 +31,7 @@ SIMD_INLINE(void) vStorSum(float * a, v4_t b) {
+ v4_t t = vAdd(_mm_movehl_ps(b, b), b);
+ _mm_store_ss(a, vAdd(t, _mm_shuffle_ps(t,t,1)));}
+
+-#elif defined __arm__
++#elif defined(__arm__) || defined(__arm64__)
+
+ #include
+
+diff --git a/src/pffft-wrap.c b/src/pffft-wrap.c
+index c920f06..1641fc4 100644
+--- a/src/pffft-wrap.c
++++ b/src/pffft-wrap.c
+@@ -40,7 +40,7 @@ static void pffft_zconvolve(PFFFT_Setup *s, const float *a, const float *b, floa
+
+ float ar, ai, br, bi;
+
+-#ifdef __arm__
++#if defined(__arm__) || defined(__arm64__)
+ __builtin_prefetch(va);
+ __builtin_prefetch(vb);
+ __builtin_prefetch(va+2);
+diff --git a/src/pffft.c b/src/pffft.c
+index 46c841e..8c775a9 100644
+--- a/src/pffft.c
++++ b/src/pffft.c
+@@ -157,7 +157,7 @@ typedef __m128 v4sf;
+ /*
+ ARM NEON support macros
+ */
+-#elif !defined(PFFFT_SIMD_DISABLE) && defined(__arm__)
++#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__arm64__))
+ # include
+ typedef float32x4_t v4sf;
+ # define SIMD_SZ 4
+@@ -1732,7 +1732,7 @@ void pffft_zconvolve_accumulate(PFFFT_Setup *s, const float *a, const float *b,
+ const v4sf * RESTRICT vb = (const v4sf*)b;
+ v4sf * RESTRICT vab = (v4sf*)ab;
+
+-#ifdef __arm__
++#if defined(__arm__) || defined(__arm64__)
+ __builtin_prefetch(va);
+ __builtin_prefetch(vb);
+ __builtin_prefetch(vab);
+--
+2.30.1
+
diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix
index 3f3ed0a0b156..8460b4856dcc 100644
--- a/pkgs/applications/misc/audio/soxr/default.nix
+++ b/pkgs/applications/misc/audio/soxr/default.nix
@@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di";
};
+ patches = [
+ # Remove once https://sourceforge.net/p/soxr/code/merge-requests/5/ is merged.
+ ./arm64-check.patch
+ ];
+
outputs = [ "out" "doc" ]; # headers are just two and very small
preConfigure = if stdenv.isDarwin then ''
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index 29469d9fff91..14b372d91e59 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = [ "buildPhase" ];
diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix
index d50f36379881..52d56d5c8f56 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/pkgs/applications/misc/bashSnippets/default.nix
@@ -1,10 +1,10 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
-, curl, python, bind, iproute, bc, gitMinimal }:
+, curl, python3, bind, iproute, bc, gitMinimal }:
let
version = "1.23.0";
deps = lib.makeBinPath [
curl
- python
+ python3
bind.dnsutils
iproute
bc
@@ -24,11 +24,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
- patchPhase = ''
+ postPatch = ''
patchShebangs install.sh
substituteInPlace install.sh --replace /usr/local "$out"
'';
+ strictDeps = true;
+
dontBuild = true;
installPhase = ''
diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix
index 8de0ceeae654..42c0f7d05fd8 100644
--- a/pkgs/applications/misc/bemenu/default.nix
+++ b/pkgs/applications/misc/bemenu/default.nix
@@ -2,12 +2,12 @@
, pango, fribidi, harfbuzz, pcre, pkg-config
, ncursesSupport ? true, ncurses ? null
, waylandSupport ? true, wayland ? null, wayland-protocols ? null
-, x11Support ? true, xlibs ? null, xorg ? null
+, x11Support ? true, xorg ? null
}:
assert ncursesSupport -> ncurses != null;
assert waylandSupport -> ! lib.elem null [wayland wayland-protocols];
-assert x11Support -> xlibs != null && xorg != null;
+assert x11Support -> xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
] ++ optional ncursesSupport ncurses
++ optionals waylandSupport [ wayland wayland-protocols ]
++ optionals x11Support [
- xlibs.libX11 xlibs.libXinerama xlibs.libXft
+ xorg.libX11 xorg.libXinerama xorg.libXft
xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb
];
diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix
index ce8db160a755..f007fb71377b 100644
--- a/pkgs/applications/misc/birdtray/default.nix
+++ b/pkgs/applications/misc/birdtray/default.nix
@@ -36,11 +36,15 @@ mkDerivation rec {
--subst-var-by qttranslations ${qttranslations}
'';
+ # Wayland support is broken.
+ # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315
+ qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ];
+
meta = with lib; {
description = "Mail system tray notification icon for Thunderbird";
homepage = "https://github.com/gyunaev/birdtray";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ Flakebi ];
+ maintainers = with maintainers; [ Flakebi oxalica ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 039dfe59ff70..69f0d58159e4 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
patches = lib.optional stdenv.isDarwin ./darwin.patch;
- nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
+ nativeBuildInputs = [ cmake makeWrapper ] ++ optional cudaSupport addOpenGLRunpath;
buildInputs =
[ boost ffmpeg gettext glew ilmbase
freetype libjpeg libpng libsamplerate libsndfile libtiff
@@ -41,9 +41,9 @@ stdenv.mkDerivation rec {
alembic
(opensubdiv.override { inherit cudaSupport; })
tbb
- makeWrapper
embree
gmp
+ pugixml
]
++ (if (!stdenv.isDarwin) then [
libXi libX11 libXext libXrender
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
openvdb
]
else [
- pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
+ llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
])
++ optional jackaudioSupport libjack2
++ optional cudaSupport cudatoolkit
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 7f2ee5a288a2..5d57ff9a5b69 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -26,11 +26,11 @@
mkDerivation rec {
pname = "calibre";
- version = "5.12.0";
+ version = "5.13.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-N3/y1kSWyM36LpwbimftJ67h4zfk2j9hcvUi/pQL3YU=";
+ sha256 = "sha256-GDFAZxZmkio7e7kVjhYqhNdhXIlUPJF0iMWVl0uWVCM=";
};
patches = [
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index c74ac5ffb306..0ce89afa6cea 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, pythonPackages, gettext }:
+{ lib, fetchFromGitHub, python2Packages, gettext }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "cherrytree";
version = "0.39.4";
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ gettext ];
- propagatedBuildInputs = with pythonPackages; [ pygtk dbus-python pygtksourceview ];
+ propagatedBuildInputs = with python2Packages; [ pygtk dbus-python pygtksourceview ];
patches = [ ./subprocess.patch ];
diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix
index d043823a068a..dc32cbf2c2a4 100644
--- a/pkgs/applications/misc/coolreader/default.nix
+++ b/pkgs/applications/misc/coolreader/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "coolreader";
- version = "3.2.53";
+ version = "3.2.55";
src = fetchFromGitHub {
owner = "buggins";
repo = pname;
rev = "cr${version}";
- sha256 = "sha256-5it70cwRV56OMZI4dny5uwxWgoF42tjcEC4g3MC548s=";
+ sha256 = "sha256-gYAaYGEjw7p6y4h5j6j/4Ld+b37Nv+kt04Wp+qb8gzY=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix
index 3db4872c0e04..76a5541f6dba 100644
--- a/pkgs/applications/misc/crow-translate/default.nix
+++ b/pkgs/applications/misc/crow-translate/default.nix
@@ -46,13 +46,13 @@ let
in
mkDerivation rec {
pname = "crow-translate";
- version = "2.7.1";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = "crow-translate";
repo = "crow-translate";
rev = version;
- sha256 = "sha256-YOsp/noGsYthre18fMyBj9s+YFzdHJfIJzJSm43wiZ0=";
+ sha256 = "sha256-fmlNUhNorV/MUdfdDXM6puAblTTa6p2slVT/EKy5THg=";
};
patches = [
diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix
index 821b88f9b20d..a8d041de1079 100644
--- a/pkgs/applications/misc/curabydagoma/default.nix
+++ b/pkgs/applications/misc/curabydagoma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }:
+{ stdenv, runtimeShell, lib, fetchurl, python2Packages, unzip }:
# This package uses a precompiled "binary" distribution of CuraByDagoma,
# distributed by the editor.
@@ -13,7 +13,9 @@
# I guess people owning a 3D printer generally don't use i686.
# If, however, someone needs it, we certainly can find a solution.
-stdenv.mkDerivation rec {
+let
+ pythonPackages = python2Packages;
+in stdenv.mkDerivation rec {
pname = "curabydagoma";
# Version is the date, UNIX format
version = "1520506579";
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
};
unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz";
nativeBuildInputs = [ unzip ];
- buildInputs = [ python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ];
+ buildInputs = [ pythonPackages.python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ];
# Compile all pyc files because the included pyc files may be older than the
# py files. However, Python doesn't realize that because the packages
@@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
cat > $out/bin/curabydago < org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar
+ installPhase = ''
+ find ./caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
+ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+ | sh
+ '';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0r7f6713m0whh5hlk1id7z9j5v9494r41sivn9fzl63q70kzz92g";
+ };
+
+ # Point to our local deps repo
+ gradleInit = writeText "init.gradle" ''
+ logger.lifecycle 'Replacing Maven repositories with ${deps}...'
+ gradle.projectsLoaded {
+ rootProject.allprojects {
+ buildscript {
+ repositories {
+ clear()
+ maven { url '${deps}' }
+ }
+ }
+ repositories {
+ clear()
+ maven { url '${deps}' }
+ }
+ }
+ }
+ settingsEvaluated { settings ->
+ settings.pluginManagement {
+ repositories {
+ maven { url '${deps}' }
+ }
+ }
+ }
+ '';
+
+ # downloaded from unicode.org and twemoji.maxcdn.com by code in freeplane/emoji.gradle
+ # the below hash is for versions of freeplane that use twemoji 12.1.4, and emoji 12.1
+ emoji = stdenv.mkDerivation rec {
+ name = "${pname}-emoji";
+ inherit src;
+
+ nativeBuildInputs = [ jdk11 gradle_5 ];
+
+ buildPhase = ''
+ GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} emojiGraphicsClasses emojiListClasses
+ '';
+
+ installPhase = ''
+ mkdir -p $out/emoji/txt $out/resources/images
+ cp freeplane/build/emoji/txt/emojilist.txt $out/emoji/txt
+ cp -r freeplane/build/emoji/resources/images/emoji/. $out/resources/images/emoji
+ '';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0zikbakbr2fhyv4h4h52ajhznjka0hg6hiqfy1528a39i6psipn3";
+ };
+
+in stdenv.mkDerivation rec {
+ inherit pname version src;
+
+ buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ jdk11 gradle_5 ];
+
+ buildPhase = ''
+ mkdir -p -- ./freeplane/build/emoji/{txt,resources/images}
+ cp ${emoji}/emoji/txt/emojilist.txt ./freeplane/build/emoji/txt/emojilist.txt
+ cp -r ${emoji}/resources/images/emoji ./freeplane/build/emoji/resources/images/emoji
+ GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin $out/share
+
+ cp -a ./BIN/. $out/share/${pname}
+ makeWrapper $out/share/${pname}/${pname}.sh $out/bin/${pname} \
+ --set FREEPLANE_BASE_DIR $out/share/${pname} \
+ --set JAVA_HOME ${jdk11} \
+ --prefix PATH : ${lib.makeBinPath [ jdk11 which ]}
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Mind-mapping software";
+ homepage = "https://freeplane.org/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ chaduffy ];
+ };
+}
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 438d466ab588..ad0970e0fe29 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.17.0";
+ version = "1.17.1";
src = fetchPypi {
inherit pname version;
- sha256 = "bf5196b9e18a45d62d7e823894f12def310264a258956882cbac13b5e856bf00";
+ sha256 = "1cfaa3a617d5d222d4b9b41634b1bdede2673a8620d6b0e62fb755ae224ca2ac";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 0a6796a9b077..736685f5eb1f 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python, pkg-config, cmake, bluez, libusb1, curl
+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, bluez, libusb1, curl
, libiconv, gettext, sqlite
, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
, postgresSupport ? false, postgresql ? null
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ];
- buildInputs = [ python bluez libusb1 curl gettext sqlite libiconv ]
+ strictDeps = true;
+
+ buildInputs = [ bluez libusb1 curl gettext sqlite libiconv ]
++ optionals dbiSupport [ libdbi libdbiDrivers ]
++ optionals postgresSupport [ postgresql ];
diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix
index f482b8af2898..f77bf04c2c89 100644
--- a/pkgs/applications/misc/gcstar/default.nix
+++ b/pkgs/applications/misc/gcstar/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
JSON
ImageExifTool
librelative
- LWPUserAgent
+ LWP
LWPProtocolHttps
MP3Info
MP3Tag
diff --git a/pkgs/applications/misc/go-org/default.nix b/pkgs/applications/misc/go-org/default.nix
new file mode 100644
index 000000000000..cc2225af07ca
--- /dev/null
+++ b/pkgs/applications/misc/go-org/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+ pname = "go-org";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "niklasfasching";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-nMZzRbu3lxunIlnnmb49Ljt8oSiYpj+8gZ0u/OFRRDM=";
+ };
+
+ vendorSha256 = "sha256-njx89Ims7GZql8sbVmH/E9gM/ONRWiPRLVs+FzsCSzI=";
+
+ postInstallCheck = ''
+ $out/bin/go-org > /dev/null
+ '';
+
+ meta = with lib; {
+ description = "Org-mode parser and static site generator in go";
+ homepage = "https://niklasfasching.github.io/go-org";
+ license = licenses.mit;
+ maintainers = with maintainers; [ payas ];
+ };
+}
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 5635aadda9df..8d612ceb413d 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "gphoto2";
- version = "2.5.26";
+ version = "2.5.27";
src = fetchFromGitHub {
owner = "gphoto";
repo = "gphoto2";
rev = "v${version}";
- sha256 = "1w01j3qvjl2nlfs38rnsmjvn3r0r2xf7prxz1i6yarbpj3fzwqqc";
+ sha256 = "sha256-zzlyA2IedyBZ4/TdSmrqbe2le8rFMQ6tY6jF5skJ7l4=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index cebbcfe59ba7..c9c815771a8e 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
- version = "8.8";
+ version = "8.9";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "sha256-eAXMmjPcfnJA5w6w/SRc6T5KHss77t0JijTB6+ctjzo=";
+ sha256 = "sha256-nl9iu8ezgMZ1wy2swDXYRDLlkSz1II+C65UUWNvGBxg=";
};
patches = (substituteAll {
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index a4c32b9b931c..8f3444d85d80 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.81.0";
+ version = "0.82.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-9YroUxcLixu+MNL37JByCulCHv0WxWGwqBQ/+FGtZLw=";
+ sha256 = "sha256-D0bwy8LJihlfM+E3oys85yjadjZNfPv5xnq4ekaZPCU=";
};
- vendorSha256 = "sha256-5gQyoLirXajkzxKxzcuPnjECL2mJPiHS65lYkyIpKs8=";
+ vendorSha256 = "sha256-pJBm+yyy1DbH28oVBQA+PHSDtSg3RcgbRlurrwnnEls=";
doCheck = false;
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
deleted file mode 100644
index 0b8bcbfffac1..000000000000
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, stdenv, fetchurl, java, runtimeShell }:
-
-stdenv.mkDerivation rec {
- pname = "jbidwatcher";
- version = "2.5.6";
-
- src = fetchurl {
- url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar";
- sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr";
- };
-
- buildInputs = [ java ];
-
- jarfile = "$out/share/java/${pname}/JBidwatcher.jar";
-
- dontUnpack = true;
-
- dontBuild = true;
-
- installPhase = ''
- mkdir -p "$out/bin"
- echo > "$out/bin/${pname}" "#!${runtimeShell}"
- echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}"
- chmod +x "$out/bin/${pname}"
- install -D -m644 ${src} ${jarfile}
- '';
-
- meta = {
- homepage = "http://www.jbidwatcher.com/";
- description = "Monitor and snipe Ebay auctions";
- license = "LGPL";
-
- longDescription = ''
- A Java-based application allowing you to monitor auctions you're
- not part of, submit bids, snipe (bid at the last moment), and
- otherwise track your auction-site experience. It includes
- adult-auction management, MANY currencies (pound, dollar (US,
- Canada, Australian, and New Taiwanese) and euro, presently),
- drag-and-drop of auction URLs, an original, unique and powerful
- 'multisniping' feature, a relatively nice UI, and is known to work
- cleanly under Linux, Windows, Solaris, and MacOSX from the same
- binary.
- '';
-
- platforms = lib.platforms.linux ++ lib.platforms.darwin;
- };
-}
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 3828fc654d65..b8e72daa6f77 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,20 +1,20 @@
{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
let
pname = "josm";
- version = "17428";
+ version = "17580";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0fhnq0836jp72br808hhw1ki70zc9wqcwfhnizb8pzjvs4wgx36w";
+ sha256 = "05y1g48llnpbyv0r8dn3kyhcfqylsg4fbp540xn1n7sk3h17gwsw";
};
macosx = fetchurl {
- url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip";
- sha256 = "126yy6y7mkpqzkrkqkzzn3mwnl1yjkmd5k895k7mmk2inmcsvqgm";
+ url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip";
+ sha256 = "0aqkr6951zbi7a6zawvpsh51i0c4nyz2xkj52gg8n4vxli5pp3y1";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
- sha256 = "198kq490y5wzxz0a5prb9anykq6dzg0imxfkchsas233inbzggql";
+ sha256 = "04mxrirlyjy8i5s6y8w84kxv3wjlhhdfmlaxxlxd25viim73g3zv";
};
};
in
diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix
index 8d2cabb5b8b2..7a5615bf40d5 100644
--- a/pkgs/applications/misc/jrnl/default.nix
+++ b/pkgs/applications/misc/jrnl/default.nix
@@ -18,14 +18,14 @@
buildPythonApplication rec {
pname = "jrnl";
- version = "2.7";
+ version = "2.7.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "jrnl-org";
repo = pname;
rev = "v${version}";
- sha256 = "1hyjjw9mxy73n3pkliaaif135h2sd4iy43pw9d5zynid5abnr3yz";
+ sha256 = "1m1shgnvwzzs0g6ph7rprwxd7w8zj0x4sbgiqsv9z41k6li7xj4r";
};
nativeBuildInputs = [ poetry ];
diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix
index d27a10af20c6..8ee8337bea2a 100644
--- a/pkgs/applications/misc/kdbplus/default.nix
+++ b/pkgs/applications/misc/kdbplus/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
dontStrip = true;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}";
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 6388d005fe55..843193bba182 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -12,8 +12,8 @@ with builtins; buildDotnetPackage rec {
sourceRoot = ".";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip icoutils ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ icoutils ];
patches = [
(substituteAll {
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 08bf01aea611..691ebb4ba682 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,7 +1,6 @@
{ lib
, boost
, fetchFromGitHub
-, fetchpatch
, installShellFiles
, mkDerivationWith
, muparser
@@ -11,36 +10,20 @@
, qtsvg
, qttools
, runtimeShell
-, gcc8Stdenv
+, stdenv
}:
-let
- stdenv = gcc8Stdenv;
-in
-
- # Doesn't build with gcc9
mkDerivationWith stdenv.mkDerivation rec {
pname = "librecad";
- version = "2.2.0-rc1";
+ version = "2.2.0-rc2";
src = fetchFromGitHub {
owner = "LibreCAD";
repo = "LibreCAD";
rev = version;
- sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
+ sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE=";
};
- patches = [
- ./fix_qt_5_11_build.patch
- (
- fetchpatch {
- # Fix missing app name and icon on Wayland.
- url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch";
- sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5";
- }
- )
- ];
-
postPatch = ''
substituteInPlace scripts/postprocess-unix.sh \
--replace /bin/sh ${runtimeShell}
@@ -88,16 +71,11 @@ mkDerivationWith stdenv.mkDerivation rec {
qttools
];
- enableParallelBuilding = true;
-
meta = with lib; {
description = "2D CAD package based on Qt";
homepage = "https://librecad.org";
- license = licenses.gpl2;
- maintainers = with maintainers; [
- kiwi
- viric
- ];
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ kiwi viric ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
deleted file mode 100644
index 04701e5ab1ee..000000000000
--- a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
-index 835e47d..2c878e8 100644
---- a/librecad/src/ui/forms/qg_commandwidget.cpp
-+++ b/librecad/src/ui/forms/qg_commandwidget.cpp
-@@ -27,6 +27,7 @@
-
- #include
-
-+#include
- #include
- #include
- #include
-diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp
-index 2beaceb..84068ad 100644
---- a/librecad/src/ui/generic/colorwizard.cpp
-+++ b/librecad/src/ui/generic/colorwizard.cpp
-@@ -27,6 +27,7 @@
- #include "colorwizard.h"
- #include "ui_colorwizard.h"
-
-+#include
- #include
- #include
- #include
-diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
-index 7c35144..0e394f2 100644
---- a/librecad/src/ui/generic/widgetcreator.cpp
-+++ b/librecad/src/ui/generic/widgetcreator.cpp
-@@ -27,6 +27,7 @@
- #include "widgetcreator.h"
- #include "ui_widgetcreator.h"
-
-+#include
- #include
- #include
- #include
diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
new file mode 100644
index 000000000000..6595cb3a913f
--- /dev/null
+++ b/pkgs/applications/misc/logseq/default.nix
@@ -0,0 +1,52 @@
+{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }:
+
+stdenv.mkDerivation rec {
+ pname = "logseq";
+ version = "0.0.13";
+
+ src = fetchurl {
+ url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
+ sha256 = "0a7c33f7d5ylcy6lqkpxp78wwyi4n5q4jdy7b8nx7p34sn2jnpf7";
+ name = "${pname}-${version}.AppImage";
+ };
+
+ appimageContents = appimageTools.extract {
+ name = "${pname}-${version}";
+ inherit src;
+ };
+
+ dontUnpack = true;
+ dontConfigure = true;
+ dontBuild = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/share/${pname} $out/share/applications
+ cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
+ cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop
+
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace Exec=Logseq Exec=${pname} \
+ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+ --add-flags $out/share/${pname}/resources/app
+ '';
+
+ passthru.updateScript = ./update.sh;
+
+ meta = with lib; {
+ description = "A local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base";
+ homepage = "https://github.com/logseq/logseq";
+ license = licenses.agpl3Plus;
+ maintainers = with maintainers; [ weihua ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/misc/logseq/update.sh b/pkgs/applications/misc/logseq/update.sh
new file mode 100755
index 000000000000..9f83eefad191
--- /dev/null
+++ b/pkgs/applications/misc/logseq/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq '.[0].tag_name' --raw-output)"
+update-source-version logseq "$version"
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 800de77f1c57..7cab86df9671 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -3,12 +3,12 @@
}:
mkDerivation rec {
- version = "2.3.6";
+ version = "2.3.6.1";
pname = "lyx";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
- sha256 = "160whjwwrmxizdakjlkf9xc86bhqfnslw47fixgqq4qhbapcxxkg";
+ sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng=";
};
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix
index 83a7aabaef7b..c98d40ab2e14 100644
--- a/pkgs/applications/misc/marktext/default.nix
+++ b/pkgs/applications/misc/marktext/default.nix
@@ -25,7 +25,7 @@ appimageTools.wrapType2 rec {
multiPkgs = null; # no 32bit needed
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.libsecret
- p.xlibs.libxkbfile
+ p.xorg.libxkbfile
];
# Strip version from binary name.
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 1c87747eaca1..9ae6fda9fcec 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
};
nativeBuildInputs =
- [ autoconf automake doxygen lsb-release pkg-config qttools swig ];
+ [ autoconf automake doxygen lsb-release pkg-config qttools swig unzip ];
buildInputs = [
c-ares
cryptopp
@@ -53,7 +53,6 @@ mkDerivation rec {
qtbase
qtx11extras
sqlite
- unzip
wget
];
diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix
new file mode 100644
index 000000000000..de715bf315fc
--- /dev/null
+++ b/pkgs/applications/misc/metadata-cleaner/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, python3
+, fetchFromGitLab
+, appstream
+, desktop-file-utils
+, glib
+, gobject-introspection
+, gtk3
+, libhandy
+, librsvg
+, meson
+, ninja
+, pkg-config
+, poppler_gi
+, wrapGAppsHook
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "metadata-cleaner";
+ version = "1.0.3";
+
+ format = "other";
+
+ src = fetchFromGitLab {
+ owner = "rmnvgr";
+ repo = "metadata-cleaner";
+ rev = "v${version}";
+ sha256 = "06dzfcnjb1xd8lk0r7bi4i784gfj8r7habbjbk2c4vn2847v71lf";
+ };
+
+ nativeBuildInputs = [
+ appstream
+ desktop-file-utils
+ glib
+ gtk3
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gobject-introspection
+ gtk3
+ libhandy
+ librsvg
+ poppler_gi
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ mat2
+ pygobject3
+ ];
+
+ meta = with lib; {
+ description = "Python GTK application to view and clean metadata in files, using mat2";
+ homepage = "https://gitlab.com/rmnvgr/metadata-cleaner";
+ license = with licenses; [ gpl3Plus cc-by-sa-40 ];
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index 23da8abc6682..a941f6251498 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -22,10 +22,9 @@ stdenv.mkDerivation {
cp bin/milu $out/bin
'';
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
glib
- unzip
llvmPackages.libclang
];
diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix
index bd5d96c599ce..f82881eb5bdf 100644
--- a/pkgs/applications/misc/mkgmap/default.nix
+++ b/pkgs/applications/misc/mkgmap/default.nix
@@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
- version = "4604";
+ version = "4608";
src = fetchurl {
url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
- sha256 = "HmQwi3kIVhZOQpSfG3V48vUTbncsJLb/YCqsXrmtmQM=";
+ sha256 = "uj/iZZHML4nqEKdFBQSDdegkalZFJdzEE4xQrOruEp0=";
};
patches = [
diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix
new file mode 100644
index 000000000000..666009b99a0b
--- /dev/null
+++ b/pkgs/applications/misc/moonlight-qt/default.nix
@@ -0,0 +1,59 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, wrapQtAppsHook
+, pkg-config
+, qmake
+, qtquickcontrols2
+, SDL2
+, SDL2_ttf
+, libva
+, libvdpau
+, libxkbcommon
+, alsaLib
+, libpulseaudio
+, openssl
+, libopus
+, ffmpeg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "moonlight-qt";
+ version = "3.1.0";
+
+ src = fetchFromGitHub {
+ owner = "moonlight-stream";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "e7fwb76zzidtF1COqrQ6gSF7bCX20j/CGjPu1Cb4HGc=";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ wrapQtAppsHook
+ pkg-config
+ qmake
+ ];
+
+ buildInputs = [
+ qtquickcontrols2
+ SDL2
+ SDL2_ttf
+ libva
+ libvdpau
+ libxkbcommon
+ alsaLib
+ libpulseaudio
+ openssl
+ libopus
+ ffmpeg
+ ];
+
+ meta = with lib; {
+ description = "Play your PC games on almost any device";
+ homepage = "https://moonlight-stream.org";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 61c395e64a9b..333e3cd93157 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -22,24 +22,28 @@ in stdenv.mkDerivation rec {
sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48";
};
- patches =
- lib.optional stdenv.isDarwin ./darwin.patch ++ [
+ patches = lib.optional stdenv.isDarwin ./darwin.patch ++ [
(fetchpatch {
- name = "pdfocr.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84";
- sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3";
- })
+ name = "pdfocr.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84";
+ sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3";
+ })
(fetchpatch {
- name = "pdf-layer.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54";
- sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm";
- })
+ name = "pdf-layer.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54";
+ sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm";
+ })
(fetchpatch {
- name = "pixmap.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603";
- sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj";
- })
- ];
+ name = "pixmap.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603";
+ sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj";
+ })
+ (fetchpatch {
+ name = "CVE-2021-3407.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a";
+ sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6";
+ })
+ ];
postPatch = ''
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 4a72eecf9b37..a39e8267cf7f 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -7,13 +7,13 @@ assert withNerdIcons -> withIcons == false;
stdenv.mkDerivation rec {
pname = "nnn";
- version = "3.5";
+ version = "3.6";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
- sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy";
+ sha256 = "1hwv7ncp8pmzdir30877ni4qlmczmb3yjdkbfd1pssr08y1srsc7";
};
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
@@ -22,10 +22,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ readline ncurses ];
- makeFlags = [
- "DESTDIR=${placeholder "out"}"
- "PREFIX="
- ] ++ lib.optional withIcons [ "O_ICONS=1" ]
+ makeFlags = [ "PREFIX=$(out)" ]
+ ++ lib.optional withIcons [ "O_ICONS=1" ]
++ lib.optional withNerdIcons [ "O_NERD=1" ];
# shell completions
@@ -38,6 +36,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Small ncurses-based file browser forked from noice";
homepage = "https://github.com/jarun/nnn";
+ changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG";
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ jfrankenau Br1ght0ne ];
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 66fef3361e5e..53aa786e0660 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.11.3";
+ version = "0.11.5";
src = fetchurl {
url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
- sha256 = "brpNQiWpIbvnPuCXrNJhBjgqPlhIb3dz3LFRf0M4K0Q=";
+ sha256 = "FxhvRRxV8oxRwvImftoSTqrus2x5p90NfuvddZjdBNU=";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix
index 2bb3d14e1d25..0a46393bd220 100644
--- a/pkgs/applications/misc/omegat.nix
+++ b/pkgs/applications/misc/omegat.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation {
sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o
diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix
index b3e93ce51271..d6b20a7f01e5 100644
--- a/pkgs/applications/misc/openjump/default.nix
+++ b/pkgs/applications/misc/openjump/default.nix
@@ -18,8 +18,7 @@ stdenv.mkDerivation {
cd $out; unzip $src
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
installPhase = ''
dir=$(echo $out/OpenJUMP-*)
diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index 37905b8e444a..404c95f52a85 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pdfsam-basic";
- version = "4.2.2";
+ version = "4.2.3";
src = fetchurl {
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
- sha256 = "sha256-fbcU3NZdQ8NR5tLjEJyOPneVWNMBddLdttLeVwIUtpg=";
+ sha256 = "sha256-WmJ+atndIXm5Z6RvRVSvf2de1Gda+cs5kSw4iotPVfU=";
};
unpackPhase = ''
diff --git a/pkgs/applications/misc/pdfslicer/default.nix b/pkgs/applications/misc/pdfslicer/default.nix
new file mode 100644
index 000000000000..31bc47140159
--- /dev/null
+++ b/pkgs/applications/misc/pdfslicer/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, gettext
+, intltool
+, pkg-config
+, wrapGAppsHook
+, gtkmm3
+, libuuid
+, poppler
+, qpdf
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pdfslicer";
+ version = "1.8.8";
+
+ src = fetchFromGitHub {
+ owner = "junrrein";
+ repo = "pdfslicer";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = "0sja0ddd9c8wjjpzk2ag8q1lxpj09adgmhd7wnsylincqnj2jyls";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ gettext
+ intltool
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtkmm3
+ libuuid
+ poppler
+ qpdf
+ ];
+
+ meta = with lib; {
+ description = "A simple application to extract, merge, rotate and reorder pages of PDF documents";
+ homepage = "https://junrrein.github.io/pdfslicer/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/misc/portfolio-filemanager/default.nix b/pkgs/applications/misc/portfolio-filemanager/default.nix
new file mode 100644
index 000000000000..6b4946976bf6
--- /dev/null
+++ b/pkgs/applications/misc/portfolio-filemanager/default.nix
@@ -0,0 +1,71 @@
+{ lib
+, python3
+, fetchFromGitHub
+, appstream-glib
+, desktop-file-utils
+, gettext
+, glib
+, gobject-introspection
+, gtk3
+, libhandy
+, librsvg
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "portfolio";
+ version = "0.9.10";
+
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "tchx84";
+ repo = "Portfolio";
+ rev = "v${version}";
+ sha256 = "06hk0kx6h8w263qa71bik68rg4r8qs94b6s60pyhzicfc822k0j4";
+ };
+
+ postPatch = ''
+ patchShebangs build-aux/meson
+ '';
+
+ nativeBuildInputs = [
+ appstream-glib
+ desktop-file-utils
+ gettext
+ glib
+ gobject-introspection
+ gtk3
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gobject-introspection
+ libhandy
+ librsvg
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ pygobject3
+ ];
+
+ postInstall = ''
+ ln -s dev.tchx84.Portfolio "$out/bin/portfolio"
+ '';
+
+ meta = with lib; {
+ description = "A minimalist file manager for those who want to use Linux mobile devices";
+ homepage = "https://github.com/tchx84/Portfolio";
+ changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix
index 3ee87d58c083..14141ca1ea37 100644
--- a/pkgs/applications/misc/pure-maps/default.nix
+++ b/pkgs/applications/misc/pure-maps/default.nix
@@ -1,7 +1,7 @@
-{ lib, mkDerivation, fetchFromGitHub, wrapQtAppsHook
+{ lib, mkDerivation, fetchFromGitHub
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors
, nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry
-, python3, pyotherside, python3Packages
+, python3, pyotherside
}:
mkDerivation rec {
@@ -16,12 +16,14 @@ mkDerivation rec {
fetchSubmodules = true;
};
- nativeBuildInputs = [ qmake python3 qttools wrapQtAppsHook ];
+ nativeBuildInputs = [
+ qmake python3 qttools python3.pkgs.wrapPython
+ ];
+
buildInputs = [
kirigami2 qtquickcontrols2 qtlocation qtsensors
nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry
];
- propagatedBuildInputs = with python3Packages; [ gpxpy pyxdg ];
postPatch = ''
substituteInPlace pure-maps.pro \
@@ -30,10 +32,11 @@ mkDerivation rec {
qmakeFlags = [ "FLAVOR=kirigami" ];
- dontWrapQtApps = true;
- postInstall = ''
- wrapQtApp $out/bin/pure-maps \
- --prefix PYTHONPATH : "$out/share"
+ pythonPath = with python3.pkgs; [ gpxpy ];
+
+ preInstall = ''
+ buildPythonPath "$pythonPath"
+ qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
'';
meta = with lib; {
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index c6b9d82bcf41..6b2418ab57cd 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -15,16 +15,17 @@
mkDerivationWith stdenv.mkDerivation rec {
pname = "qcad";
- version = "3.25.2.0";
+ version = "3.26.0.1";
src = fetchFromGitHub {
owner = "qcad";
repo = "qcad";
rev = "v${version}";
- sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz";
+ sha256 = "sha256-V+QlwM8BWmcarwZtqJfc+MYHOZgIH1W5R8m2EHhNJls=";
};
patches = [
+ # Patch directory lookup, remove __DATE__ and executable name
./application-dir.patch
];
@@ -90,12 +91,10 @@ mkDerivationWith stdenv.mkDerivation rec {
qttools
];
- enableParallelBuilding = true;
-
meta = with lib; {
description = "2D CAD package based on Qt";
homepage = "https://qcad.org";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ yvesf ];
platforms = qtbase.meta.platforms;
};
diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index fafd91f7811c..1bdcd6ea8a6f 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -31,6 +31,5 @@ mkDerivation {
homepage = "https://centrabit.com/";
license = licenses.gpl3;
platforms = qt5.qtbase.meta.platforms;
- maintainers = [ maintainers.ehmry ];
};
}
diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix
index bdb589d8f95e..279d3e4b15d9 100644
--- a/pkgs/applications/misc/reddsaver/default.nix
+++ b/pkgs/applications/misc/reddsaver/default.nix
@@ -8,22 +8,22 @@
rustPlatform.buildRustPackage rec {
pname = "reddsaver";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "manojkarthick";
repo = "reddsaver";
rev = "v${version}";
- sha256 = "0kww3abgvxr7azr7yb8aiw28fz13qb4sn3x7nnz1ihmd4yczi9fg";
+ sha256 = "0ffci3as50f55n1v36hji4n0b3lkch5ylc75awjz65jz2gd2y2j4";
};
- cargoSha256 = "09xm22vgmd3dc0wr6n3jczxvhwpcsijwfbv50dz1lnsx57g8mgmd";
+ cargoSha256 = "1cx3sqr7zb1vlfdvbcxp0yva9xh654qczpy8s09c8cviy8hac5sr";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
- # package does not contain tests as of v0.3.1
+ # package does not contain tests as of v0.3.2
docCheck = false;
meta = with lib; {
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix
index eac131d6ef72..b7eb2367528d 100644
--- a/pkgs/applications/misc/regextester/default.nix
+++ b/pkgs/applications/misc/regextester/default.nix
@@ -6,7 +6,7 @@
, pkg-config
, glib
, gtk3
-, gnome3
+, libgee
, meson
, ninja
, gobject-introspection
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
pantheon.elementary-icon-theme
pantheon.granite
glib
- gnome3.libgee
+ libgee
gsettings-desktop-schemas
gtk3
];
diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index 30fd51fa9905..1b19d9ab9cc0 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -1,19 +1,23 @@
-{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, libGL,
+{ lib, stdenv, fetchurl, curl, zlib, glib, xorg, dbus, fontconfig, libGL,
freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
+let
+ curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
+in
+
stdenv.mkDerivation rec {
pname = "robo3t";
- version = "1.3.1";
- rev = "7419c406";
+ version = "1.4.3";
+ rev = "48f7dfd";
src = fetchurl {
- url = "https://download-test.robomongo.org/linux/robo3t-${version}-linux-x86_64-${rev}.tar.gz";
- sha256 = "1mp5i8iahd4qkwgi5ix98hlg17ivw5da27n0drnr0wk458wn99hi";
+ url = "https://github.com/Studio3T/robomongo/releases/download/v${version}/robo3t-${version}-linux-x86_64-${rev}.tar.gz";
+ sha256 = "sha256-pH4q/O3bq45ZZn+s/12iScd0WbfkcLjK4MBdVCMXK00=";
};
icon = fetchurl {
- url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png";
- sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2";
+ url = "https://github.com/Studio3T/robomongo/raw/${rev}/install/macosx/robomongo.iconset/icon_128x128.png";
+ sha256 = "sha256-2PkUxBq2ow0wl09k8B6LJJUQ+y4GpnmoAeumKN1u5xg=";
};
desktopItem = makeDesktopItem {
@@ -43,6 +47,7 @@ stdenv.mkDerivation rec {
fontconfig
freetype
libGL
+ curlWithGnuTls
];
installPhase = ''
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index 6115544e79fc..2f98fe164161 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -1,4 +1,4 @@
-{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [] }:
+{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }:
symlinkJoin {
name = "rofi-${rofi-unwrapped.version}";
@@ -29,6 +29,8 @@ symlinkJoin {
${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \
${lib.optionalString (plugins != []) ''--add-flags "-plugin-path $out/lib/rofi"''}
+ ${lib.optionalString symlink-dmenu "ln -s ${rofi-unwrapped}/bin/rofi $out/bin/dmenu"}
+
rm $out/bin/rofi-theme-selector
makeWrapper ${rofi-unwrapped}/bin/rofi-theme-selector $out/bin/rofi-theme-selector \
--prefix XDG_DATA_DIRS : $out/share
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 840b37351c79..5032836ab9f3 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -17,10 +17,10 @@ let
pname = "simplenote";
- version = "2.2.0";
+ version = "2.8.0";
sha256 = {
- x86_64-linux = "123b0fh14068s2z3k6s5mmh46xwlz02qfnpmj838zlm5hckjmifv";
+ x86_64-linux = "sha256-W8+LzWMPDCrFZCm9p/Gcj7OXqJw/gs7lMxTKjOQChQY=";
}.${system} or throwSystem;
meta = with lib; {
diff --git a/pkgs/applications/misc/sunwait/default.nix b/pkgs/applications/misc/sunwait/default.nix
new file mode 100644
index 000000000000..c9581fe79f6c
--- /dev/null
+++ b/pkgs/applications/misc/sunwait/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+ pname = "sunwait";
+ version = "2020-10-26";
+
+ src = fetchFromGitHub {
+ owner = "risacher";
+ repo = "sunwait";
+ rev = "102cb417ecbb7a3757ba9ee4b94d6db3225124c4";
+ sha256 = "0cs8rdcnzsl10zia2k49a6c2z6gvp5rnf31sgn3hn5c7kgy7l3ax";
+ };
+
+ installPhase = ''
+ install -Dm755 sunwait -t $out/bin
+ '';
+
+ meta = with lib; {
+ description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights";
+ homepage = "https://github.com/risacher/sunwait";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ etu ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix
index 2c5db1fe15ab..7904af3e7e15 100644
--- a/pkgs/applications/misc/surface-control/default.nix
+++ b/pkgs/applications/misc/surface-control/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "surface-control";
- version = "0.3.1-1";
+ version = "0.3.1-2";
src = fetchFromGitHub {
owner = "linux-surface";
repo = pname;
rev = "v${version}";
- sha256 = "0wclzlix0a2naxbdg3wym7yw19p2wqpcjmkf7gn8cs00shrmzjld";
+ sha256 = "sha256-SLJ4mwBafLGL5pneMTHLc4S4Tgds2xLqByWFH95TK1k=";
};
- cargoSha256 = "0vi26v9mvx298kx6k5g7h8dnn7r208an9knadc23vxcrrxjr6pn5";
+ cargoSha256 = "sha256-a+4oOkO90TObfYnq9NZsWy5RmYFYN1BKvUKxpvjiJc8=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix
index d024eb031e30..fd37a692d841 100644
--- a/pkgs/applications/misc/ticker/default.nix
+++ b/pkgs/applications/misc/ticker/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ticker";
- version = "3.1.9";
+ version = "4.0.3";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/OpDcsRIwuj1bvtpPyk1Qc9QZGJMLiOLj8NBfbT7hdo=";
+ sha256 = "sha256-YVpspFBwao/7M2nTVMw+ANc0roL0vBO4DpNUb7Thp3Q=";
};
- vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo=";
+ vendorSha256 = "sha256-nidOIjrTL4llV5GORebXOOPGeL6TxkurDY82cIc7+mU=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}")
diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix
index c789dbdce782..8866e2a07c2e 100644
--- a/pkgs/applications/misc/tickrs/default.nix
+++ b/pkgs/applications/misc/tickrs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tickrs";
- version = "0.14.1";
+ version = "0.14.4";
src = fetchFromGitHub {
owner = "tarkah";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-FbbxkAP1RQVYL91mlAw0PcEWUDxgCrCd9QjLPE+bqmo=";
+ sha256 = "sha256-OOsBo+NCfn++2XyfQVoeEPcbSv645Ng7g9s4W7X2xg4=";
};
- cargoSha256 = "sha256-94U84/UxHAf5yrCnqpxjwHi/ekFHbFBs9b7pBewKvjw=";
+ cargoSha256 = "sha256-PW8f4PZGctHd8YBBRvmueR8UgtyDQZpqf2lTU1t68iM=";
nativeBuildInputs = [ perl ];
diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix
index a402a669fbea..08c88e376bb6 100644
--- a/pkgs/applications/misc/tty-share/default.nix
+++ b/pkgs/applications/misc/tty-share/default.nix
@@ -3,13 +3,13 @@
# Upstream has a `./vendor` directory with all deps which we rely upon.
buildGoPackage rec {
pname = "tty-share";
- version = "2.0.0";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "elisescu";
repo = "tty-share";
rev = "v${version}";
- sha256 = "1d2vd3d1lb4n0jq4s0p5mii1vz4r3z36hykr5mnx53srsni1wsj5";
+ sha256 = "sha256-+bdQ7KyGEdJJAopzGnDOcLvFNyiKqpagPR1EoU1VR5E=";
};
goPackagePath = "github.com/elisescu/tty-share";
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 12ac72b6021a..20ed6d55f366 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "worker";
- version = "4.5.0";
+ version = "4.7.0";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
- sha256 = "02xrdg1v784p4gfqjm1mlxqwi40qlbzhp68p5ksj96cjv6av5b5s";
+ sha256 = "sha256-9x/nHd2nUeFSH7a2qH4qlyH4FRH/NfNvTE1LEaMMSwU=";
};
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 4a7b7ad63b75..962059600a4c 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "wtf";
- version = "0.35.0";
+ version = "0.36.0";
src = fetchFromGitHub {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xzMXbF0M7asZtyo8DmM5yyNoHKy0H6amRDhu6hjHgq4=";
+ sha256 = "sha256-JVHcunpS+2/0d7XaUZ95m9QpVHCG1Tq8LJ9KNURSRy8=";
};
- vendorSha256 = "sha256-6ij0NQMjDnZJhuqkUR7MdBLAMS5Xa2HKIgQjegKJyvc=";
+ vendorSha256 = "sha256-4uRhbRPfCRYwFlfucXOYhLruj7hkV4G9Sxjh9yQkDEQ=";
doCheck = false;
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index f3764ce60f3f..a7037522c627 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xchm";
- version = "1.31";
+ version = "1.32";
src = fetchFromGitHub {
owner = "rzvncj";
repo = "xCHM";
rev = version;
- sha256 = "1mzafbpc1c211byf8bnwl13by7vi8xvxlaykyrajb1bj0ynbmmgp";
+ sha256 = "sha256-Ss8kdfUAMC8v05rdt2SoO6vPyssG5v8gOzdf/v18cdg=";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index d787705be159..05f6c2b6a65e 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -6,7 +6,7 @@
, jbig2dec
, libjpeg
, mupdf
-, openjpeg_2
+, openjpeg
, pkg-config
, zathura_core
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
jbig2dec
libjpeg
mupdf
- openjpeg_2
+ openjpeg
zathura_core
] ++ lib.optional stdenv.isDarwin gtk-mac-integration;
diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix
index 4b9627a843bd..eb8c81dae7e8 100644
--- a/pkgs/applications/misc/zettlr/default.nix
+++ b/pkgs/applications/misc/zettlr/default.nix
@@ -1,5 +1,10 @@
-{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas
-, texlive, pandoc, pandoc-citeproc
+{ appimageTools
+, lib
+, fetchurl
+, gtk3
+, gsettings-desktop-schemas
+, texlive
+, pandoc
}:
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
@@ -14,7 +19,8 @@ let
appimageContents = appimageTools.extractType2 {
inherit name src;
};
-in appimageTools.wrapType2 rec {
+in
+appimageTools.wrapType2 rec {
inherit name src;
profile = ''
@@ -22,7 +28,7 @@ in appimageTools.wrapType2 rec {
'';
multiPkgs = null; # no 32bit needed
- extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ];
+ extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraInstallCommands = ''
mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 430f9e38e266..f544660913f3 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.21.74";
+ version = "1.21.77";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "2csyjwn5j5+cRmjq0+gHLWvIVjtaSaN9rVZ8ikI0gec=";
+ sha256 = "Q7paeGAvdmc4+FP28ASLlJhN1ui7M5fDpxnrh+gbEm4=";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index c4a5508b7537..989368f198ca 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -89,5 +89,6 @@ mkChromiumDerivation (base: rec {
then ["aarch64-linux" "x86_64-linux"]
else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
+ broken = elem channel [ "beta" "dev" ]; # Build requires LLVM 12
};
})
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index cf2fedde97e2..c1b5711b02e4 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -13,7 +13,6 @@
, gnomeKeyringSupport ? false
, proprietaryCodecs ? true
, enableWideVine ? false
-, enableVaapi ? false # Disabled by default due to unofficial support
, ungoogled ? false # Whether to build chromium or ungoogled-chromium
, cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux
@@ -167,8 +166,7 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin"
eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
- --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
- ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"}
+ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)}
ed -v -s "$out/bin/chromium" << EOF
2i
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 8caa446b0464..723ea6235c2f 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "90.0.4430.19",
- "sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa",
- "sha256bin64": "0z665iykdsmjrjbijsrcq80y2anvcfykasznf8w4brg9l9k59wv8",
+ "version": "90.0.4430.40",
+ "sha256": "0n7g4j981h3fn5wgpb3azpili9682nq0yikhd4z7dr7agvpnfr3k",
+ "sha256bin64": "120rbh8bpcj3z5kqdaicqnsd2mh0xcr8y1411kl0zpwa6hfvgm3r",
"deps": {
"gn": {
"version": "2021-02-09",
@@ -31,22 +31,22 @@
}
},
"dev": {
- "version": "91.0.4442.4",
- "sha256": "0cmm2pimkghb6s956bkqf2k77lj69dz51nlydgkqbvw0sc8n784k",
- "sha256bin64": "1hbfx8n51p7dwwz1vbp94jdmlb96vvxrbql2af4kmvx1bmzr2ism",
+ "version": "91.0.4455.2",
+ "sha256": "0nqw1jxysyl72dg2bqls7w9cm366j6i1p4sadf3s5vc0i7yr7h3i",
+ "sha256bin64": "0d7s7bg58489ph4i92yj4vkww0cl7473pk9sir64gcmm9z18yjc3",
"deps": {
"gn": {
- "version": "2021-02-09",
+ "version": "2021-03-12",
"url": "https://gn.googlesource.com/gn",
- "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
- "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
+ "rev": "64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8",
+ "sha256": "14whk4gyx21cqxy1560xm8p1mc1581dh9g7xy120g8vvcylknjlm"
}
}
},
"ungoogled-chromium": {
- "version": "89.0.4389.82",
- "sha256": "0yg33d6zldz3j1jghhdci63fn46i10dkz3nb95jdrbv8gd018jfz",
- "sha256bin64": "1sqzzillq38qyh85449ncz8bni93mjxb6r4z8y5h8k2w3j38jc0q",
+ "version": "89.0.4389.90",
+ "sha256": "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi",
+ "sha256bin64": "1hgpx7isp9krarj7jpbhs97ym4i9j9a1srywv9pdfzbhw6cid2pk",
"deps": {
"gn": {
"version": "2021-01-07",
@@ -55,8 +55,8 @@
"sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
},
"ungoogled-patches": {
- "rev": "89.0.4389.82-1",
- "sha256": "183w22q6mpmw7s1l65dzvc5i422vl7qax6q4xpgr3krcx4y00878"
+ "rev": "89.0.4389.90-1",
+ "sha256": "0pr756d1b4wc67d61b21yszi7mx1hsjy14i44j0kvcwm05pgnf79"
}
}
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index f1b1b26ae3a2..72e9746421b3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -33,6 +33,7 @@
, nspr
, nss
, pango
+, pciutils
, libheimdal
, libpulseaudio
, systemd
@@ -125,6 +126,7 @@ stdenv.mkDerivation {
nspr
nss
pango
+ pciutils
libheimdal
libpulseaudio
systemd
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 07a2caca85d6..0971dd3b63fc 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,975 @@
{
- version = "86.0";
+ version = "87.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ach/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ach/firefox-87.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "96cf6afb631f36dd18f0d109bfc31abbff5960e7972b59e4fa51ac0c2c81f9ed";
+ sha256 = "656c92c9a588aed2059f4f68968735f884db6ee94b0619d983bd4affd2100174";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/af/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/af/firefox-87.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "38d4588b8498917717ea58419a35751c6c3ae987372ee6a37590a7630eb68c35";
+ sha256 = "0f8fe2b470177df3525fbf533934c66a5e4abdaa3dfb7848962ac148b224592d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/an/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/an/firefox-87.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "942c9cf4dc6f5baa6c5225a15a2856bd72c7366bcb6224b8ba5a1428cfd974f6";
+ sha256 = "a96ae593965364871d35ba0fd6dcd1029254110ee59f4a7abe27cf6d273c7be6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ar/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ar/firefox-87.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "a616e3dfac2bcae832bc6538692a9d811604aadb71079641f77f9b3db105fabd";
+ sha256 = "58eaefaba44b4b0592442e709604b597c74fd81390f8fcc410a8e605956a0bdd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ast/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ast/firefox-87.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "0e026de4affddbdf9e5915818c02acb018b214cd005c5122593e86e821919016";
+ sha256 = "ca33473b77b8a57c305fe89cdd66b95810441aa54295ed687736a24c9160e45f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/az/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/az/firefox-87.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "761e129a070f017b28ce51c1f96fa95be8d98e687b44e9e97d95d18db85ad9aa";
+ sha256 = "6965f0b68279228a575dfb503eabae8d75f32e0fa8de119f4d48f0e9ec36d61c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/be/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/be/firefox-87.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "9e80115c8a78ab5ff3eec38e31c1ec29decba3660ebc95cb909aedf3db4390ab";
+ sha256 = "a19d6d94cc15d269dbddccae06b4c92a3436e57d45dbebe8c6a2ff23df66fd28";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bg/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bg/firefox-87.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "b5149b21a8ae9b08ee3abfa2fdb894582e620464af36037c43c2cd0b6667c174";
+ sha256 = "885a44cf0acedc5ffbfcc73cce41f6eb2dcab13d070eeb156e64277b346a4fb1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bn/firefox-87.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "0b5ed8e2859e54ce7d64ac8b0626c69229209cfadf14e8d55225272f702a6f8f";
+ sha256 = "09773257768f061819fa92ec229c1f94b217c04e78781d8e59a8dc1225f92be7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/br/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/br/firefox-87.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "7fb1cdb85510bb8e41f2ce5e856a0ef93c83c430bbe64079a2e3c362bd557ab0";
+ sha256 = "23ec95e130593c51384a64165c33f02c4c5af753313fbaf8fa0f94bca1184506";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bs/firefox-87.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "2259ddd7f35d5a8d8830a429f0dec92da5ee101d5c42ff5d9f8ff003f76e5b8a";
+ sha256 = "30455df45e86894fd5a75ef6b9989b64f49da8ac8bee9656ea2724cfca59555c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca-valencia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ca-valencia/firefox-87.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "5214a48525eabc0ae4cda08e70ceba59b0e9fd51976d578f512b02fefbf48b8c";
+ sha256 = "8ca8a4ee40ac57140560c3aeb664d60be5ecd8842f328544924a97d910c02303";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ca/firefox-87.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "250f4bf5659a04dfb20a651899a92bccd9d24c2e9d3186bb17acc4f452b0b648";
+ sha256 = "3cc1cd1c7657a704d3c6c1a42934eac75439c05af5617d2d24991d62d412237e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cak/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cak/firefox-87.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "959c3cf7aace0b80adc6ae2bedc578b74de66adf261de7b67654e0c57e6ee2f5";
+ sha256 = "160c598f55c012fc92c0882f7062a82b8057177398edfcdeb41c60aa83570f1f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cs/firefox-87.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "aaed7891e891ba8926ed5904a798e6201cbc355ba11c341546f779e0f2815abc";
+ sha256 = "1209d5401b55441126bcc64faa9d7692c92d2c009a40587923c048bec0cf2508";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cy/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cy/firefox-87.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "064c2419e8fd43e350e055d7bcd4ae1689c4f7667b51996be9037bc4d1c529a3";
+ sha256 = "d177530e3e31900a38e9127b5d60bcc3b937c76e8b12b13c289a29e2afd06c40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/da/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/da/firefox-87.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "484f1bdd24689a7a7dd7a8b4556b2f32aeb50509aa3f9d645e151dbfaab9e71b";
+ sha256 = "2e623b11e18d38dee391863115af75fae4119894a89606aa6f4194d04a1773c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/de/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/de/firefox-87.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "12670011be25e5420a5721e23d1e37592e4d1ca9a2efac85db02545398454e65";
+ sha256 = "a29837d6c062ded4aed732cee06fe23773a57d62aecbca1e1a56c9d7a37423df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/dsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/dsb/firefox-87.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "2851664d7d9dd90f8e444e13b5c9f20bd6271b6e77ae857db1e3aa55429b8b83";
+ sha256 = "cf584f97b136444861845bf1db0fe9d65d809f4a167a0f8bed780f94048fbb12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/el/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/el/firefox-87.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "ec24c6634f20da95f820623c32d92f492f2b939280a49e327a1f465b0046632f";
+ sha256 = "73d03707575ef3270f7419d031fc85babdc498b1576d316abac273cd88dde30b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-CA/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-CA/firefox-87.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "6c5a19ac4ac5f174569483ee5c1f053e692efc189edfca7e78f9428f05454338";
+ sha256 = "1d11c8a1f23df4e88668beecee244f2d0743b006e46d96e4a6a35bffc341569d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-GB/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-GB/firefox-87.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "919d6e6c731d53ade97bbb330cd2e425f70565c330233a86ffe9295ff3692001";
+ sha256 = "d885931198cf3958fca683ee4c301f25610f6b4d5777068fd812bd53048aecb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-US/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-US/firefox-87.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "c643dd519fe8b0b6d2d2241b5c241aa1b43ece397f49268865b4d1888c19173e";
+ sha256 = "3c9207bee0a998634c4fd12293acfae207d16508749ad405bf1e8717d06acf02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eo/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/eo/firefox-87.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "d20b007ba86bdfdd7aa4bdaae08b283107a4464d88a4a9fc34bd4c95781f48d3";
+ sha256 = "3d57787fc840f80271f4d26810f347929a96479ca58bd416bf1f94e3499a07b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-AR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-AR/firefox-87.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "3d4ed05801d31a92c072384e660d7b874be835edd3b6b37741b71bec32a0fa6f";
+ sha256 = "294c83cce5bbead7c263e950ed8bb2787d4735f4086521726400ef97c5d26b35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-CL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-CL/firefox-87.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "8ec51d79baefe2808024c33105fd4c1a8e4f5061b72530a4c01bc8a23d6b6cd5";
+ sha256 = "4e57c8a517084eee27edb6ad706a250ebb323419407f1ef9c9f9ae4f0dc8d8b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-ES/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-ES/firefox-87.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "38781952508f86d9b4aa7a0c4fae927494e207970e54ba1070943008283c2e23";
+ sha256 = "9cdea632b1c1365d3c6ec08e9acd154819d081f025473b027da8d5e873da66bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-MX/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-MX/firefox-87.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "29817ccf3aad1e38f195f18ab628bca8f9bc4dcd931919cdd9d5d22c6461ce87";
+ sha256 = "3698541ca4e9eb7f5c422082cbacd407870ffb170c9f9d0fe5f0c55dfe2b5449";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/et/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/et/firefox-87.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "d4ddde9103e9355a91186e0343315f99bf0eb53b2502abb80b8fcb1056ea82e2";
+ sha256 = "86a1986a7c63f63c559d36d3d42e95def0eb8a89075879c3253156e80ed161c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/eu/firefox-87.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "85744b3d7e3bcd5de92ca4ec5a0ade8421689dda5a3c53e361656f3de3178a91";
+ sha256 = "5db12874991a1583ec09c934e18c93225b9831acc857d8c1b633f48c65e7a415";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fa/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fa/firefox-87.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "60e6ebb40f1e11a61ad63d2543acd7d83cef58c0fd4dc22f1c553749a36e3fb8";
+ sha256 = "5066d7b66933924442d683aaa19aec9385b66eaf49a55b155653ffba57c287d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ff/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ff/firefox-87.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "878d7155fe73ff6585e8566399416361a39080cb54afd61448e1bd0e191046a0";
+ sha256 = "35c8271fa506fcb43c20ccafb928b109125f3a17f80870a82365bc36f787b5ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fi/firefox-87.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "d02f24944f5bbd57273e05aa4fe701b375ad8d8905d0070ec9396a55d104203d";
+ sha256 = "a3a0dc8cee1db20eb795aea5e94efafc96fc624e50159d8be7f449a093ffd291";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fr/firefox-87.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "ac6497f8a4bfa4e37798840bf4dc9b84463bf095074d2ba3c931e89a402a3fc8";
+ sha256 = "d9c1cdbbe2bacb06608f60745ab213cf80b27051c6b58f0ed7ef834b839da7fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fy-NL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fy-NL/firefox-87.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "456ff8a1bed8769cd9fc05b29ed23edd29c48514dda4e73ac8e8663593cc3b4b";
+ sha256 = "6f15a66cee03b494edf6a68641e0d5f886fe8528e23b9e129b11702cb9a4442e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ga-IE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ga-IE/firefox-87.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "b0778c1217f9ee6e631c62ef024991212cb679a43394e07401a5f61ca2b88459";
+ sha256 = "31fcb9d815afc52db6328b076d89eab85a89d4553748ee7741912d23c420fea2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gd/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gd/firefox-87.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "37eba79d0db2bf84faa2d89efa0c5b9b34f7fc732636f4b436a3e118792ba610";
+ sha256 = "c9d0b868022bf5c0335ed488df0d6006541cdb7609f8854aedf22b931017ed31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gl/firefox-87.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "ef06e70653f712c4ab594a00c4d571ba098db740ff508cf78e08e859123096dc";
+ sha256 = "b546355345950e17202c4f2676731b0fe126d4d551131648f10e8c61cb8a2f26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gn/firefox-87.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "c7bbe33c8f839b24ee6928d74d5b0cff18918ab5f2a55e4b3bc1319049b19e4b";
+ sha256 = "51c403ad0460db69e2ed6213410d9fe2cb6ae9a5f100bd4f5ac7d36cc68b65c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gu-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gu-IN/firefox-87.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "71ceee81509cb6d505b836dd494eb9dba73857aa2c976ec1aab2fa57a50f1519";
+ sha256 = "dad776c9a4809c574967bb18d1ef96ab8eb5e95df713fe88fce044b755951550";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/he/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/he/firefox-87.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "cca354d947d83c616035fdd64019b50d1bb86c3d01e05090eae2d07953ae566b";
+ sha256 = "972135a17b091e8338762c4f3e9c60d826dd8b4f4e65c22d6cb07daabac95558";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hi-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hi-IN/firefox-87.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "a151d3a3d85f0cf96837f51b2a0df9a0a9652148dbcb53733025e15686451669";
+ sha256 = "5eec4571d25c0c62a0d773af25b2be93d158e06302a6e5d47a0fa60f0819941a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hr/firefox-87.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "00e3301bef430e243c6516d5c94e0b5fe6e27ca58fd0192955423956395fb2d4";
+ sha256 = "3183694fccb7a9560911d3d0813bf22ef79e1fdc8e72a5547258ff28b5ddbb6a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hsb/firefox-87.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "34c2666668499c8034e732565b244fc5b0cc7b0f544296be1e86942aa62b9167";
+ sha256 = "82c02b623b0833468950a174a6c46bbf6c657252f0f876abb48e5b839a51f0c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hu/firefox-87.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "d33f5467d9be5a2c6317a10fbd5285c4db7ed4191ceddc317d4ec923bd6ef7df";
+ sha256 = "0db68343a32b3a69b323b8cf7eade47a453499e092eae5d57414739e2ea92619";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hy-AM/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hy-AM/firefox-87.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "a008343614e5fa43d8ce90ac5f2afc0bec98419d28efc191b836ce835b6f48a1";
+ sha256 = "65b9c3902feac56c5563fe24a8c1d0f3510fca9b90062f88e4072a0ef6258c06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ia/firefox-87.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "9140874f06ed6e135ae70fa40600b4e1e570b6dc6901191658870916f73d1c17";
+ sha256 = "50023eb339a5886cabdf7b71a65ab130fd0a5609cf18ceec9266100ce96e7c92";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/id/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/id/firefox-87.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "c1dea9043a7f06708498acfda90a7b166b1f7bf839bf86dc2fbb90cf7a00269f";
+ sha256 = "9a7279bcaeed8c6f6c44c4af728eddada5a96fd3c0204d10cd647d09721ec4e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/is/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/is/firefox-87.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "50a804f9b7dd594b8c449ce6dd137b5f2bce41ab29baa35f6a14977a5c7af486";
+ sha256 = "697d1ac2cbc467d8526b8cf6a525b21a22fecb78f421936901ed3ecf91911146";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/it/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/it/firefox-87.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "3ea5e01722a7a03a5dc498977410fd2cde90352b026489669bcb7ebaa571ffdf";
+ sha256 = "4f51f5c632f21a0b589e2c358972f69107ccde6a32c5619e5b9273cd54198e98";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ja/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ja/firefox-87.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "efac929a1ace0484b5bce056bbd3d3ff4f26f897d4b1739f128d1dfd91c3c375";
+ sha256 = "2ce4af36d057c26f8b9f95b3c578dc738ea9ee80fbbb20f0c7257312499fb3bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ka/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ka/firefox-87.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "95261b88327b5b20739d8adb2a99bb0de5d1311099e2d3fc0999405fbc918ae6";
+ sha256 = "9d4d54895d3237c7431c367a5c9fc07b99b11c91a1645e89fa7668111bb70ffd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kab/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kab/firefox-87.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "f7b4f440f27ab9141b24f2673e4b850193744d1fc03451c2134a6890b4884f37";
+ sha256 = "4e67ce270e0a56f5acbe61a22368bc011ccf420201716bd36f5aec42a5d477bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kk/firefox-87.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "652aeb8d66ffb884983a043ff1d2ba10ff3a03aafe8cd55217a8f6a8068a3e59";
+ sha256 = "c1f1feaad98c108f73d575c2b59c3ff2fa26f9fb97a8d30182aeb4bd587063b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/km/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/km/firefox-87.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "39deb82ca935780959e4a0f71d85cee3b90c6228237a508b239ad2a1f5a35a07";
+ sha256 = "f99973849aa9e9ca4f7534cc6eb3bb7ccd75cf95f600a4a124dd2750da16d2a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kn/firefox-87.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "886370871c27c6637a74e4d8ced9ef2a9ec5062a8aae45fad5fea1dc358e38f4";
+ sha256 = "4625c75234dfdd35aaa383ebcef3ba9e093c73aec2ca524a0f7b5b28a2438de1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ko/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ko/firefox-87.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "9acea882760a961e228344c2cac9dfdb8d40c6c4c874744a4f2fffc356f6499c";
+ sha256 = "d65454c1b36d26d7df7a1eb510f73e7fea47431c6e51dc2119ae6932e11f351e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lij/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lij/firefox-87.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "fd76e82cda32813d43d80ae4acaed5610882162d68e98b4ae47dd1ddc8487d82";
+ sha256 = "ef7668799697e1d9c35661f1f6c403307a6deb6b2f265a2906d8baa699c224a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lt/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lt/firefox-87.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "afcc203f0d080560364277e7cca0f4080c74011dfc0fe07c751124e341e5b729";
+ sha256 = "bd34fdcad69d3e0c79e226899d0df49e5244a4072446fd1cb7a290261f8473c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lv/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lv/firefox-87.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "1b8a5cc4941d669f12593dc078d6658751609bd094a3704e9a9949341413ba9d";
+ sha256 = "34c379fa36cb7d1de95c99bfae8476f57a40d6d041941ad1884a8314f8511499";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/mk/firefox-87.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "72d374b828e3316f119d592bde6ebfe91ac4907d63cde43f6391d4be81119bc4";
+ sha256 = "4a9020fd5864d35efda8ee36454d72392ef3d2e5c50f0bcd6e6f3326dc8fb984";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/mr/firefox-87.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "17a2dec82a1d89fe74e71f924a21bb175cdb89d801ba50e5f0f0b4625fdabc1d";
+ sha256 = "6195db5fcfb95148c243d7fa4675fac0467f1093191bbb02dba714723a4f833a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ms/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ms/firefox-87.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "9af2d0b5f81d573c8fed4ff54446b2f3a77080ccec5138b1d0e707fb1c37e164";
+ sha256 = "95410958dbe73ead9ef89fcd81bdc3bd0bc6079cb8997962fd43fa07c6b546c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/my/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/my/firefox-87.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "3a2815eed7a1288991c769045614cc50ec3fed2810ff143652092cd32aef5e1b";
+ sha256 = "c43a08c4410d7d5d48c29ebbb96765d45dcd20335125bc664f5593d56440e8f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nb-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nb-NO/firefox-87.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "a8255d1dffb5dcba012a15d5b0f62b9e6e4e60720ae6dc139c23f77aaf6ea99e";
+ sha256 = "7f39e801ca6ce05bf6398b914acff4a3cd9016503a4401f9b51f92bd4b2c6737";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ne-NP/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ne-NP/firefox-87.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "e1c563748ae230a44939d27d7fa246e63ad49d242df236082af2eb0c38af8046";
+ sha256 = "b3ccaa031229d8e369f1acedb49bd159d282cd771205beb2876a8c7d4fc90413";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nl/firefox-87.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "56ab4fedc5c3a71b91693d33eb70f79ba3f0095dda66eae44e3e15f885491d5c";
+ sha256 = "3647e87528883cd7bc3310000f77237dac6dc57b62b664c434b16b9bf736930c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nn-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nn-NO/firefox-87.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "216e2d4434c66fd4361114467ed5e4635342ed53b74eae287d1d69ba63ac85d6";
+ sha256 = "3a94b93c5bd68f82ff9d310295f6397b902390061d21c0560a0906415e7150f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/oc/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/oc/firefox-87.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "0f6822824131d1709c09de64643a9f6e3b03e30741d079f66229efdfb5096e21";
+ sha256 = "a6fcecb568052565e051879487b34fce54b0e3ca3cc761dd27749d949153523b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pa-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pa-IN/firefox-87.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "9a15f3ea177314500e72ef123ed9dc36bfb9e10b92e5ab20cdaa6e7e1fa3367f";
+ sha256 = "14b10789c0d94e60c85be5594a0a11654a31e60518c78c04e4bea2b5e64843bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pl/firefox-87.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "18d19ed1597d3862d08d6daf52dd1bfb8f21c005f7cc44ce4d2e8177b4509aee";
+ sha256 = "44aadea74c71dc86d7a5e0cbc04acbe2e26e46add5daaf0f8b31c4a17b439346";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-BR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pt-BR/firefox-87.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "287c3c117532b23e45d726d4541ee726056139e976bf43210f35b529834c3884";
+ sha256 = "057eb47c7f45a1c0005a508bb36ee04b3edfce0e23e175fa311c9f1cc49b7e03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-PT/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pt-PT/firefox-87.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "26915b7725a325db052cbc165454c34f19e7a1346aa400b1306234707bccdf9b";
+ sha256 = "dd33f93ef7acd1e183902bd85b292b7073beb9fca3b46279f0405bcd06016771";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/rm/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/rm/firefox-87.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "4d5c14e2607efc653f5cae75290332229286b5ee606da635871dc04e20495fc3";
+ sha256 = "dd7649d8de678648f54a6dab7a66246abb6b514ccb5044eebff5f6689bae99d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ro/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ro/firefox-87.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "a41bab63866e22712861a825aae272e3468470783f92c23117e1c116b9d66771";
+ sha256 = "bcbc82632f8a6802285f23bf0238738a5abe5e77d70596261cf7fbe6649c9560";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ru/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ru/firefox-87.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "edec67a8079f55c5f22b6928bf1d55a2e1d31aff931c9e41e503ff1b7acf2ecf";
+ sha256 = "bedcd965e2a460bbe2aef0fad6bfe524044ad29225d26009d5311b8796bcb64f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/si/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/si/firefox-87.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "0357b913e6528214f30ff5ffd4a0f1c0e26bf079d3afdc166a82ee24e8c099ad";
+ sha256 = "bb93e1dc7621094f32e385632844169a8dc51369be8c5ca459dc17708e1d1ed8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sk/firefox-87.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "5a38f953d93cf4cb8b4e2dbb0206fc0a9fa3262c55d91fa4cfc3a8605098403e";
+ sha256 = "d7dfbfcded930a7d8aa03e482c66004202824256255cf08aee5a84a41d825285";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sl/firefox-87.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "0c2c41f6d7c3f72e56cb84c921207a606f959993ec6a3cc5619bbb894ce6ef8a";
+ sha256 = "3ab06c56331850805e8e925deefb3cd0d21913fe88e04d6cd16ad9c59041d444";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/son/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/son/firefox-87.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "cfdedeaacf244b3bc63343f76ed817a165a15b2a727f04327581cd373e76ac86";
+ sha256 = "6b93d5b1eeaf64ed591a285b1384d63dec16f388609c845e12f4565ed2bb32af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sq/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sq/firefox-87.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "daac917a1e105b7871a0361db364558251b931898e08c36515c64269c760d6b4";
+ sha256 = "834a04d54a73886c58d0360c675b137b44a69b34003e5d77ba8516397e976874";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sr/firefox-87.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "c1993cabde0e7df92e45101bd62cd14a86d023763c48c18a7e00018dcfea282f";
+ sha256 = "d629d7004fd5c3298e61ec154c7983b8b7bcc4ee8552ebbd53df81eec85e5cb0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sv-SE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sv-SE/firefox-87.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "eb04be61ab3d029437f57dedbf1b66d0bfc6c0a9b29e41fe4fb7aec7b5ab47b0";
+ sha256 = "c3d19f42894dac47f78684ea1a9bc9d7a6fbfd51b4186bcb06679a6666a280e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ta/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/szl/firefox-87.0.tar.bz2";
+ locale = "szl";
+ arch = "linux-x86_64";
+ sha256 = "3572e4ef3dc20960e60f342e0dcbb4ca374c9184cf84c40d644c3677b8dbf4b8";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ta/firefox-87.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "fbd105183afb74dc7887dfe5cc0e518e96cb8bf79c53fc502d154bbaededacd7";
+ sha256 = "b2f40c2f906fa1cdc67ba12faaab62468e71b9c9ec1c28790db56a4728e5f897";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/te/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/te/firefox-87.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "e049b79ce8a81749caa83d6b42ae710414fe08ae2f28a2c1af7c7d47f83b24e0";
+ sha256 = "81f135e5b9e1c90cb22baee13c5ebd5d2a954f3d3a31be74489eb9bbf4dda7ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/th/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/th/firefox-87.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "2b3ca062e1e53d5fca726e5c5a9eb7a3a639e4f6e7f5b455bf33e305eda475cc";
+ sha256 = "dac4e7326e9a2b0c6eec8361ebcf23afc95087f5fabb964c7802856bd8de02cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/tl/firefox-87.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "0fce4ea1fc379ab87c0f565c12f8ee16205108048d7fe89d7850802653247c16";
+ sha256 = "9be7f3be1ebdfc19c8da8a70b1eef8108c6508dc6c37b39824ef11756f62768c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/tr/firefox-87.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "e0a1c0a5d31225fb6af2b5b2c4d7386dc10d9c5c56081c1282615cc8d5da51ba";
+ sha256 = "d7be3f1cab9759042cc30002063764dc66a9f622df71291daf93faa204090b02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/trs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/trs/firefox-87.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "129d9b5d54cc807664a27fba1fd4f003430bdccf0385cbb53ea77517ce30879f";
+ sha256 = "31b5dc1f40614975a8e3fa05caa0dd8dcab6b15dd0ff1ac4626d9c19b3e763ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/uk/firefox-87.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "d50f3c3f21af6c805bc8c86f886af9f1be2b2d5cb5ad061a000633fa9b7e2641";
+ sha256 = "a53842d484e2a632931a72b16b3c8e30c902dc1e46c3cf2a7711bea1fd0911b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ur/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ur/firefox-87.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "ac9240e7896f695f48526ad275d887ddef7eb98aa3dd94800a1b4da081110876";
+ sha256 = "1353882717c9ae8e35523ab403870fb08f06ddec2df0730637195b1ee112e746";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uz/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/uz/firefox-87.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "94bd2d3f2f95e32381f6b945f4b1149f355dffcc27ec829fd0849ec4895a6da7";
+ sha256 = "43feb49aefcd292f61faadda2771251017c6104038ab1474d43f5cae1e8ee3ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/vi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/vi/firefox-87.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "e7c8034074e6d1f8f6987321e24dffdbe8acfa11d6784b8c8d033e690a5ed145";
+ sha256 = "d74a8de627e877e9c28cd19832605e039398dcea312a4784099151972d380516";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/xh/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/xh/firefox-87.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "b8f0f3ee8aeeec6fdac5ee15cf688735809994c71cbe4f01b238a3cc1386006a";
+ sha256 = "3251086b6f58c311906c49a6b499db17eaa3122a8ffcafb6f303db0489530560";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-CN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/zh-CN/firefox-87.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "47b4f3411306839882f5755b3eb2038f9c7bfd1c2ae72927db54c4816c97217d";
+ sha256 = "4d3471f60685d251b10dd1dc06610bb3ebf9d7a4e03616a6f6d988278868dc05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-TW/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/zh-TW/firefox-87.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "5fb11410c30a813fd0db58c928fb07c488405776308eacf64b238daa0fbffbc1";
+ sha256 = "8fcfa5987a0cfa37d5408c88701378e970960d21d181342ea2a3d6c43f4e4cc3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ach/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ach/firefox-87.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "06d2dbe0f799d22e98b715528b54566b167a22db4d16d3ad60d84a6e6a8b9e5e";
+ sha256 = "42ba93ba360aac202bd0b653a982dea3c1ea0d5cd6c530deef47c29c189c197f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/af/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/af/firefox-87.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "536fdd221aa5f872cc8028f39fcfa7b9eecfe09a215da3d50fbfa9e256a1394d";
+ sha256 = "9aef316b230194ec02ebb1e7780e61d85b1a4cd398d56ec0c5238bfb9af8278d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/an/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/an/firefox-87.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "ba6eff6a355361862fc78879264965f5f1c0adebefe934d1b6d51994023d3bc4";
+ sha256 = "a645abc8fafb548a495efdf9e88ce96af06d0fa4703ed5ea6b63ae79d309f3f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ar/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ar/firefox-87.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "0b465097dcfd4f2a50eba984b0bb30fedceb1a409e2a98f22c45709cdd1117ae";
+ sha256 = "c85e9eaf8480ec226eab70a8b434f56fbd5f4f8a7e57f13b341d478142e4ef99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ast/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ast/firefox-87.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "614241f31f38a71782faf76f0a31cd81d2520523ff85d8a5dfee32a77e48829b";
+ sha256 = "96a1fe1ab748ba2f99a23fd149f1d0b60a27f4d96ad12bb2473ec0393597e968";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/az/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/az/firefox-87.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "4fd682f83c0eee3031c6e452d1c7cde3e54d0e52bb8316b0e2224360665d4fc4";
+ sha256 = "52d3bc8e60196814f7ed1d1732faf32b4129a25379e9f526db7e6b755bbd5746";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/be/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/be/firefox-87.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "c15417c21f42212337bd921c869b05124a720c6d8730e4a16d30ddd9c10aca97";
+ sha256 = "8cadf14d2ce8341e8a6a11a298203e121125d12ca63833642186b79ae79b5643";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bg/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bg/firefox-87.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "fda51760d2dfa07d559673605120a34706f8a6546dc4e673dab55b71cbc501ec";
+ sha256 = "b60d8361c16f9b200255e6a904fdbf8da00a6f33a95280e456b471d54cac75d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bn/firefox-87.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "f61419c6dd7b20cbdc48cb0faf51cc831fa90f37a721a162bf32753d85a40aff";
+ sha256 = "1818bdfc297e2928255c006f8772478ce574c34748102ef64c5645ff59e3e2c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/br/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/br/firefox-87.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "7d60c5f6be2270e9b40612dfb1072ab5d29bd02d070f463f1df915f8d13873d3";
+ sha256 = "7989cb7ba1a6984891c6eaa48a35b09281d0b8c7532c46cb1c87008bff5b68fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bs/firefox-87.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "4707568c61df2d2050e3f1c18d3a2dee1c5bcfd091f32bd615f2e75ed06949fc";
+ sha256 = "d618086558e44219582ff263d9555855bd562e0a8b9d588c2a03734d003e1138";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca-valencia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ca-valencia/firefox-87.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "fe52cf8f5f531143ef28e728753610b442443de53f34a4a8d6318d5124a10caf";
+ sha256 = "8f74cf450192bc9dfd2877269f98663ebeb06fdd0cd6d25db3261e5d1f6b36c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ca/firefox-87.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "8e6baa8ac94878448f65598042d47b9789352fba55d4e4f91cbe319f9676780e";
+ sha256 = "dee6a1ded1c10b4771294435c23e433ed209dfe55db9cbcc0454b0da23d26cec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cak/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cak/firefox-87.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "006a887bfaea07c40ee0f67ebccb1aa538f56e28f625cf2b085242c26ebe7bf0";
+ sha256 = "9e55f71f4040c21d79fabe4487cf5b660baca37c23875a31015e70a520fe0737";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cs/firefox-87.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "27f1c5634e101d3681885a8d2d572b73f8c9db2215e4836a6cd71fbcd0a5b8dc";
+ sha256 = "3121a7d49718ebf6c9a8babe0f57962547b54b99864f917d045f78ea4a4aede7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cy/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cy/firefox-87.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "9e56e8f88baae2a4c99ae12041ed9c766dedc99b7ffd75bffbba92a7c19d98b9";
+ sha256 = "02c5a049462f3d4c0a538a62756af8b4e59b1acdfc4d92d43639ee3a27e568a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/da/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/da/firefox-87.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "eb317f12d74ac8b636c87dfe9c1cb0ce267a15ffeedb79956e1c15e971d1b7e4";
+ sha256 = "8bc3ad5f69850d0fd4c91ef2296462fc2c641e8eb9835ac5ffe88a9dd518821a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/de/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/de/firefox-87.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "8a736a3a9c257f2b4509e3ec2f74259f655369159981cfedf8468de9cb1fb22a";
+ sha256 = "2e9e562e10477f4a54d677bf2cd6becf87e4f40336fea8f4337f5e7d928f28f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/dsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/dsb/firefox-87.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "a8fbd4dd6d1172f67744e9283efb6cb644421cb07e3568cae0d3c68c479d653b";
+ sha256 = "fc1881741d5aeaa5cc34e9b86515c8ad637984d88814c48f8f014dfab55bf02c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/el/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/el/firefox-87.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "59baec30ea1d8e30982f52279003b6e1be0148c02f38fdf283325c53ad900ee5";
+ sha256 = "cc44c88c82adbdcde8690825851711b48212a49aa74b7485cc51d234a5027cfa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-CA/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-CA/firefox-87.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "a4e0ea60acf339a61c19272170d2efdb4f519325bf2f71bcbf82af70ca304af0";
+ sha256 = "c6a32c84bd3ed42ee801a5780cf45a6061fc8b37de4220907a98d674831c0a00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-GB/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-GB/firefox-87.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "6c82da02a7560977faad1ca3d4c3973d08583fc0ce75e1de6e5aee2c9d372b38";
+ sha256 = "cbf4e049602873ae13eabc2176657bdfb95fd4277360991ab4ef2a4e7be697f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-US/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-US/firefox-87.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "eeec3b446c30c65d4af72d04d58c6d5ddb04c13e871a5351921a737f7e1cf234";
+ sha256 = "9127aee106dd9f09fac0c3cb89c5d75553384da4ec9be5943b60a5f55f31fccc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eo/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/eo/firefox-87.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "4cbb1144cadfd901082829f8e67e311c51df96ecd08aa2082772421d6445f2fa";
+ sha256 = "7f75cb2fa8c73bc98a4d5b0f60ddbc66eff63a9caa271b98bb8eb4897fecdd49";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-AR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-AR/firefox-87.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "c875473caefc7e18a4f7a0a3e7d44ce659a2271fc1b21d435a70c921092b8af4";
+ sha256 = "090b13b1698e70c0d13409ffac5b45a044356556e3ecab970fd34907e16cfc11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-CL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-CL/firefox-87.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "d1bf9c2a1df028b5d6eca5b41c975afc6378701c6f33d888b46511da5ce5e498";
+ sha256 = "1453a40f9c2ae6794dc886d1c5462e4341141fe84792e32a08b0e6c4ac5183c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-ES/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-ES/firefox-87.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "5ee1967bc61259869441f61061fec2f24ee3a4179c64b245768387e94acafdce";
+ sha256 = "3dc986b05c389dab03cacd1672c8621f1ec93e5781dd79ec18358e3a1f2e8f84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-MX/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-MX/firefox-87.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "6b4669581f26a18fbd0bda8d605b9d22b3aa98eb193ea81f7ebce1db4d39a263";
+ sha256 = "e6b18f0adf5ff99d1c7f84dbabc00b44ad7c3c2a4b95586f58d18421f28dfa1c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/et/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/et/firefox-87.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "0c41ec2c1df4cbd295d349a7b6ad7a7e974662319d4a1d458e9f6bd31c4830c0";
+ sha256 = "573cabc8b8eed9e80d43ce960660737fad1f3bf43266d3e72ea475bec931eb9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/eu/firefox-87.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "e7bb380e013f5cf35edba5b698a5e3fafd7af63593c663e0029e2754f6854b4f";
+ sha256 = "5b3d1ecd842b30029fa1749ad7a1aa6486bf96f977d5f274ecababe7909c71b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fa/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fa/firefox-87.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "d2601f3b84b31d9852a3f2ec35ae8b43f8640da18976f5f4c8a77cf7ad360a22";
+ sha256 = "41edf84920463d8c1f6ac8a8c0c5068143652129ec42377e3a3973d54e8477c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ff/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ff/firefox-87.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "a13ee0463fc23cff51f88072d527a6b758fd313276cc7e5f3c8a0c4c8d5f5404";
+ sha256 = "492d2b1307558b1b19b5d1d88bcc0eb151d00ebc1331356520068597614919f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fi/firefox-87.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "76a153c9e398eb259c69b30d15782b7d7a9ebd156283f1034c20182cd72e13f7";
+ sha256 = "f495c5d6965c2fdfd06d23616f4b017c600e07efc22984be743c3eadcb5eceb5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fr/firefox-87.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "6f5d6e07251f75d6355f52558f2734d2788bb87e1e53ccfb800e03173094f765";
+ sha256 = "ba0cbea290a3911a6bc24fd52e726234f90213b05756a57aeeb01a8ebcc7af73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fy-NL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fy-NL/firefox-87.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "785a30a785e55158c7251e623683350ed4840bb4b6f002d34cdee82d91b33d10";
+ sha256 = "9e9dfcea10f89836b3d63420f90f992b123dcec3beceb3eb739d47b15ced4a1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ga-IE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ga-IE/firefox-87.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "f32f8a0e5f0b5fd2a1dd147b32880605186a4b9435e39a53fc87f42eb8706979";
+ sha256 = "316b6877a46f452d628509bf94c4e729080d93cb8590d8c17f9ce030823a3b86";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gd/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gd/firefox-87.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "2893dd13353b3504a00e02f65f0b2a0a72dd43771148d45cca271aa752a0c520";
+ sha256 = "34f2b2660f76ca13697ca029fe06cbdada7e8a0ee3f703c55b5290af4f59d687";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gl/firefox-87.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "b5bcf0eff53f6bda0e394be3e483c3f314d962a919473492a7d1005b6976b861";
+ sha256 = "b61531887132193a3b68fc1394682305bf242bb8244f19c6e6dc158b0e6dda61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gn/firefox-87.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "c979d766174b2e4df72de6a375084b509e879f11a13c1972c97b5ba0accb67d7";
+ sha256 = "286d7c949488a93370055dc650a70825df689b496de47382c7c326d0be16cf11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gu-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gu-IN/firefox-87.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "0e053f93d56a8fd9c07bfef4e93f1f338f951f519be669f5ff18157ca4216025";
+ sha256 = "c04e2f3cd9514b8494122af0baa474b2e3ac91d62939ec1117f3b07efbffecc0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/he/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/he/firefox-87.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "05435889024f622f69d82a0007c19b50b1842f2cfa558748b39859a94a7addaf";
+ sha256 = "9f4436ba36fe3d73f22c0837fa124e712c58169d9db1cccaad91187d895f4b95";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hi-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hi-IN/firefox-87.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "7fb87408064c024305295c38938c42b34a0c627b177cacb00ed9e79a0ff974c8";
+ sha256 = "e1c3674ef1a401c6f8f5f9f3f4cfdc9a858fc670f71d0b09d79677820ed6ddb1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hr/firefox-87.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "924141a867793aa4fb3d2b87b75c1d60cc39bb3a3591eaaf6ee3381fcf28fcc6";
+ sha256 = "7dc0f6c2cf38f90741a8c0a2f5df22b32abb6399d9b24cc827f1ae972a481b23";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hsb/firefox-87.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "7ce0f09c144462f9c94dc6805165543d12afbf0e44e327dae4554fecf272601e";
+ sha256 = "d59ee63de2bcb95575a782294cad35a0ea99eb4c8e4bde8539cd20326d85b41b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hu/firefox-87.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "8997e6d5620e0f565939cd8f127c4e86da0c46828c66fab7333073c3cbb8054e";
+ sha256 = "c9d13a693183290db6a62eda37da63f0d1535db5604a6f62d88b990ac3ea39ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hy-AM/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hy-AM/firefox-87.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "aeff6c4b8c7d164b63bf22808ea234236f893e6da2b3d9142f95d89e9ec7178e";
+ sha256 = "7edb84df00e57987f4cbef235a1fecc22b6dd7aaafe101f62e002e4e59caf56e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ia/firefox-87.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "0590e0469ac2e562325d786dcb68e2ca2111aa8ae1ff3717ef8db2259e6ec149";
+ sha256 = "501cafeb34aef4d8dae63f47446abf8b04dcfee93b9931ec06f809823a6c675a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/id/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/id/firefox-87.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "ef8dc62e52df3e6b1d37aea5f9b9a214a26e51ef9fd378f56ac8b2245de54613";
+ sha256 = "9913aec5634c32300c2f556017be415ef6516a4380af3e597b2abd8e449e82a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/is/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/is/firefox-87.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "aeabfd51aa160ba259850b7fac88829f81bcc0dd8ccc9168c7add07ce0d4efc3";
+ sha256 = "71b1bf3205043c5c23988de6955a51091ec812e82701d0f37c12e937ed774b69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/it/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/it/firefox-87.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "c6069c0a86344af00150be03cb0f2c26984b713ad386352f5a10b39b79b13cac";
+ sha256 = "7a842251175a2db53e0bec3b65c2db0007a1fe5d84ec126fa9029c6d9dbc732c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ja/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ja/firefox-87.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "9be7b40e66723583b17657ea805919955dda703957ba21d541baa22390a1befe";
+ sha256 = "6a8aa33e333fcfa9bb2a011d08af0d10b445be1a22dacc4458c121e8943b1f62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ka/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ka/firefox-87.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "2e8a57b44b3bec627793f46df84f7f25ab0aedd0f8b1f08202c75cc58d7e14c1";
+ sha256 = "f2d2cc7b079e0ca69de3568b10bdf6d7f74ef7f8b0bd05a89442be41df3d2239";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kab/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kab/firefox-87.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "5777a6b5eb3055ab2c93f98bc597343f13bff7d0a846809d24c97e9ba1a0ca7d";
+ sha256 = "7211457301c54fed01aa3b0735fc7f0814d4fbfeb7862ebe438f5cebf7fed6e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kk/firefox-87.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "84a8fbf2a859d81aae2aae6bc95f12a8e2982cff77090072a01d28daccbf21f9";
+ sha256 = "8b18ac077d961279b2bb179ea37819de964e488ab528d4591ce2479ecae167ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/km/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/km/firefox-87.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "55982f15b467ddea6203fbcf98081496d0e313d3cd281f807d2bb75b4e79077e";
+ sha256 = "6b06454f9e061ae6d099ffbb2079d92538b32eb619d12858c3d759f004c427c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kn/firefox-87.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "18aedab4f324448da412ddebd1da9b01be51edcd5052c9455672a763ae1f673b";
+ sha256 = "4b8d711f0f33c850d2bf39f16ef0da7e004374445ad8bb3e69e0b74ff0765cd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ko/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ko/firefox-87.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "5baa361fb97a76d12bfbf5b87c092cbe8079d34dd08842dae9def133383f587a";
+ sha256 = "f6da2239dc4e457623a64f2ac5e56868e70115941ddd3c19093ba180a3aeea7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lij/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lij/firefox-87.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "35bf3aeba596135231b1ddff2e2550ab2a3e0c5bc796d7b628c5f78ac46ce40f";
+ sha256 = "fc45263e353af69c7dc2e5d74edefa793b0f1d2bb86f496dd75ad66bdfc7ffe1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lt/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lt/firefox-87.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "eedf7ba2cf4634ab18c2f2926266845a29c9bce8ba747554d413b276445b9eb1";
+ sha256 = "f030574f0bfb8574ce07159fdd213f1e21c4293bf7e1961080e6ef10f7f14b42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lv/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lv/firefox-87.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "a1c5f04c16f6d50a0797e466d6a8836de40219567f04928cda7f64d967d8afa7";
+ sha256 = "7648c4616260b09161a3431120fd99c97c5630347ad4ac196956eae4cb4b18f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/mk/firefox-87.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "8de29502640b51ac9f586ae7713903612911cf01cd7aecb6d74175a816cce6a3";
+ sha256 = "c7bfcf5ee846d340d454d6cce2e66c0245bca10d1b74887170ba3820c392155a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/mr/firefox-87.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "f4cb4ddcac3b5ede422e54c69c05902506be788b45a79cfee6e21a0b7b8c3ca5";
+ sha256 = "808207c6efa62312abf14091992022a3d37ba906c8003316d6af943228ba534a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ms/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ms/firefox-87.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "aa09b472e21b453f6875e25dc7922ca062934527a306f3b338cd32636076c021";
+ sha256 = "f836343cd1116657b8f8f28f49df99b36a13a4255d0499945953b64934f80e64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/my/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/my/firefox-87.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "4a4ad99aac0614aa25fd77c4c740c49f509db2333c37f797018362b15f38d1d4";
+ sha256 = "1c01f7dcea9ecbf1af3cc29cb38aa8cd928dc6c10f67fdb20f98a588951336de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nb-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nb-NO/firefox-87.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "45814c2d731cd8435a92c31e9311c333d4357dc38e9196fbc24358289004df8b";
+ sha256 = "f196268af59a118a4c5ca50b5c7f9ace27d642fd1952085dd693f09462eb27a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ne-NP/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ne-NP/firefox-87.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "008ecc3d7bf7932a320b6ec12404a5259032930539a65e60f8aa2f98f9018524";
+ sha256 = "6a80edda7e3b0f97282840eaacd9d4d003e6562c4931a14736bd1aba6ea8eb7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nl/firefox-87.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "0202adc844602502b48d078a665b1e9012c65172deda406ac9db972e05456fc7";
+ sha256 = "495a43b18aa2078bd86468cbd1545ea04b0fc63c847a459156489c18432fe5ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nn-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nn-NO/firefox-87.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "28f34c957628178a112ad6a7c16d9dd20e58bc3a9068fb1e59ef5e656ac8f02f";
+ sha256 = "a3d58b74e2ee2c97a2b4aa5855040f34f79024df55d8de6623991df61cfc3b46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/oc/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/oc/firefox-87.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "4645cc6de115ff73444dfa4165a82b3ba1b0adbe3c4eff6fd854c9ec594a7bbb";
+ sha256 = "c71e444eb03df8c4b28dc34d4cfc32db2471ba12389f448c28a9dc03fc0dbfb1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pa-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pa-IN/firefox-87.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "3fbe8e5c7b4fb420a6a6c62475bd01fead342d7431578b96f391a829cf184be4";
+ sha256 = "69eedac3a7f2912f179e2c5838f4dbe109c1b1c570ea1f375d5563a622553f13";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pl/firefox-87.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "6850d14c02c152fb6252b08a111ff6bccbaee6a6ff76a99c018b497a8a014ab0";
+ sha256 = "106012905a00d898ad3fa43c733c1f568c0df2e74165276feb5b3f5eb79a3b20";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-BR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pt-BR/firefox-87.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "a0aac09a39302df30a48c54e64ae422166eb781ef349dbc58927e077310fae5f";
+ sha256 = "18434861a77abb7810008af068589250ae5621c1719ed4d37643c7aa3607070a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-PT/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pt-PT/firefox-87.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "e577444bd6ef376b0277cc2181bf50bc1ac3e377bed171f30616f536fa2d516b";
+ sha256 = "b27fc0941804f4bedf10c15e26fd14fc381416a2c29fbe9b4d01f328e2164022";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/rm/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/rm/firefox-87.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "2a4f5f35caa3ec5b9f20c1160dd038ce3d689593650771c3e63246cc53b23cfe";
+ sha256 = "2283c43282caeee2798a93af96979e46a103b3ab7c645e72384fe19973c49534";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ro/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ro/firefox-87.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "c68f195f10bcd7d19aa76084450419008068ee5d30c34acc02d7621ea250211a";
+ sha256 = "6d7ba9b40f17f373c4eb151a4bbf6399d27a8e5071342d25a374afc67914bace";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ru/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ru/firefox-87.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "e6e7dcc74dac1c331d3202a141df71dbe2e5a398e2b97c9da1358707823d76b4";
+ sha256 = "77341829394b41ed8cf63090c30b993e3a540b838bb476239398795eb026442b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/si/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/si/firefox-87.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "1bf321805bd46e0214568921b89eaf5ea4d394e43fb1d475ee61c7de8439d997";
+ sha256 = "b7aaa753f54ca1aa5172c39e9899c662f62cb81628f29d29ed8774c68697d1fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sk/firefox-87.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "221667dd6eead982d13e911e0ee9d6fb0e6288d689c59c7adc403e8eeab6fd4f";
+ sha256 = "fc70db60786a652dfa0d8614c24bb4b5cb46849a468903723c9e9cdfebd9eb52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sl/firefox-87.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "5df6f40394d0c2561c5103cb0600d3566b2bf42dca4d6a3194bee725577f1dad";
+ sha256 = "392eccb8277c76b4178b6fb74c8974ad31e0b36fe8778b5933b37f6249d3c9b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/son/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/son/firefox-87.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "8ce2f3d67ea7e1889fce2f534e90320403350b27bd63e97263a9c14544d7f212";
+ sha256 = "c95c7ff206a42cf5c4caba9a3377834c1b8b4d258de566efed15ab0815b64726";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sq/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sq/firefox-87.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "a4f403eefa8da37d7308bda7a10cf62dbe9ff74f848e9e3603d9b787c1629b05";
+ sha256 = "7eb9cbe937262ed47711df80143b49d369bfb185119a3fb51f8a723bb99b1f9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sr/firefox-87.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "7f3d5fb8cb77c2405403f9899257d41f4e9fcdb45a1af945e337228d7648f79d";
+ sha256 = "4d4b88503ccc6d5f5c16988c626027516681d265b32ee205324919a170caa1b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sv-SE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sv-SE/firefox-87.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "261886fc3f3c9c40123a6b6ae0040fffb281d90cbc34506f85bcd73cb94276f2";
+ sha256 = "fe2fdf76541c95166fae7b9d1c0b3390552968ac0a8f47f2e23da750c8b8753a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ta/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/szl/firefox-87.0.tar.bz2";
+ locale = "szl";
+ arch = "linux-i686";
+ sha256 = "af91e1a4d0afefd890ce9ab04ac800427670a314089b67dc41e12bfa43ecf112";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ta/firefox-87.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "3df7b4c5eb395b123d8c9a67d58e2eda268bd931394e38941545cded144b97e7";
+ sha256 = "043162612ff54115953c25333fcc03d801176db1d379cb7c94f22c0da5a1ae00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/te/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/te/firefox-87.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "b27fe9f6d6e4920e5714a74f439900238900e164cce584f1a1548a02105caa10";
+ sha256 = "2fca2c54dd357d8d5e3bb8804dbc3cfcc7fd1c17f538eaf1e1fd60c95baf7252";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/th/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/th/firefox-87.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "e4eadb2885d09a082c40e27eb41e5a8f721ddd45ef79ed0ccba02f18d7fc3d6a";
+ sha256 = "b049f6cc876fce2d57387d2c90afff4f261baf38e582821656efd455fdbadc03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/tl/firefox-87.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "392368f316cf89668e2ff9a42e0b170b55bfc610c84b0a605866914a39273fce";
+ sha256 = "be18fe1caae3a85e3a48b0a5a45cb175bd11c31d1cfbe726dbe4952c50338299";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/tr/firefox-87.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "e9c7f55b656860dc6d2b28fcca66dbc6e7290d2f418da238ca06ccfe68fdd579";
+ sha256 = "5c43338e0fc0138c280f9231e05c14a553d2b0504053b5c090adb7ecb96cf8d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/trs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/trs/firefox-87.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "9cd24da9a1dbc0665b589ea8d1f5e5a3546a8b7babbd0f9f2f27641d5c81eeaf";
+ sha256 = "510ee9988f4d1c6e0e50fc07d00d2aa80380f89f8db4b0655c7a9c0aaf07fc51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/uk/firefox-87.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "0bbd4c03dd422901bf2ff1a6e000ec4c6ed798bfa66ade8db03551f5509efc40";
+ sha256 = "a01aa11750b6027f01b45763d691c425b65aa577fe9fcae6f492b40bb8ff6056";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ur/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ur/firefox-87.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "c0f807c2c7365f281d921fd347a173ce2538fce79b1e74beedf928f392422236";
+ sha256 = "f2e83dfd361dc8abfc3fab5554d1c545b216a05f57718aa1f8976f7c2dda3b17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uz/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/uz/firefox-87.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "f561501fdf1a0edf9f58289fe608b9d47c00ef666c7f980972f0f3112470ad27";
+ sha256 = "4c570ba3aa3480efd63ba230b550d750a49289b3bafe9ede881b28184ac26ca1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/vi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/vi/firefox-87.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "12ce7eae83ef3100039871e82784ba7a63742ef8f132c48ceccac22641074c1e";
+ sha256 = "846862d789b275ba1184b1f65a95570043ee1f8e2f7da5678252c192a8d31966";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/xh/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/xh/firefox-87.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "9def9420b6e6e252839268167e978cc357add46e54e77a0f5bf8e03a2183a855";
+ sha256 = "5c5a88654bcec7a8c5bb7245567270542823a377c7843a6b14d8f12cf57b7b59";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-CN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/zh-CN/firefox-87.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "03cea12f34a9eb22e730d6b28f294bc2a1578e9c357a15bcf189ab1fb925e337";
+ sha256 = "b7774306c5941feb5b7abf4fbc3e3d3af854145fff741f561708b5ee94d1816b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-TW/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/zh-TW/firefox-87.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "cf5e5cdf7230bf231f63750b3747b625d64026194c29b36c3d00ff9851960745";
+ sha256 = "d115d7086947003940bc270b6a83aa612324f7913e044a194c1e05648e241b17";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 7518e3993820..ad9a4618dc81 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -127,8 +127,9 @@ buildStdenv.mkDerivation ({
inherit src unpackPhase meta;
patches = [
- ./env_var_for_system_dir.patch
] ++
+ lib.optional (lib.versionOlder ffversion "86") ./env_var_for_system_dir-ff85.patch ++
+ lib.optional (lib.versionAtLeast ffversion "86") ./env_var_for_system_dir-ff86.patch ++
lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++
lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++
lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++
@@ -160,7 +161,7 @@ buildStdenv.mkDerivation ({
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
xorg.pixman yasm libGLU libGL
xorg.xorgproto
- xorg.libXext unzip makeWrapper
+ xorg.libXext makeWrapper
libevent libstartup_notification /* cairo */
libpng jemalloc glib
nasm icu67 libvpx_1_8
@@ -221,6 +222,7 @@ buildStdenv.mkDerivation ({
rust-cbindgen
rustc
which
+ unzip
]
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]
diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch
rename to pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch
diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch
new file mode 100644
index 000000000000..f7a9cb773455
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch
@@ -0,0 +1,21 @@
+diff -r 22fc47c968f2 toolkit/xre/nsXREDirProvider.cpp
+--- a/toolkit/xre/nsXREDirProvider.cpp Mon Dec 14 15:09:17 2020 +0000
++++ b/toolkit/xre/nsXREDirProvider.cpp Tue Feb 23 23:38:56 2021 +0100
+@@ -11,6 +11,7 @@
+
+ #include "jsapi.h"
+ #include "xpcpublic.h"
++#include "prenv.h"
+
+ #include "nsIAppStartup.h"
+ #include "nsIFile.h"
+@@ -305,7 +306,8 @@
+ "/usr/lib/mozilla"_ns
+ # endif
+ ;
+- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
++ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
++ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast(dirname), false, getter_AddRefs(localDir));
+ # endif
+
+ if (NS_SUCCEEDED(rv)) {
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 86d91d21e3c9..7a3fc9b9a078 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,16 +7,16 @@ in
rec {
firefox = common rec {
pname = "firefox";
- ffversion = "85.0.2";
+ ffversion = "87.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "2m46li5ni1m4xv42h99rn2hhhv2mqy229wihmzxmgvws1rh2h11yf6x2a07akkjrsp2dmwxmmkhmf9dhakgj9i55z5qqi99azyx07df";
+ sha512 = "c1c08be2283e7a162c8be2f2647ec2bb85cab592738dc45e4b4ffb72969229cc0019a30782a4cb27f09a13b088c63841071dd202b3543dfba295140a7d6246a4";
};
meta = {
description = "A web browser built from Firefox source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
- maintainers = with lib.maintainers; [ eelco lovesegfault ];
+ maintainers = with lib.maintainers; [ eelco lovesegfault hexa ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
@@ -32,16 +32,16 @@ rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
- ffversion = "78.8.0esr";
+ ffversion = "78.9.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "0160aa6c408c2af66d24b74cf98e1a07ab1604e7b93ffcde79201f9d68e41e896ef965f1904de52d5dd82ffedae33ac96e93b871727bf5dd5983c5af2f1f439f";
+ sha512 = "28582fc0a03fb50c0a817deb1083817bb7f2f5d38e98439bf655ed4ee18c83568b3002a59ef76edf357bfb11f55832a221d14130f116aac19d850768fba3ac8b";
};
meta = {
description = "A web browser built from Firefox Extended Support Release source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
- maintainers = with lib.maintainers; [ eelco ];
+ maintainers = with lib.maintainers; [ eelco hexa ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index ec57bcfae184..a6cf5ad531e5 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
- version = "2.21";
+ version = "2.22";
pname = "links2";
src = fetchurl {
url = "${meta.homepage}/download/links-${version}.tar.bz2";
- sha256 = "0qqdcghsdqm7l6kyi0k752ws3ak5crw85pqkcb11wy67j62yspi8";
+ sha256 = "sha256-A2SYazp/Ho4xcb6jYrU/ceHdM2CohC1m/cZVgOvCCE0=";
};
buildInputs = with lib;
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index df672e5160bd..cf5f13fa745e 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -43,14 +43,14 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
- desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook
+ desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook unzip
];
buildInputs = [
alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype
gnome2.GConf gtk2 hunspell libevent libjpeg libnotify
libstartup_notification libGLU libGL
- libpulseaudio unzip yasm zip zlib
+ libpulseaudio yasm zip zlib
]
++ (with xorg; [
libX11 libXext libXft libXi libXrender libXScrnSaver
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 57a4155e179e..96355789eb39 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon
+{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
, alsaLib, dbus, cups, libexif, ffmpeg_3, systemd
, freetype, fontconfig, libXft, libXrender, libxcb, expat
@@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "3.6.2165.36-1";
+ version = "3.7.2218.45-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08";
+ sha256 = "11q3whw01nbwvzccgn55b4lkr7dzlql961406r6by8xqvf8zgmp4";
};
unpackPhase = ''
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [
- stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon
+ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
index 3b3a0a858907..81c95418e691 100644
--- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
unzip $src
diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix
index d9e997f514b6..327fc5f31e2f 100644
--- a/pkgs/applications/networking/browsers/webbrowser/default.nix
+++ b/pkgs/applications/networking/browsers/webbrowser/default.nix
@@ -41,12 +41,12 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gnum4 makeWrapper perl pkg-config python2
+ gnum4 makeWrapper perl pkg-config python2 unzip
];
buildInputs = [
alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2
- unzip gnome2.GConf xorg.libXt
+ gnome2.GConf xorg.libXt
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index fcd27eceaa84..8937404e91d3 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitLab
, meson
, ninja
-, cmake
, pkg-config
, libhandy
, modemmanager
@@ -13,35 +12,46 @@
, feedbackd
, callaudiod
, evolution-data-server
+, glib
, folks
, desktop-file-utils
+, appstream-glib
, libpeas
, dbus
, vala
, wrapGAppsHook
, xvfb_run
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
+, gobject-introspection
}:
stdenv.mkDerivation rec {
pname = "calls";
- version = "0.2.0";
+ version = "0.3.1";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
- sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l";
+ sha256 = "0igap5ynq269xqaky6fqhdg2dpsvxa008z953ywa4s5b5g5dk3dd";
};
+ outputs = [ "out" "devdoc" ];
+
nativeBuildInputs = [
meson
ninja
pkg-config
desktop-file-utils
+ appstream-glib
vala
- cmake
wrapGAppsHook
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_43
];
buildInputs = [
@@ -62,10 +72,10 @@ stdenv.mkDerivation rec {
xvfb_run
];
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
mesonFlags = [
- # docs fail to build
- # https://source.puri.sm/Librem5/calls/issues/99
- "-Dgtk_doc=false"
+ "-Dgtk_doc=true"
];
doCheck = true;
@@ -73,6 +83,7 @@ stdenv.mkDerivation rec {
checkPhase = ''
runHook preCheck
NO_AT_BRIDGE=1 \
+ XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index effd1eae4904..6e5d05ff0d75 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
- version = "2.12.9";
+ version = "2.12.10";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
- sha256 = "sha256-WfyP48qOdFZfQ0+8AZDYokw7WK7lSx5di7z07gsRPZk=";
+ sha256 = "sha256-A4s6D3/1FsqrJ+Jaql4IuyD9ySChL3SXqVvl8wUDRDE=";
};
vendorSha256 = "sha256-4XPMixVNj6PUKobNLwpsOBT7Zs/7pkhDtQacLIB5EfE=";
diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix
index d82c6b45742d..eb2e5e049cf2 100644
--- a/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -1,26 +1,39 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
+
+let
+ version = "0.10.0";
+
+ manifests = fetchzip {
+ url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
+ sha256 = "Der1Ud27eIV450KkxDTF2frmeKEHKsg6vJgdXE+3548=";
+ stripRoot = false;
+ };
+in
buildGoModule rec {
+ inherit version;
+
pname = "fluxcd";
- version = "0.8.2";
src = fetchFromGitHub {
owner = "fluxcd";
repo = "flux2";
rev = "v${version}";
- sha256 = "1yrjgjagh7jfzgvnj9wr71mk34x7yf66fwyby73f1pfi2cg49nhp";
+ sha256 = "iJ6UyHbF4+RvfNoOuHt6X2R6XhpBe+t76deldwY5P2c=";
};
- vendorSha256 = "0acxbmc4j1fcdja0s9g04f0kd34x54yfqismibfi40m2gzbg6ljr";
+ vendorSha256 = "Z0keCr+KZ593c6a/56lYJwOgXu5hrUSn6N3NFf2LDUM=";
nativeBuildInputs = [ installShellFiles ];
- doCheck = false;
-
subPackages = [ "cmd/flux" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
+ postUnpack = ''
+ cp -r ${manifests} source/cmd/flux/manifests
+ '';
+
doInstallCheck = true;
installCheckPhase = ''
$out/bin/flux --version | grep ${version} > /dev/null
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index e0ae7636f604..852088ec47a7 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
- version = "1.21.2";
+ version = "1.22.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
- sha256 = "sha256-pI/LGAjTWFXiDKSV+dZl0wXK/TZmN9DuWf5Nu8EYNYc=";
+ sha256 = "sha256-7uS8704YZ7lQTSSnbVvc6T5iadl02TeVpwVPf2uS9L4=";
};
- vendorSha256 = "sha256-Q8gIhJSZqdjBXrIcJfCd25BniDScwVzUwZ9Vc8p/z3c=";
+ vendorSha256 = "sha256-oqfJaQA8ybh0UNWYJ2ukoWkwdgORwvXzRCquGstwA4M=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/helm/wrapper.nix b/pkgs/applications/networking/cluster/helm/wrapper.nix
index edad7fa1bc99..21a29e31243b 100644
--- a/pkgs/applications/networking/cluster/helm/wrapper.nix
+++ b/pkgs/applications/networking/cluster/helm/wrapper.nix
@@ -1,6 +1,4 @@
-{ stdenv, symlinkJoin, lib, makeWrapper
-, writeText
-}:
+{ symlinkJoin, lib, makeWrapper, writeText }:
helm:
diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix
index ccfeb6ed87a5..ed828feefdae 100644
--- a/pkgs/applications/networking/cluster/helmsman/default.nix
+++ b/pkgs/applications/networking/cluster/helmsman/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helmsman";
- version = "3.6.4";
+ version = "3.6.6";
src = fetchFromGitHub {
owner = "Praqma";
repo = "helmsman";
rev = "v${version}";
- sha256 = "sha256-4oJ/undqDSNn+Xn8eFEgOx+7263tmdXTHxXBkyFLpsE=";
+ sha256 = "sha256-SGVch7mMtHi5GYFOrSss4dk29aRTQmBzkPYOetPdF88=";
};
vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8=";
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index 739992e6bc0b..7c79c4896bc0 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -19,6 +19,7 @@
, fetchurl
, fetchzip
, fetchgit
+, zstd
}:
with lib;
@@ -43,9 +44,9 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
- k3sVersion = "1.19.4+k3s2"; # k3s git tag
+ k3sVersion = "1.20.4+k3s1"; # k3s git tag
traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag
- k3sRootVersion = "0.7.1"; # taken from ./scripts/download at the above k3s tag
+ k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag
# bundled into the k3s binary
traefikChart = fetchurl {
@@ -64,7 +65,7 @@ let
k3sRoot = fetchzip {
# Note: marked as apache 2.0 license
url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
- sha256 = "1wjg54816plbdwgv0dibq6dzmcakcmx0wiqijvr4f3gsxgk59zwf";
+ sha256 = "sha256-r3Nkzl9ccry7cgD3YWlHvEWOsWnnFGIkyRH9sx12gks=";
stripRoot = false;
};
k3sPlugins = buildGoPackage rec {
@@ -95,7 +96,7 @@ let
url = "https://github.com/k3s-io/k3s";
rev = "v${k3sVersion}";
leaveDotGit = true; # ./scripts/version.sh depends on git
- sha256 = "1qxjdgnq8mf54760f0vngcqa2y3b048pcmfsf1g593b2ij1kg1zi";
+ sha256 = "0rmn3nh8a94axv6lb2xjnn3gpq0scnvj69bvcs74azvw62fvq016";
};
# Stage 1 of the k3s build:
# Let's talk about how k3s is structured.
@@ -126,7 +127,12 @@ let
src = k3sRepo;
- patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ];
+ # Patch build scripts so that we can use them.
+ # This makes things more dynamically linked (because nix can deal with
+ # dynamically linked dependencies just fine), removes the upload at the
+ # end, and skips building runc + cni, since we have our own derivations for
+ # those.
+ patches = [ ./patches/0002-Add-nixpkgs-patches.patch ];
nativeBuildInputs = [ git pkg-config ];
buildInputs = [ libseccomp ];
@@ -166,9 +172,10 @@ let
src = k3sRepo;
- patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ];
+ # See the above comment in k3sBuildStage1
+ patches = [ ./patches/0002-Add-nixpkgs-patches.patch ];
- nativeBuildInputs = [ git pkg-config ];
+ nativeBuildInputs = [ git pkg-config zstd ];
# These dependencies are embedded as compressed files in k3s at runtime.
# Propagate them to avoid broken runtime references to libraries.
propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ];
@@ -255,10 +262,12 @@ stdenv.mkDerivation rec {
# Use a wrapper script to reference all the binaries that k3s tries to
# execute, but that we didn't bundle with it.
installPhase = ''
+ runHook preInstall
mkdir -p "$out/bin"
makeWrapper ${k3sBin}/bin/k3s "$out/bin/k3s" \
--prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
--prefix PATH : "$out/bin"
+ runHook postInstall
'';
meta = {
diff --git a/pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch b/pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch
deleted file mode 100644
index c439241e8558..000000000000
--- a/pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e79ddef65d08599ae3fe8ff39d202ea2416650b8 Mon Sep 17 00:00:00 2001
-From: Euan Kemp
-Date: Sun, 31 May 2020 17:27:05 -0700
-Subject: [PATCH 1/2] Use 'rm' from path in go generate
-
-/bin/rm is less portable. On some distros, like nixos, it doesn't exist
-at all.
----
- main.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main.go b/main.go
-index 62908bb7bb..0527222887 100644
---- a/main.go
-+++ b/main.go
-@@ -1,5 +1,5 @@
- //go:generate go run pkg/codegen/cleanup/main.go
--//go:generate /bin/rm -rf pkg/generated
-+//go:generate rm -rf pkg/generated
- //go:generate go run pkg/codegen/main.go
- //go:generate go fmt pkg/deploy/zz_generated_bindata.go
- //go:generate go fmt pkg/static/zz_generated_bindata.go
---
-2.25.4
-
diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 11e2b0a29153..26591ff397b7 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
- version = "0.24.2";
+ version = "0.24.3";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
- sha256 = "0cr7ap9yfd9flcph98rxap2f46fc3v689v31mc8n7vxi9jr07irh";
+ sha256 = "sha256-xxWbojMY0je1mkp2TMuIhIsimVKdHvbkTMozlU9RbTQ=";
};
buildFlagsArray = ''
@@ -18,7 +18,7 @@ buildGoModule rec {
-X github.com/derailed/k9s/cmd.commit=${src.rev}
'';
- vendorSha256 = "01g50sfk0k7v60m3anfiq2w9pzl2wpa985s22ciq911h3fscka3f";
+ vendorSha256 = "sha256-Q/l/GH6NSZdMMwTJ5spVEGZclnzcWpUW+zOwRXYQjxc=";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix
index ae9380c5139a..577e52ed49d6 100644
--- a/pkgs/applications/networking/cluster/kpt/default.nix
+++ b/pkgs/applications/networking/cluster/kpt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kpt";
- version = "0.37.1";
+ version = "0.38.0";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM=";
+ sha256 = "sha256-MBZa4LdpCZnVVbjzkYpPi9/CYGqVLeYy2N/AS1PSYBE=";
};
- vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI=";
+ vendorSha256 = "sha256-P0cN8aw62nPD1OlUAw1E36YxptxtPqqruZfDDG4Ag2w=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix
new file mode 100644
index 000000000000..76bd115a9b13
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kube-score/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kube-score";
+ version = "1.10.1";
+
+ src = fetchFromGitHub {
+ owner = "zegl";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-TYsuSPWTiIlPscul/QO59+lt6sbjJdt7pJuJYO5R9Tc=";
+ };
+
+ vendorSha256 = "sha256-ob7mNheyeTcDWml4gi1SD3Pq+oWtJeySIUg2ZrCj0y0=";
+
+ meta = with lib; {
+ description = "Kubernetes object analysis with recommendations for improved reliability and security";
+ homepage = "https://github.com/zegl/kube-score";
+ license = licenses.mit;
+ maintainers = [ maintainers.j4m3s ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index 561bcbf7ad3b..4fda7db9f198 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
-let version = "0.17.0"; in
+let version = "0.18.0"; in
buildGoPackage {
pname = "kubecfg";
@@ -10,7 +10,7 @@ buildGoPackage {
owner = "bitnami";
repo = "kubecfg";
rev = "v${version}";
- sha256 = "sha256-/91im204vBS3NjrMOvwTVO6tEBgdpirqJFqCnbIB+iQ=";
+ sha256 = "sha256-TJbuJZDj9ZwEaN8LV/M30+5+IgN8EZCTTBBDB0OgdEE=";
};
goPackagePath = "github.com/bitnami/kubecfg";
diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix
new file mode 100644
index 000000000000..ca5e30154da4
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubeconform/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubeconform";
+ version = "0.4.6";
+
+ src = fetchFromGitHub {
+ owner = "yannh";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-lduHYYskEPUimEX54ymOyo5jY7GGBB42YTefDMNS4qo=";
+ };
+
+ vendorSha256 = null;
+
+ meta = with lib; {
+ description = "A FAST Kubernetes manifests validator, with support for Custom Resources!";
+ homepage = "https://github.com/yannh/kubeconform/";
+ license = licenses.asl20;
+ maintainers = [ maintainers.j4m3s ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix
new file mode 100644
index 000000000000..5d056907264d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubectl-doctor";
+ version = "0.3.0";
+
+ src = fetchFromGitHub {
+ owner = "emirozer";
+ repo = pname;
+ rev = version;
+ sha256 = "0x784jbcwd34vzdnhg2yldh5ivkxvs2qlbsvaammbxkn04ch1ijz";
+ };
+
+ vendorSha256 = "04xq5kp1m7c98gb4fd0dni258vpfnhv535gl2qllfcp2mvk3mn55";
+
+ postInstall = ''
+ mv $out/bin/{cmd,kubectl-doctor}
+ '';
+
+ meta = with lib; {
+ description = "kubectl cluster triage plugin for k8s";
+ homepage = "https://github.com/emirozer/kubectl-doctor";
+ changelog = "https://github.com/emirozer/kubectl-doctor/releases/tag/v${version}";
+ license = licenses.asl20;
+ maintainers = [ maintainers.zimbatm ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index c218e1b492bd..12127e223a3d 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "kubernetes";
- version = "1.20.4";
+ version = "1.20.5";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "0nni351ya688dphdkpyq94p3wjw2kigg85kmalwdpv5wpz1abl5g";
+ sha256 = "sha256-RDaD7tlTtAucW8ido9FumKb5E9n6F9H8HwxQ9TPyOLk=";
};
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix
index 656badfe5a0d..6b303ce0f403 100644
--- a/pkgs/applications/networking/cluster/lens/default.nix
+++ b/pkgs/applications/networking/cluster/lens/default.nix
@@ -2,12 +2,12 @@
let
pname = "lens";
- version = "3.6.7";
+ version = "4.1.4";
name = "${pname}-${version}";
src = fetchurl {
- url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.AppImage";
- sha256 = "0var7d31ab6lq2vq6brk2dnhlnhqjp2gdqhygif567cdmcpn4vz8";
+ url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage";
+ sha256 = "0g7k3sld6m31qi0zc9z5gydi60waw7ykwz48qnyg77xz1cpm6z5x";
name="${pname}.AppImage";
};
diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix
index 84a6cd644ec2..62c12ac8afc8 100644
--- a/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -10,20 +10,20 @@
buildGoModule rec {
pname = "nerdctl";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
- owner = "AkihiroSuda";
+ owner = "containerd";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-tMzob+ljGBKkfbxwMqy+8bqVp51Eqyx4kXhsj/LRfzQ=";
+ sha256 = "sha256-0q3UmlXzW0fGYPc1IptuIbCMnKW4pyDm1KxkRqU2voA=";
};
- vendorSha256 = "sha256-zUX/kneVz8uXmxly8yqmcttK3Wj4EmBaT8gmg3hDms4=";
+ vendorSha256 = "sha256-QVvID9rrOFngL94LWN75HSnyTgh3F0KaScWxMIKUqDM=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
- preBuild = let t = "github.com/AkihiroSuda/nerdctl/pkg/version"; in
+ preBuild = let t = "github.com/containerd/nerdctl/pkg/version"; in
''
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=")
'';
@@ -36,9 +36,6 @@ buildGoModule rec {
--prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \
--prefix CNI_PATH : "${cni-plugins}/bin"
- # nerdctl panics without XDG_RUNTIME_DIR set
- export XDG_RUNTIME_DIR=$TMPDIR
-
installShellCompletion --cmd nerdctl \
--bash <($out/bin/nerdctl completion bash)
'';
@@ -52,8 +49,8 @@ buildGoModule rec {
'';
meta = with lib; {
- homepage = "https://github.com/AkihiroSuda/nerdctl/";
- changelog = "https://github.com/AkihiroSuda/nerdctl/releases/tag/v${version}";
+ homepage = "https://github.com/containerd/nerdctl/";
+ changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}";
description = "A Docker-compatible CLI for containerd";
license = licenses.asl20;
maintainers = with maintainers; [ jk ];
diff --git a/pkgs/applications/networking/cluster/nixops/shell.nix b/pkgs/applications/networking/cluster/nixops/shell.nix
index 6d298b8df83e..3fc06b0bc73a 100644
--- a/pkgs/applications/networking/cluster/nixops/shell.nix
+++ b/pkgs/applications/networking/cluster/nixops/shell.nix
@@ -3,7 +3,7 @@
pkgs.mkShell {
buildInputs = [
pkgs.poetry2nix.cli
- pkgs.pkgconfig
+ pkgs.pkg-config
pkgs.libvirt
pkgs.poetry
];
diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix
index 453c1406fd20..0e97b541a5dc 100644
--- a/pkgs/applications/networking/cluster/octant/default.nix
+++ b/pkgs/applications/networking/cluster/octant/default.nix
@@ -15,12 +15,12 @@ let
in
stdenv.mkDerivation rec {
pname = "octant";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchsrc version {
- x86_64-linux = "sha256-kYS8o97HBjNgwmrG4fjsqFWxZy6ATFOhxt6j3KMZbEc=";
- aarch64-linux = "sha256-/Tpna2Y8+PQt+SeOJ9NDweRWGiQXU/sN+Wh/vLYQPwM=";
- x86_64-darwin = "sha256-aOUmnD+l/Cc5qTiHxFLBjCatszmPdUc4YYZ6Oy5DT3U=";
+ x86_64-linux = "sha256-D/pHOXR7XQoJCGqUep1lBAY4239HH35m+evFd21pcK0=";
+ aarch64-linux = "sha256-aL1axz3ebqrKQ3xK2UgDMQ+o6ZKgIvwy6Phici7WT2c=";
+ x86_64-darwin = "sha256-MFxOAAEnLur0LJJNU0SSlO+bH4f18zOfZNA49fKEQEw=";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix
index a4f15586ad0e..485eba2721db 100644
--- a/pkgs/applications/networking/cluster/qbec/default.nix
+++ b/pkgs/applications/networking/cluster/qbec/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "qbec";
- version = "0.13.4";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "splunk";
repo = "qbec";
rev = "v${version}";
- sha256 = "sha256-jbGEkBBXb1dDv4E7vEPVyvDahz27Kpyo3taenCH/vfw=";
+ sha256 = "sha256-+CzY/ifH+U3I36uHXyO2FSkPCz+SWRpSPnxfd2LHHhY=";
};
- vendorSha256 = "sha256-rzxtLaGUl8hxcJ+GWlrkjN+f7mb0lXrtkHj/pBO8HzQ=";
+ vendorSha256 = "sha256-wtpXqIixjRYYSIPe43Q5627g6mu05WdvwCi9cXVgCBs=";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index f344b8c3eb97..8f4324f43435 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -5,7 +5,7 @@ let rev = "f6e19140201d6bf2f1274bf6567087bc25154210";
in
buildGoModule rec {
pname = "sonobuoy";
- version = "0.20.0"; # Do not forget to update `rev` above
+ version = "0.50.0"; # Do not forget to update `rev` above
buildFlagsArray =
let t = "github.com/vmware-tanzu/sonobuoy";
@@ -17,13 +17,13 @@ buildGoModule rec {
'';
src = fetchFromGitHub {
- sha256 = "11qawsv82i1pl4mwfc85wb4fbq961bplvmygnjfm79m8z87863ri";
+ sha256 = "sha256-LhprsDlWZjNRE6pu7V9WBszy/+bNpn5KoRopIoWvdsg=";
rev = "v${version}";
repo = "sonobuoy";
owner = "vmware-tanzu";
};
- vendorSha256 = "1kxzd4czv8992y7y47la5jjrbhk76sxcj3v5sx0k4xplgki7np6i";
+ vendorSha256 = "sha256-0Vx74nz0djJB12UPybo2Z8KVpSyKHuKPFymh/Rlpv88=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
index 804659e084ac..752274a56257 100644
--- a/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terraform-docs";
- version = "0.11.2";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-x2YTd4ZnimTRkFWbwFp4qz6BymD6ESVxBy6YE+QqQ6k=";
+ sha256 = "sha256-6jUYntnMB/LxyZuRkSaOVcrzJOIoucdaY+5GVHwJL8Y=";
};
- vendorSha256 = "sha256-drfhfY03Ao0fqleBdzbAnPsE4kVrJMcUbec0txaEIP0=";
+ vendorSha256 = "sha256-HO2E8i5A/2Xi7Pq+Mqb/2ogK1to8IvZjRuDXfzGvOXk=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 4ec886a34fcd..9f5ced1d51c6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -511,10 +511,12 @@
},
"kubernetes-alpha": {
"owner": "hashicorp",
+ "provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha",
"repo": "terraform-provider-kubernetes-alpha",
- "rev": "nightly20200608",
- "sha256": "1g171sppf3kq5qlp6g0qqdm0x8lnpizgw8bxjlhp9b6cl4kym70m",
- "version": "nightly20200608"
+ "rev": "v0.3.2",
+ "sha256": "0lgh42fvfwvj6cw8i7800k016ay4babqiz38q0y7apq4s7vs62sb",
+ "vendorSha256": null,
+ "version": "0.3.2"
},
"launchdarkly": {
"owner": "terraform-providers",
@@ -1084,10 +1086,11 @@
"version": "2.3.0"
},
"yandex": {
- "owner": "terraform-providers",
+ "owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
- "rev": "v0.40.0",
- "sha256": "0dymhdrdm00m9xn4xka3zbvjqnckhl06vz5zm6rqivkmw8m2q0mz",
- "version": "0.40.0"
+ "rev": "v0.54.0",
+ "sha256": "0q9m7520zl7q1liri6x849xjp221wbc9l2w6dj19mmgfwspqv02l",
+ "vendorSha256": "0rzldsb8gyhvnsd26wg9byqngzzj64pi86v2hb4i63rlfmnn77xi",
+ "version": "0.54.0"
}
}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a74f5df58fdc..d3aeee6bc68b 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -157,8 +157,8 @@ in rec {
});
terraform_0_14 = pluggable (generic {
- version = "0.14.8";
- sha256 = "0kpw8w28pfyr136z5d4pxw7g9ch6rk2lfwh3lwz25mngq1lljmn0";
+ version = "0.14.9";
+ sha256 = "0r9d28mbj7h9prr39gm5kd49l7sm8l1ab9rwrkpyhwgr119zf35b";
vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 6cb13a01eeec..9634e477e854 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.28.11";
+ version = "0.28.16";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-qlmiQ73MRXcdXXC50pewUMt9YFbzXIbjnZTV5gIcvGs=";
+ sha256 = "sha256-xt04gYxInW9UNxPG4kmMagfAQyQ+T0/u7m39grFCdAc=";
};
- vendorSha256 = "sha256-SVrDBDGK809O+RaE3gOa9U1agY6hSGI/k3FUCgm+5PA=";
+ vendorSha256 = "sha256-vHKqowc3euQQyvgfaTbIgSXOhPcf2nSoteQK0a574Kc=";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix
index 6b878cec9279..daa9f486bf7d 100644
--- a/pkgs/applications/networking/cluster/velero/default.nix
+++ b/pkgs/applications/networking/cluster/velero/default.nix
@@ -40,6 +40,6 @@ buildGoModule rec {
"https://github.com/vmware-tanzu/velero/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ maintainers.mbode maintainers.bryanasdev000 ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix
index f28754005ecb..7675dc0de880 100644
--- a/pkgs/applications/networking/cluster/waypoint/default.nix
+++ b/pkgs/applications/networking/cluster/waypoint/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "waypoint";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-FTBBDKFUoyC+Xdm3+2QWXK57fLwitYrFP89OvAyHHVY=";
+ sha256 = "sha256-6sV2e/m0qVSRWgdvVZ9VxEL/J57nTcTClxHF5X8/8PQ=";
};
deleteVendor = true;
- vendorSha256 = "sha256-ihelAumTRgLALevJdVq3V3SISitiRPCQZUh2h5/eczA=";
+ vendorSha256 = "sha256-NPE3YHulqllWDGrxQgPmy/KKE7xFPOUorLQNIU8cP50=";
nativeBuildInputs = [ go-bindata ];
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index b032d3de332f..38bc05b1f868 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -3,27 +3,23 @@
rustPlatform.buildRustPackage rec {
pname = "newsboat";
- version = "2.22.1";
+ version = "2.23";
src = fetchFromGitHub {
owner = "newsboat";
repo = "newsboat";
rev = "r${version}";
- sha256 = "1j3z34dhqw0f1v6v2lfwcvzqnm2kr2940bgxibfi0npacp74izh3";
+ sha256 = "0a0g9km515kipqmz6c09aj3lgy3nkzqwgnp87fh8f2vr098fn144";
};
- cargoSha256 = "08ywaka1lib8yrqjmfx1i37f7b33y3i6jj7f50pwhw8n6lr9f7lc";
+ cargoSha256 = "11dn1ixc7i29cv8kpqfkmikdqzr2v79vlyfxcvjwhgd0r34w4xhn";
- postPatch = ''
- substituteInPlace Makefile --replace "|| true" ""
- ''
- # TODO: Check if that's still needed
- + lib.optionalString stdenv.isDarwin ''
- # Allow other ncurses versions on Darwin
- substituteInPlace config.sh \
- --replace "ncurses5.4" "ncurses"
- ''
- ;
+ # TODO: Check if that's still needed
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ # Allow other ncurses versions on Darwin
+ substituteInPlace config.sh \
+ --replace "ncurses5.4" "ncurses"
+ '';
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix
index 6c135439322a..ac7af8e53b37 100644
--- a/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix
@@ -20,19 +20,19 @@
stdenv.mkDerivation rec {
pname = "newsflash";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = version;
- hash = "sha256-Vu8PXdnayrglAFVfO+WZTzk4Qrb/3uqzQIwClnRHto8=";
+ hash = "sha256-EInI5Unaz9m8/gJ7vAzJVyMynJGq0KZh12dNK8r1wnY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-dWumQi/Bk7w2C8zVVExxguWchZU+K2qTC02otsiK9jA=";
+ hash = "sha256-xrWZhjfYnO6M3LMTP6l3+oZOusvUWuRBDesIlsiEJ6s=";
};
patches = [
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index b58c30aee5d6..fd68dfc49f47 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
- version = "3.1.103";
+ version = "3.1.106";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "da635a01ae7d15ba31b41081ab3e0214b8c5ab5e4662c381246495d7d1eba9be";
+ sha256 = "f0ff300a1762d701b77eb16142dcc13d9d099bbed695f1e950392c1d1bb988eb";
};
postPatch = ''
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 877cdec4ca8d..f8e9fcc87b0b 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "filezilla";
- version = "3.51.0";
+ version = "3.53.0";
src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
- sha256 = "0k3c7gm16snc6dr9a3xgq14ajyqj4hxcrd6hk6jk5fsi9x51rgl2";
+ sha256 = "sha256-MJXnYN9PVADttNqj3hshLElHk2Dy9FzE67clMMh85CA=";
};
# https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769
diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix
new file mode 100644
index 000000000000..940756855b99
--- /dev/null
+++ b/pkgs/applications/networking/giara/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, fetchFromGitLab
+, meson
+, gobject-introspection
+, pkg-config
+, ninja
+, python3
+, wrapGAppsHook
+, gtk3
+, gdk-pixbuf
+, webkitgtk
+, gtksourceview4
+, libhandy
+, glib-networking
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "giara";
+ version = "0.3";
+
+ format = "other";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "World";
+ repo = pname;
+ rev = version;
+ sha256 = "004qmkfrgd37axv0b6hfh6v7nx4pvy987k5yv4bmlmkj9sbqm6f9";
+ };
+
+ nativeBuildInputs = [
+ meson
+ gobject-introspection
+ pkg-config
+ ninja
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk3
+ gdk-pixbuf
+ webkitgtk
+ gtksourceview4
+ libhandy
+ glib-networking
+ ];
+
+ pythonPath = with python3.pkgs; [
+ pygobject3
+ pycairo
+ dateutil
+ praw
+ pillow
+ mistune
+ beautifulsoup4
+ ];
+
+ # Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
+ meta = with lib; {
+ description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind";
+ maintainers = with maintainers; [ dasj19 ];
+ homepage = "https://gitlab.gnome.org/World/giara";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 1a83a04a1fa8..c5a718c3a702 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python
+{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python2
, enableLibPurple ? false, pidgin ? null
, enablePam ? false, pam ? null
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ] ++ optional doCheck check;
- buildInputs = [ gnutls libotr python ]
+ buildInputs = [ gnutls libotr python2 ]
++ optional enableLibPurple pidgin
++ optional enablePam pam;
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index 3ee835610f79..805278b4e456 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -1,7 +1,7 @@
-{ lib, fetchdarcs, pythonPackages, libvncserver, zlib
+{ lib, fetchdarcs, python2Packages, libvncserver, zlib
, gnutls, libvpx, makeDesktopItem, mkDerivationWith }:
-mkDerivationWith pythonPackages.buildPythonApplication rec {
+mkDerivationWith python2Packages.buildPythonApplication rec {
pname = "blink";
version = "3.2.0";
@@ -17,7 +17,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
sed -i 's|@out@|'"''${out}"'|g' blink/resources.py
'';
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
pyqt5_with_qtwebkit
cjson
sipsimple
@@ -26,7 +26,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
];
buildInputs = [
- pythonPackages.cython
+ python2Packages.cython
zlib
libvncserver
libvpx
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
index c579220cdde1..396dec1cd09f 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
@@ -2,12 +2,12 @@
let
pname = "deltachat-electron";
- version = "1.15.2";
+ version = "1.15.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
- sha256 = "sha256-iw2tU8qqXWbtEdLGlW8HNBHx8F2CgnCGCBUWpM407us=";
+ sha256 = "sha256-cYb0uruuWpNr1jF5WZ48quBZRIVXiHr99mLPLKMOX5M=";
};
appimageContents = appimageTools.extract { inherit name src; };
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index c7ddc495546d..fe75418ebe33 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,10 +7,10 @@ in {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
- version = "0.0.13";
+ version = "0.0.14";
src = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
- sha256 = "0d5z6cbj9dg3hjw84pyg75f8dwdvi2mqxb9ic8dfqzk064ssiv7y";
+ sha256 = "1rq490fdl5pinhxk8lkfcfmfq7apj79jzf3m14yql1rc9gpilrf2";
};
};
ptb = callPackage ./base.nix rec {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index caf80c2460fe..19c499b3199d 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
- "version": "1.7.22",
+ "version": "1.7.23",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index f147918cdc53..30dffe0c16f5 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "element-desktop";
- version = "1.7.22";
+ version = "1.7.23";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
- sha256 = "152ggkkk997pg3xdcdzn3samv3vsb6qifgkyl82bnwchy8y3611d";
+ sha256 = "0vvjbh81h6sg6dbm9d6ffav0dim9sadvs67jcm702677qgigkc53";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index a75b02ef8a5a..be3c075db7a4 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
- version = "1.7.22";
+ version = "1.7.23";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
- sha256 = "1aaa986h38kkrnyhb1y65d73idsxmkmi201511az9zlz9210ih59";
+ sha256 = "10n899gc3qcjy2cskk0whwz60pnvh500x1b57kn22l9bhkg9xkvp";
};
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 14cf45e97bbd..23a4aebb0265 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -1,12 +1,9 @@
{ lib, stdenv
, fetchFromGitLab
, nix-update-script
-, fetchpatch
, meson
, ninja
, gettext
-, cargo
-, rustc
, python3
, rustPlatform
, pkg-config
@@ -24,7 +21,7 @@
, wrapGAppsHook
}:
-rustPlatform.buildRustPackage rec {
+stdenv.mkDerivation rec {
pname = "fractal";
version = "4.4.0";
@@ -36,16 +33,21 @@ rustPlatform.buildRustPackage rec {
sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";
};
- cargoSha256 = "xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
+ };
nativeBuildInputs = [
- cargo
gettext
meson
ninja
pkg-config
python3
- rustc
+ rustPlatform.rust.cargo
+ rustPlatform.cargoSetupHook
+ rustPlatform.rust.rustc
wrapGAppsHook
glib
];
@@ -76,12 +78,6 @@ rustPlatform.buildRustPackage rec {
patchShebangs scripts/meson_post_install.py scripts/test.sh
'';
- # Don't use buildRustPackage phases, only use it for rust deps setup
- configurePhase = null;
- buildPhase = null;
- checkPhase = null;
- installPhase = null;
-
passthru = {
updateScript = nix-update-script {
attrPath = pname;
@@ -92,7 +88,6 @@ rustPlatform.buildRustPackage rec {
description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3;
- broken = stdenv.isDarwin;
maintainers = with maintainers; [ dtzWill worldofpeace ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
index 46f8458f1533..f702a667ae16 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pidgin-carbons";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "gkdr";
repo = "carbons";
rev = "v${version}";
- sha256 = "1aq9bwgpmbwrigq6ywf0pjkngqcm0qxncygaj1fi57npjhcjs6ln";
+ sha256 = "sha256-qiyIvmJbRmCrAi/93UxDVtO76nSdtzUVfT/sZGxxAh8=";
};
makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ];
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index c373d23948b8..5aaed6eb211b 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -4,7 +4,7 @@
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
-, traySupport ? true, gnome2 ? null
+, traySupport ? true, gtk2 ? null
, pgpSupport ? true, gpgme ? null
, pythonPluginSupport ? true, python ? null
, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null
@@ -12,7 +12,7 @@
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk-pixbuf != null;
-assert traySupport -> gnome2 != null;
+assert traySupport -> gtk2 != null;
assert pgpSupport -> gpgme != null;
assert pythonPluginSupport -> python != null;
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
curl libmesode cmocka libmicrohttpd sqlite
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk-pixbuf ]
- ++ optionals traySupport [ gnome2.gtk ]
+ ++ optionals traySupport [ gtk2 ]
++ optionals pgpSupport [ gpgme ]
++ optionals pythonPluginSupport [ python ]
++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ];
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index fe7a2e3ba0f3..764a5ac3db51 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, dpkg
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3
, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg
-, at-spi2-atk, libuuid, at-spi2-core }:
+, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }:
let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
- version = "8.68.0.100";
+ version = "8.69.0.77";
rpath = lib.makeLibraryPath [
alsaLib
@@ -40,8 +40,11 @@ let
pango
stdenv.cc.cc
systemd
- libv4l
+ libv4l
+ libdrm
+ mesa
+ libxkbcommon
xorg.libxkbfile
xorg.libX11
xorg.libXcomposite
@@ -65,7 +68,7 @@ let
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
- sha256 = "gHjgQRdNABO+R+fcDurHDAQtZpckIxLbODM6Txz+LH4=";
+ sha256 = "PaqlPp+BRS0cH7XI4x1/5HqYti63rQThmTtPaghIQH0=";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix
index 0ce5f764128d..47027da9a919 100644
--- a/pkgs/applications/networking/instant-messengers/stride/default.nix
+++ b/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
-, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
+, freetype, gdk-pixbuf, glib, gnome2, gtk2, nspr, nss, pango, udev, xorg }:
let
fullPath = lib.makeLibraryPath [
alsaLib
@@ -13,7 +13,7 @@ let
gdk-pixbuf
glib
gnome2.GConf
- gnome2.gtk
+ gtk2
nspr
nss
pango
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index 1625878a2d07..aaa00e031d16 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "teams";
- version = "1.3.00.30857";
+ version = "1.4.00.4855";
src = fetchurl {
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
- sha256 = "06r48h1fr2si2g5ng8hsnbcmr70iapnafj21v5bzrzzrigzb2n2h";
+ sha256 = "1g0lsydz4l536qf890drdz6g86xb0sm3326hz3ymj9pi8vvbs7d9";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];
@@ -38,9 +38,13 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg-utils}/bin")
+ gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox)
+ gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox)
'';
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/{opt,bin}
mv share/teams $out/opt/
@@ -54,6 +58,8 @@ stdenv.mkDerivation rec {
# Work-around screen sharing bug
# https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html
rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay
+
+ runHook postInstall
'';
dontAutoPatchelf = true;
@@ -76,6 +82,11 @@ stdenv.mkDerivation rec {
echo "Adding runtime dependencies to RPATH of Node module $mod"
patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod"
done;
+
+ # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406
+ # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue
+ # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning
+ substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox'
'';
meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index 3dfbb69e83c7..e266265291b3 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -4,13 +4,13 @@ let
arch = if stdenv.is64bit then "amd64" else "x86";
in stdenv.mkDerivation rec {
pname = "teamspeak-server";
- version = "3.13.2";
+ version = "3.13.3";
src = fetchurl {
url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2";
sha256 = if stdenv.is64bit
- then "1l9i9667wppwxbbnf6kxamnqlbxzkz9ync4rsypfla124b6cidpz"
- else "0qhd05abiycsgc16r1p6y8bfdrl6zji21xaqwdizpr0jb01z335g";
+ then "sha256-+b9S0ekQmXF5KwvVcmHIDpp0iZRO2W1ls8eYhDzjUUw="
+ else "sha256-Qu6xPzbUdqO93j353cfQILlFYqmwFSnFWG9TjniX0+c=";
};
buildInputs = [ stdenv.cc.cc postgresql.lib ];
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 087dd502946d..dfc2613d3e9e 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0";
};
- buildInputs = [ python unzip wxPython wrapPython ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ python wxPython wrapPython ];
pythonPath = [ wxPython ];
preConfigure = "cd torchat/src; rm portable.txt";
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index d7deb7ee052c..27312a18ec40 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -1,54 +1,73 @@
-{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook
+{ stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook
, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify
, wrapGAppsHook }:
let
- version = "5.0.1";
-in stdenv.mkDerivation {
pname = "vk-messenger";
- inherit version;
+ version = "5.2.3";
+
src = {
i686-linux = fetchurl {
url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";
- sha256 = "1ji23x13lzbkiqfrrwx1pj6gmms0p58cjmjc0y4g16kqhlxl60v6";
+ sha256 = "09zi2rzsank6lhw1z9yar1rp634y6qskvr2i0rvqg2fij7cy6w19";
};
x86_64-linux = fetchurl {
url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm";
- sha256 = "01vvmia2qrxvrvavk9hkkyvfg4pg15m01grwb28884vy4nqw400y";
+ sha256 = "1m6saanpv1k5wc5s58jpf0wsgjsj7haabx8nycm1fjyhky1chirb";
+ };
+ x86_64-darwin = fetchurl {
+ url = "https://web.archive.org/web/20210310071550/https://desktop.userapi.com/mac/master/vk.dmg";
+ sha256 = "0j5qsr0fyl55d0x46xm4h2ykwr4y9z1dsllhqx5lnc15nc051s9b";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
- nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ];
- buildInputs = (with xorg; [
- libXdamage libXtst libXScrnSaver libxkbfile
- ]) ++ [
- gtk3 nss alsaLib
- ];
- runtimeDependencies = [ (lib.getLib udev) libnotify ];
-
- unpackPhase = ''
- rpmextract $src
- '';
-
- buildPhase = ''
- substituteInPlace usr/share/applications/vk.desktop \
- --replace /usr/share/pixmaps/vk.png vk
- '';
-
- installPhase = ''
- mkdir $out
- cd usr
- cp -r --parents bin $out
- cp -r --parents share/vk $out
- cp -r --parents share/applications $out
- cp -r --parents share/pixmaps $out
- '';
-
meta = with lib; {
description = "Simple and Convenient Messaging App for VK";
homepage = "https://vk.com/messenger";
license = licenses.unfree;
maintainers = [ maintainers.gnidorah ];
- platforms = ["i686-linux" "x86_64-linux"];
+ platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
};
-}
+
+ linux = stdenv.mkDerivation {
+ inherit pname version src meta;
+
+ nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ];
+ buildInputs = (with xorg; [
+ libXdamage libXtst libXScrnSaver libxkbfile
+ ]) ++ [ gtk3 nss alsaLib ];
+
+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
+
+ unpackPhase = ''
+ rpmextract $src
+ '';
+
+ buildPhase = ''
+ substituteInPlace usr/share/applications/vk.desktop \
+ --replace /usr/share/pixmaps/vk.png vk
+ '';
+
+ installPhase = ''
+ mkdir $out
+ cd usr
+ cp -r --parents bin $out
+ cp -r --parents share/vk $out
+ cp -r --parents share/applications $out
+ cp -r --parents share/pixmaps $out
+ '';
+ };
+
+ darwin = stdenv.mkDerivation {
+ inherit pname version src meta;
+
+ nativeBuildInputs = [ undmg ];
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/Applications
+ cp -r *.app $out/Applications
+ '';
+ };
+in if stdenv.isDarwin then darwin else linux
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 09a5d781c447..1abedf58026a 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -22,13 +22,13 @@ let
pname = "wire-desktop";
version = {
- x86_64-darwin = "3.21.3959";
- x86_64-linux = "3.22.2937";
+ x86_64-darwin = "3.23.4046";
+ x86_64-linux = "3.23.2938";
}.${system} or throwSystem;
sha256 = {
- x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1";
- x86_64-linux = "1pl2dsrgckkd8mm0cpxrz8i8rn4jfx7b9lvdyc8392sbq4chjcb7";
+ x86_64-darwin = "19k8102chh4yphk89kiz83yarawnzdnsq0hbsqpjdhbmarqjcd9s";
+ x86_64-linux = "1cx5azl5dvya1hf0gayafm4rg6ccmmq978xsgm6lf0rlb4kirj65";
}.${system} or throwSystem;
meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index efb913fca730..1a92ca51aca0 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -23,7 +23,6 @@
, pciutils
, procps
, util-linux
-, qttools
, pulseaudioSupport ? true, libpulseaudio ? null
}:
@@ -101,9 +100,13 @@ in stdenv.mkDerivation rec {
rm $out/bin/zoom
# Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect
# everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm:
+ # Also clear Qt environment variables to prevent
+ # zoom from tripping over "foreign" Qt ressources.
makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \
--run "cd $out/opt/zoom" \
- --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]} \
+ --unset QML2_IMPORT_PATH \
+ --unset QT_PLUGIN_PATH \
+ --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \
--prefix LD_LIBRARY_PATH ":" ${libs}
# Backwards compatiblity: we used to call it zoom-us
diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix
index 9a42d0aa99b1..4bbc1589ed2e 100644
--- a/pkgs/applications/networking/irc/convos/default.nix
+++ b/pkgs/applications/networking/irc/convos/default.nix
@@ -6,13 +6,13 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
- version = "5.11";
+ version = "6.06";
src = fetchFromGitHub {
- owner = "Nordaaker";
+ owner = "convos-chat";
repo = pname;
- rev = version;
- sha256 = "08k8dqdgz2b3p8g1zfg9i74r5nm1w0sqdm759d1f3jcyp737r47x";
+ rev = "v${version}";
+ sha256 = "0b3c8hj9cjmpzy9k949vdv1y3v7b94nh0mq15rcv3ax0sj3gd0qr";
};
nativeBuildInputs = [ makeWrapper ]
@@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec {
propagatedBuildInputs = [ openssl ];
- checkInputs = with perlPackages; [ TestDeep TestMore ];
+ checkInputs = with perlPackages; [ TestDeep ];
postPatch = ''
patchShebangs script/convos
@@ -54,6 +54,9 @@ perlPackages.buildPerlPackage rec {
#
rm t/web-user.t
+ # Another web test fails, so we also remove this.
+ rm t/web-login.t
+
# Module::Install is a runtime dependency not covered by the tests, so we add
# a test for it.
#
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 91617a267827..7c9714b3555a 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
stdenv.mkDerivation rec {
pname = "irssi";
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k";
};
+ # Fix irssi on GLib >2.62 input being stuck after entering a NUL byte
+ # See https://github.com/irssi/irssi/issues/1180 - remove after next update.
+ patches = fetchpatch {
+ url = "https://github.com/irssi/irssi/releases/download/1.2.2/glib-2-63.patch";
+ sha256 = "1ad1p7395n8dfmv97wrf751wwzgncqfh9fp27kq5kfdvh661da1i";
+ };
+
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ];
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
index b55266e5f374..78f9fc082e31 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A WeeChat script that sends highlight and message notifications through notify-send";
- homepage = "https://github.com/s3rvac/weechat-notify-srnd";
+ homepage = "https://github.com/s3rvac/weechat-notify-send";
license = licenses.mit;
maintainers = with maintainers; [ tobim ];
};
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index 0929c745b212..69d3bde42e80 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
- version = "1.4.2";
+ version = "1.4.3";
disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "v${version}";
- sha256 = "sha256-cPH0wD7RL3OifDTD48x58I4qeaLALOMFnfWXjE2/lUQ=";
+ sha256 = "sha256-+eBwBZx+kp2ACbFjtYK6ux9lcPmEQsunvxAAZ2HgAYw=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index f6bea3c83574..e17507366ffa 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -10,6 +10,7 @@
, gtk3
, glib
, libnotify
+, libpst
, gspell
, evolution-data-server
, libgdata
@@ -80,6 +81,7 @@ stdenv.mkDerivation rec {
libgweather
libical
libnotify
+ libpst
librsvg
libsecret
nspr
@@ -99,7 +101,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_AUTOAR=OFF"
"-DENABLE_LIBCRYPTUI=OFF"
- "-DENABLE_PST_IMPORT=OFF"
"-DENABLE_YTNEF=OFF"
"-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin"
"-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn"
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
index 2ac32f34304f..b7527d04cb69 100644
--- a/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "mblaze";
- version = "1.0";
+ version = "1.1";
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "leahneukirchen";
repo = "mblaze";
rev = "v${version}";
- sha256 = "0hxy3mjjv4hg856sl1r15fdmqaw4s9c26b3lidsd5x0kpqy601ai";
+ sha256 = "sha256-Ho2Qoxs93ig4yYUOaoqdYnLA8Y4+7CfRM0dju89JOa4=";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 18110dc7a364..e7b5496e9101 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
{
- version = "78.8.1";
+ version = "78.9.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/af/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/af/thunderbird-78.9.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "086a23b05a2baf8e8a1b44891017c6fef8c45d4e4802b519ceeda2bf62496649";
+ sha256 = "58bc04e46def73b3530323e56d143db324a5a80f426b37ff396e2e43cf8b0042";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ar/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ar/thunderbird-78.9.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "b5b643119f0d0336d61972d91f20764590d7453cb391165283e00dc980d3bdef";
+ sha256 = "9520899691eb7e4e7dad95ce643da5cb966c1058b3cc952b55bd66d7a09473ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ast/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ast/thunderbird-78.9.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "2e219961dc2b33f7680be0a6fbd03c0032fdbb557a3dedaf32773efb6cf7a061";
+ sha256 = "769e7cd3699577a1f69e62492c8058eca635ffaf6acab6ca3a4112301aab751f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/be/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/be/thunderbird-78.9.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "ce8a7e4f025b6064ff4eef01c634b2b7f52ec0ffa5eb7094f0483c7d6f31b939";
+ sha256 = "c1b35990af2731b52da57b4b6b0e4a7733ea2e8d499e95b3b086dde3bdccb657";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/bg/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/bg/thunderbird-78.9.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "a7dff0d43d11473d47df6672da8515b5d1393eea581193fdb8b334cfd8c780e8";
+ sha256 = "708709a3acb4689de7870d21c258ccbc03a1fdb92a43164841571e6643bf2988";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/br/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/br/thunderbird-78.9.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "70b0a987b1677fe1b78b4105dc15aea80448e71cde8a2a31f32429111b07c92b";
+ sha256 = "e84f1dea6f550a1827399d0e7f658f376c816d3f7abe962ec58115d36c28c1c5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ca/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ca/thunderbird-78.9.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "0e311309e7a9b03afd92fb3f38582ad318c10d3342238db42d30504123bca080";
+ sha256 = "8191514f74876406cf6f332a0063032206d1b6f29414941dee3082ce1bc6e711";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cak/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/cak/thunderbird-78.9.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "86506acf4c23672469c6bc533019e0a2b4872efcad07468dd3c5a2f1b6ac7dd1";
+ sha256 = "9626ab3117cb4567ba65b24c5800f39fe7dc9c372c60f88ba0906eb72d63ffb0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cs/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/cs/thunderbird-78.9.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "6a63442f96a88c9b80b436eb280a5e67553751c946802bfe81db017eb1a11874";
+ sha256 = "294f60b4efa04fcc9bdea8c4107ac572613d63c742ae9492eb63f5eadcef1448";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cy/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/cy/thunderbird-78.9.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "7b70af973f706976b87cac4e48623a3c3dad20538d2bc0bd4cdfd57bf1937f54";
+ sha256 = "865d631746754969d7dd59b096306aaacdb189b967e295676a3a7253a5af8ed3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/da/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/da/thunderbird-78.9.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "2b3eb2c351b4df91d2520ae4b93687eba47a6f7b6182086345cad0629ffc9538";
+ sha256 = "cb8b05cf1938326a4246f670bc324d83179f3ce1f3d4f3d8de57599da031ec9b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/de/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/de/thunderbird-78.9.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "ecd00d0713704e323acd7a1a0da88bfc3c92a85a99611f6af1b5425387428af0";
+ sha256 = "9dfc5b4490c8ba926ce30605e3575cf3b471fae1f1808fb5054667c2751956c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/dsb/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/dsb/thunderbird-78.9.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "8808ff0c67014db313413aea3e8dbe7c0e0501c878572f2db1765d4b8c6ebe3b";
+ sha256 = "1752031e919fc1604c1d70ff5a9036d8752a0de78c0d0539860c45390b09e13f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/el/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/el/thunderbird-78.9.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "f83554e57ccf5a3c56b6111a928e2e983c07bac131ba8a74e9449250b644fafa";
+ sha256 = "bc2c7b093dd00c352874c7ae6e3d88e455fe9b357caa0e358d51dde120398f41";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-CA/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/en-CA/thunderbird-78.9.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "138384402cfedf4d725b5e74f1c3150d078fd422d5440246e841b9ee5c458128";
+ sha256 = "5605286eb97815d5acfadc0a93888a1e8d08e9b8bb5e7b28328c9650f6a9d065";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-GB/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/en-GB/thunderbird-78.9.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "9058897455dad34af97f1f3e1ccd517244de9c2f9a51ff3a8d222d8439b5865c";
+ sha256 = "bc0a4c15cb3d4f1891e91a7bc5cde53065cca95fe5c72c18bd39e0bc618b5d01";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-US/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/en-US/thunderbird-78.9.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "7ab2fdf949a7cfd7abbba7bb2307bad08fdebed24a0446514be89c308af587b7";
+ sha256 = "65e1539602d206cfb78cb7bdf864d251670242d775f62aad25a1a52dcf1e9e55";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/es-AR/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/es-AR/thunderbird-78.9.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "71396deb4b1148a20af83bf7bf62dca00ec43b8cb64b5902f8bf52d861dd861b";
+ sha256 = "e246d1f0fda4091888dcac7c5e8d5367688d86e6f65237e942baee0c2c82136b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/es-ES/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/es-ES/thunderbird-78.9.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "6dd479e524e4bfa7ab1488d808bfde041c34d2a13de1003f1c2a2ee0db0fc772";
+ sha256 = "a24902cdd4eb9f70b435f52c9244769bc674fc16194a908976c28c8de3d94674";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/et/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/et/thunderbird-78.9.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "259ee045328d21c877ca67223f91e438496e6675cb97d825482a8213b3bbb161";
+ sha256 = "891fb76d3f9044ea44230d72c6b8bd4db63c63c71dc83506e91b31329e1b0c11";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/eu/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/eu/thunderbird-78.9.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "18a4fadc4a8d167489924042510c06d58c599997e28f652eacc3e4c85841a932";
+ sha256 = "cfe8c0e314dffd57e653204aa5aebe790147f3a1060cc1f95da0045d1c188cd6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fa/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fa/thunderbird-78.9.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "0b397cd272cd386dc4d0cca7999198098a8cf4dc9088b93b05a7de75de9a9397";
+ sha256 = "66aba0dbc241d954b18da9c94c6c8d7b33dbc8721560a23def882cde249d17ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fi/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fi/thunderbird-78.9.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "9f1b5bed03fcf37f0e3a5155c36a691766ab88cb9604821b4f07ee9f25cfbc9c";
+ sha256 = "e05b5be90b40dd61a3686d3fb011745431f915a0d74e08a157668cfa1633d5f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fr/thunderbird-78.9.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "ff806999956ffe547bd987870a804942462276a10f1334df00797e56482dc4a5";
+ sha256 = "f4c80650f755a65c1371aa9bc35da6e1fc54f6c44dd6e6bed1f3ce8ce883656c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fy-NL/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fy-NL/thunderbird-78.9.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "50f7343fa2fa61fa46e7a05f86479743271bde3021efa27ba948923467fb0170";
+ sha256 = "4ada1d224c11081bc7cf7fec51e6cbef695650cdb9b860320da9a070d01bcaed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ga-IE/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ga-IE/thunderbird-78.9.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "e2912457c0e390f84f375fde8946c1eca15b036fb4016ca7cd608a9c61eb5060";
+ sha256 = "e2b6437b4b10a636d585dd591c933df370a5b70bc0a447564ab8dbb4df5c22b9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/gd/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/gd/thunderbird-78.9.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "c5b2f349c98fa51f5b6dc57cc9d16f408d9659fa979c4ee86b5c51f2c163f8a5";
+ sha256 = "034b5dd31ac4df1ea8f19b52739fa632a53d063a6ca07e4d36194c55452aaef5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/gl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/gl/thunderbird-78.9.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "0580beef930019c5312ba4ed38e6570f4d4b85857d4c002461b07f705e261b3e";
+ sha256 = "1afb41188de30c672d3a15e7b8e8b0690ac8358069824edf7215f99f73333d32";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/he/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/he/thunderbird-78.9.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "d7ddfedb469437e7df9b0ef967e578047ca70b5d45dc5175ca08f5d1b920d5c1";
+ sha256 = "492f33bbc7f6d6e53aaaa3587d22156afb32d0753609818eeefe7ea53bea788b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hr/thunderbird-78.9.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "5c9c1535488e987113f356a94ffea5e5005f1eea92fb9eaa530793006d2df8cd";
+ sha256 = "a61743f3661eb8ce93cc58dc80ce5950534dd7c89e067a3460daa4502761e3b2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hsb/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hsb/thunderbird-78.9.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "3dfc77687f2ad8f9bd9a452d519172953a44b3574057f871e466d3dfc2e78cc2";
+ sha256 = "cb1d4f8da3071ecd4ce4f9ae43d1e4d7dcd8edbc6dbf4917bcd1730cc5a0477d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hu/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hu/thunderbird-78.9.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "f043129670231c41cdeb8d742e50873306e34860fb702876105c88a80aef0629";
+ sha256 = "a4ae0452d90d3c5c7778732811d97243b9b4767208239c8a24d4b4d368630d22";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hy-AM/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hy-AM/thunderbird-78.9.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "7c4e3df3c4115e3de684970d68c5a3aad8a5ac1151ce802d4adbb381f5d76529";
+ sha256 = "cab2129d4c4e99592ce6f22d676a03ff1cc5d5bf579a2426d0079e0f86215ade";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/id/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/id/thunderbird-78.9.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "95776b92e84b5f1183129b3a7576542e807f701afbafd6e811522f709b30e933";
+ sha256 = "a1df4c7e0c359cab8b10692bfee5161d3bd44696ee06774985642604304f9b93";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/is/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/is/thunderbird-78.9.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "ac74b9ecc8312aa833ba9db2ff7d017c0891105da5e64580b9af8797fb77ca84";
+ sha256 = "bf6ec8c88f65d565f7dcecb1f3177a5a1e476da62d8aec82d3419e3ed1794798";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/it/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/it/thunderbird-78.9.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "d3409725adfb192951a14569bf1d3c779162fbb1f33c7be944345e3df191ebe3";
+ sha256 = "e028a6fa97dd9d37945137602d45230108fa30d63edea8df8531089724646e19";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ja/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ja/thunderbird-78.9.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "9c7bbe228994d06397cd4490b0e6c667b8ab14b94398ef9b0a0bc135d3c6c392";
+ sha256 = "6435637e0582123c1b941b1c6209aa1bfdec471d3ce76a861c82e876b7637fee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ka/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ka/thunderbird-78.9.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "39681dd197986b4535b6f08904aa140f5517b3663dd16f055d514be509bea217";
+ sha256 = "8d00d918c42450ac7a451a0a5a7407ecb334b51bd20c3f33871a29c82f338175";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/kab/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/kab/thunderbird-78.9.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "30f473c45c5d2d60271469ee60174ce10989edea02bfe61503dca4be04f783c6";
+ sha256 = "59af5f436ccf0d0914f800ff6cb31fb341d3d905d3d450ed43a09d8810e50bae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/kk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/kk/thunderbird-78.9.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "b5dc4df14dd5de27a32332af867c233089081d43514d36a6955fb34dc46b0955";
+ sha256 = "70588dd395158e87bdf651a9ed2b1d92cc5792ed6c85160c2b1c2109d52a3ca2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ko/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ko/thunderbird-78.9.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "b151223ca74a4624912941ca5a33ea620ffadc4840a6b58b0459abc4b9fbcccf";
+ sha256 = "7a3473a4bd51f6931326c30c387546d4b900fd70a837e8d45380afd4597c10e2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/lt/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/lt/thunderbird-78.9.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "9405ddf255265811d274bb1c5d05fa5066976d36f1a7e5687a9c4930488ec269";
+ sha256 = "1e36db5d910184872af4e7623c59c79f8e522955c5dd5cba4a689a5bc2d857b0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ms/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ms/thunderbird-78.9.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "63daf0a4f33b6e04ca92b1b6df187c0fa52fad97863e66356fe6fc592610be0e";
+ sha256 = "058f825e44c24e837081bb05241c1ff47b390132dbd3cdb5b5d4ef51056bb2ab";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nb-NO/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/nb-NO/thunderbird-78.9.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "94e855d4d4c7724cae5060f595ddc5c6afbbcce95a47544c4e13131fc5e6fed5";
+ sha256 = "7f6335ff85c29aa634b7909e4b7a2da007f333648a98ad9f3bd8833d00f2f0da";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/nl/thunderbird-78.9.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "d3fef411d76b25d4791814bc2c867df1ff4d6388514026a243715c0b01eb6cc8";
+ sha256 = "0056c1250401f89ab8d9423f23d3148bcf34801b34247d4bc44b89e8edd0552f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nn-NO/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/nn-NO/thunderbird-78.9.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "b144ebaa2ec9a7596c671de0b00a2040b64681cbc92e6ede6f93b8dc85039f73";
+ sha256 = "f63e4305ba814a46edc4316af6ad02acd479306f2f1c02c1b04065ea20baf59f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pa-IN/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pa-IN/thunderbird-78.9.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "5231448246edb5051015c7f8f6f9c8b2d4373746d5a6dde94a9ebf4c672c60e8";
+ sha256 = "654902d560df0648cd2e9b7b1271d3606071865dd1cc4490741a5777be2c72c3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pl/thunderbird-78.9.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "8250c42c98c9f5c8c2b071b0eb31b7b27e019513585bf0154bd9ea5c901a2aa9";
+ sha256 = "62c4352b987bef61f69bb0300c9cc37b95ca5e6fde57a06646b14bef6e58dd78";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pt-BR/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pt-BR/thunderbird-78.9.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "625c7d2d6620c045b153866ee310d8d04fd9998cfc51f5f458de19d7fd7452b7";
+ sha256 = "139606374df552562100c01e8a330fc1f4f9e6dcbc6a39396137d2f069ad0fcd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pt-PT/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pt-PT/thunderbird-78.9.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "2ead9fe00dd88dbf7245275f2cee002cf3205dd3256303f582635ca33b3aa60e";
+ sha256 = "eb6526b6ee0f768949489ca587c321ed8aabd258296c58e596b7a5413b458ed7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/rm/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/rm/thunderbird-78.9.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "b4b40e417a4bb52aed6bbb7f042d5e164ea2e9f4acf8cde680d4f19f37862e1f";
+ sha256 = "36a22f1c8eb1a5c7fb0e9323a3c3eb03f8a63b2b6c62430780bf4508a7236c41";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ro/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ro/thunderbird-78.9.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "cd0e8aa8e6b02cd7a432e2e943e1a61a65f152bdb9902a1f948e514c46cb8304";
+ sha256 = "92ae47ebf2ab176d46e04172206241aeae8a6eebf72b5f32d021782aa1675be8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ru/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ru/thunderbird-78.9.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "00602137ac0d86bbc08ddac08cb2805daed3d8c2b78b2408b34107bbd61c4e32";
+ sha256 = "97680d44fae135e90368adb75ac27b4f23f1186d1435ba265a80027334f320ec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/si/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/si/thunderbird-78.9.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "f1ad95430fcba364c0741c03fbbdbad602ad521959685ace7f3056fa801188af";
+ sha256 = "6ddf49c8696deb3ab9ac55453b93116c923ad0025c9c8463b56bdc81e6d00bb9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sk/thunderbird-78.9.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "30ebe0eaac08884d10f8cffa77d145600154b6969a212873bb189aea91187d54";
+ sha256 = "5e2be4cab9101a67c61eee16c8c84513b196dd19f6d0dfee3559796a8a031138";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sl/thunderbird-78.9.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "3f38b1934f6fd66efb97b83c83f76f09c649ef09108fe1a92515752b2d79c890";
+ sha256 = "ab9293a2a5caf948bf2e4b4680b9cf7440e7a272f9f028568e260c40d5a031ce";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sq/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sq/thunderbird-78.9.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "79780bad07999285a3ad37d85b82d7037fe4784b3a83f79f6907c73ad1a7ee55";
+ sha256 = "113171842441b9553e6da58c7ce3e3382fb9aa780892b8ee4436ff9b2bf3dc59";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sr/thunderbird-78.9.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "68430529f488d89730864a267a20c5f86b1ffa0b473bdf153c43e06a95a81c5d";
+ sha256 = "1b46f1597ab5aec2bca98adf9664cafd72ff51db23722108cbd4c0c89a1a8e70";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sv-SE/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sv-SE/thunderbird-78.9.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "3e2a8112b2da35af3402d0974a70c00ca6cde4cbf43f07141ff7b184d373d444";
+ sha256 = "41284557a6ae1b267eb3c2fdcc4a547834e833f55b5c1ad9c8bd9121c9d39dc1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/th/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/th/thunderbird-78.9.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "9b94b35004bec519e8bc8fa152c677189fc37e78a3bdedc0d77afb81bffb0c58";
+ sha256 = "99a342f303c3a890ee68514841d563fe493e2459a4d6f6769c42f986e122b7ba";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/tr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/tr/thunderbird-78.9.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "b1f0281f5a1a2454a38ccc66510b4de44c19f4300a990f994d5c0ac76b002782";
+ sha256 = "f827b3d8fb60540d00d20d4ec50dbd9e28af3798863fa4ccc1a862a08ebdd18d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/uk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/uk/thunderbird-78.9.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "ae53f162d9016a3f2b3e104c86aefb34ed9e96ce14cc3feb1584ce61617c3b49";
+ sha256 = "d8e30faa9f43308c31504437ae2187d5c1ce00c16cd430f31eaacf8dbed71604";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/uz/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/uz/thunderbird-78.9.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "6d43cbdac67084253eda88d0cd58440229def6d03904b4e1a8c9b9133ed7bb55";
+ sha256 = "00e3e3a43519fa8136d3cde8527f3e9c44732ef6d5aac9cc2e1f28feaf940a50";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/vi/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/vi/thunderbird-78.9.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "f29e5e685c3b072ece7ef6cd645b2596025848e9b72b00fbb49378b8f25ef3a9";
+ sha256 = "f16b0fca32c85e648be8c8d4c9ddb6d8fde726f1386d0dd29ec050b39d827fe2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/zh-CN/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/zh-CN/thunderbird-78.9.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "e4789a8b85555be1fab438e694562bec0b2022a6955ad098b837c48d3954452c";
+ sha256 = "51007e8318fbf673eb63bf20be8daa35ef8e2d6fee9fd9356dbba98d843dc813";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/zh-TW/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/zh-TW/thunderbird-78.9.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "7d4246056adf297ac1bf3c7de20d067453e41350b089841d617e2ac6ecaab0ac";
+ sha256 = "ef7a5507b47725ba7bca853c1f5bf20eb36d31fbbc8c912596a5993f7dca57ac";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/af/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/af/thunderbird-78.9.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "1c09247e43ebfd2cd10995e76ff791b6c78d4545ebcfa37959b154e5307e17a7";
+ sha256 = "435ba6c5a5901fe1daa1b19c36f1071086d21e2f321a52afe1db0c03a0044635";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ar/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ar/thunderbird-78.9.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "bd7a46b42a8200f0515be9798bda145f398e2db32357ae8c46c1dc89cc823dd5";
+ sha256 = "4ac307dbe93e69e6dbb629756363900256ec735c1927cad74acb0c5f8e255b92";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ast/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ast/thunderbird-78.9.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "418fc4d19a9d4ce982e534c7be95b79dd2c15311040e2c50e5644f3a5e3cf245";
+ sha256 = "3d9a01438e82350e5a60ee7944226d9a0f46384673ddae01f8f8fe445df40312";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/be/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/be/thunderbird-78.9.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "27b9271c984eb739cc4782050bf5f896da01ced7803dae8e81181ac4a8c0df86";
+ sha256 = "9a5b22648d8c7c05d5f0be0d1f450baadccf791353a23bc1b6889e8911d90c5a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/bg/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/bg/thunderbird-78.9.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "b63ca81e05c4a16497339374f297ced5033daa275fd48fe9884d4945f216771a";
+ sha256 = "77cf8d4912c2b5b34fa0235ddbb95cd90bcf83d1d528275b23de08dad59116c5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/br/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/br/thunderbird-78.9.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "f213c17427b907a21a3c4eb2976eccca91423a1400260b22ea59c588a2e1e9d1";
+ sha256 = "9e7bcb749e0d88efd60e6bed2fc77e39deaf8a82db56c304529d44843657842d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ca/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ca/thunderbird-78.9.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "8bd818f98c17b8e954883c462064994c469fa805aadf74b6e0915824e1ad929a";
+ sha256 = "0206a127cbf5f9b1c4c4711d4d05591d175c9e96c2354790c220e9587c356aba";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cak/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/cak/thunderbird-78.9.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "6213c8b217db157f40e008af10780edef5a02ffdc2442240597a00252f4f58ea";
+ sha256 = "e47d892a90c3b9ec29365cc0173066234e21cd989c4b588e43fecb61b10d1f80";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cs/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/cs/thunderbird-78.9.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "22491715bd72408d7c15d8fc137ccc496a0ea075217485a8e31abf73ca09bad7";
+ sha256 = "bdcfb9cf6e3207a41634eb54c472117c33b0df981d900c4dd0dbff0463ebe57a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cy/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/cy/thunderbird-78.9.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "3d4f07b0055d92dcbaaafa139959de7071b2b3d74c49452bbb2556b1ed3ae82e";
+ sha256 = "5b0def675213d882ea653ffd7b5aa62f96000d4aaee8e06ad1fd5984ac99c8c7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/da/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/da/thunderbird-78.9.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "409779e136c0efb3dff667e50b9ba318937d3e96ac918b8272741ea004ec3f5c";
+ sha256 = "617579da2580a0d9a5a6e64ef7c4b028fde31f82dcf8139104c380e51ec50227";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/de/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/de/thunderbird-78.9.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "ac5ca1fe2247cd4d05862c00592c86dda480108b7a40e284ccc67718a1762f78";
+ sha256 = "5cdee984aa63595fbcb00303f14fd19d124ef9b267d490d5263c7554f4ea0dc7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/dsb/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/dsb/thunderbird-78.9.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "769d47c388ef4dfced4ba770f78eeedcafdc834dc4fa4175eaa92710ddc2e0de";
+ sha256 = "fa05969bcc025056b8ba9c056af0051fed91a967ebf9e21ccab7654aaaa6ba1f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/el/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/el/thunderbird-78.9.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "1a2daf5b0ccc36acae027da2281998b4333ea4e9981c7106243c68188517f482";
+ sha256 = "03b58dbcabb41c0140c18f1ff31dd32e4d2d006c85af75d73bcd656587e787ed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-CA/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/en-CA/thunderbird-78.9.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "3a55772b7bec93bec83de289b5b36129e8e0d988d54db3d66ffcaf8326786ae3";
+ sha256 = "6cd222aacb8eba184dc3eef308fe7b564c70da2ba6c38e6e4e328e999b7229a4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-GB/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/en-GB/thunderbird-78.9.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "f41b610c6a3f4f5d3e2c648d05ca210cf9bdbb998b94f298f81dd84601c00be9";
+ sha256 = "9d3ca50977bd5c6f8a5bd998549db0dc2ccc6aa5d33c914e93d42e2ae69e8cbd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-US/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/en-US/thunderbird-78.9.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "9598fd9175cc0d641387f6ac7f475d970b4f0864872b5d875d170039d6c97b39";
+ sha256 = "84721e190b6b95733a47a16853e1fe1e0c7b0e4693d3b7752aa59583fba92f97";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/es-AR/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/es-AR/thunderbird-78.9.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "603106740e8db3a7c9220897b9146ef53937bd57a60258a04548e1afb41d983c";
+ sha256 = "dcadcd68506406f718871d7576b47086d59ca159a5bc6d878d022141029df2db";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/es-ES/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/es-ES/thunderbird-78.9.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "e0f5f3d6aed26310bfee54099c73a13417be36eb737f6123526e94a5286f6336";
+ sha256 = "46526dd5b4bb123e774d3a3fa8fd88a8982cfb36a252b09fa98aa6cb773ff0d2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/et/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/et/thunderbird-78.9.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "bc4a1dc96e8ba31d0817f369af4e3e10b672aa854538093ef1d02126bcff24bb";
+ sha256 = "de0b695be00721244ff20b2046bb376342fba7c422980443b217f5d4cfa83d48";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/eu/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/eu/thunderbird-78.9.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "2c61d117e5fa23d62197f9b2c0512547356b65098eee5fd72285317caca6b51a";
+ sha256 = "543d45e256951cbf21bc61359e99daf2c80789a88641ae2231c1eb0ade133198";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fa/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fa/thunderbird-78.9.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "6b93377b457ec1e0dd343bc4d2193c6bb3030450e76757ac042c67e353075310";
+ sha256 = "6b95ebccf7ccca90c3310923f020ba6f05fa715d64c79acd770a491e15a9938f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fi/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fi/thunderbird-78.9.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "9e07a2060b821047c494e03d9ab74b8f3aeea322aa1e1bdde080637187f89e05";
+ sha256 = "145c2479a73955f9ffe6ebd2d41eced848770729f218381735aafe5c3cc0b3a6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fr/thunderbird-78.9.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "d4ea501f5a42effdb758ca24f2da7bd4ca1d83a8ea6da467fd63cbef96f8b373";
+ sha256 = "9178d90f346d62b6aa0bb4b081b6bebc214d333d6a042c46ee1af7661ffc3b03";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fy-NL/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fy-NL/thunderbird-78.9.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "9aa11144cf22a5db5200628ac5e55a55b83ffda35306cf1909aabac9fe4878c2";
+ sha256 = "fe3574999f0d1fff276fdfd7d432859d495c2b64137d33ee418ef1e4329b1b72";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ga-IE/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ga-IE/thunderbird-78.9.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "15af980b46c8cf80b60a999e2ca3b30c92719638af51d9e82133f58de61d7ed5";
+ sha256 = "1570882cd8345f86de38179713a7f7acb94768c4874e571a20314fb01154e1bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/gd/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/gd/thunderbird-78.9.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "cdeb93b31a1a9521dd7f91081f28c1a64e0e6a218f1c0015ae9c54d73cc91f0d";
+ sha256 = "9405a2a7ce52a48292bf4b6b20f3b1e96c12460a1e44a90ccdc31cdb21acda5e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/gl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/gl/thunderbird-78.9.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "48d973991c0cbb9988339c185d1ea8fda4c6cea6f0667cfaf8f2bdeec4c55a23";
+ sha256 = "930a9a3e06bc28ede54ec43e8bb92cc30329d7f0271629b37ac3753191f7e133";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/he/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/he/thunderbird-78.9.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "c2f50a1fb3e877e3c08927eef96f104f5f970cb7629af21de3344e539617422b";
+ sha256 = "eb08c16b7df47fd501f61049b19f3f8f827870c8681b9230564276bc0cc9ada8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hr/thunderbird-78.9.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "ec3596067c8245cd5cef8fc649c3d1fd6d38bb802e2a05947ab9e62b8d393b91";
+ sha256 = "c866290def37d2e16274820d5846bec52afc7c7da1f8df812df930f0c68c6b56";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hsb/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hsb/thunderbird-78.9.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "0209d678b9353513bcab3c647100c35d772d25b1969bb9970266c09f2db01e05";
+ sha256 = "0df5dc60047e68aadc7a96e194468d42e977c7a90d9faa8c4684f650763825f8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hu/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hu/thunderbird-78.9.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "817cef3a34c40ed31a59421f89a94de5b7be165cd1bd93fca7b2560cad3e05eb";
+ sha256 = "e76e78c1c77b59eb7a3ffad0da149dcc7f64d6b0305f5a5a607ad2745d224e17";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hy-AM/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hy-AM/thunderbird-78.9.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "ca49953791109563cdc81a3458a5b3dd15ebb49a255752052e927daad199b0fa";
+ sha256 = "0dde11bb6c6ba186925010cee97b59d3c64890b108ef478be5578218954a39cb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/id/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/id/thunderbird-78.9.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "33fb9d6c721f79e4808f077573828c26b671434b0308db9c33386dbd975c4a53";
+ sha256 = "ceea16b87a7d8b44b187d950f4c9fc5326ed7a550c38e0f41645004a324669a0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/is/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/is/thunderbird-78.9.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "d498ac95c289612a253962d1988ac9d1526864926c9a4b9cc2985fe1d84ae03d";
+ sha256 = "a98177d8f62b1ffe056ba3c1f2ec9d7b3f47ad8d47459328692e9bee5e1d02d2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/it/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/it/thunderbird-78.9.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "cff73b132740bf3854977f62afe8076c7c660559cc8a96fbc36c4ffadd46d50e";
+ sha256 = "259b8e4e08828b544ba61541629025d4a711f44dc4c476b3e3971a633301b298";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ja/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ja/thunderbird-78.9.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "d8ffe86ccbc4de40a0909f55b750380454a2f51f450b4c8b49886612a49997fc";
+ sha256 = "6f2511dab5530e58664f386cb65b26d82fe581faee01b1a76cdd29e3ee3a1955";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ka/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ka/thunderbird-78.9.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "1bf02cd11b554b597b6f5facdd07b6ae7826ad24a2f1ceb432bca6fcd0396749";
+ sha256 = "368a85fcb387703df7422d1ce199a499d0e4796f4fdd4775aef27c5b36272fa7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/kab/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/kab/thunderbird-78.9.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "aa0295643ee24b0e76d5567c4f43f94ddf4a820cde2bd5be5a6dbc0b2f1c7271";
+ sha256 = "33bfd965c79bd6935516729f3eedd65be2b3f754c9225d6ffdb4af201b0d13a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/kk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/kk/thunderbird-78.9.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "265e5000114d7f3d204885a5c4eb5ef71780699f185f570da90737001023d4b5";
+ sha256 = "20dfc052f78a58d4fd96a0df22b55559ca43d8792dfda372dfede1cb49c6b185";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ko/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ko/thunderbird-78.9.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "a1622a295ab259400d61e9487f40b7e34c143b81afb1f354647a48cb56425d13";
+ sha256 = "63479eb7fcaea17ea29c98b624c36ac20ff2ab9e42bae1a355c78f05d5f9e313";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/lt/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/lt/thunderbird-78.9.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "423926d31fac238ec493de6f48d14530cf58bf0829b73505f7ea4138f6bdeb56";
+ sha256 = "2d50db9e0698c991e10a6ec6e627b02d0aca9e18b857aa290e4aab926e8ee88b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ms/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ms/thunderbird-78.9.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "acdfdeecc6c5ff04c1428185bbe63a6e38b1545daa9e69888b78e2b5ba3b9194";
+ sha256 = "66969627bd536d9a8e8d8717bab010ceb16350425d31ea114bc7e012ba1f0922";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nb-NO/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/nb-NO/thunderbird-78.9.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "f62a4f2d2c8e93b58f3a0c35e6885c1e46a8b6ed1fd0414e719c480f99fa2cf8";
+ sha256 = "1db46ff207d356adaf761db2fac7961b20633dc6578ce562154a1bdb308256e3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/nl/thunderbird-78.9.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "c2dda812534a9155f79fc2249cafd8e77e572cc20bdaf1bbf637bea4daf5e612";
+ sha256 = "0259c04b35bd30b5feb44da31b639938504f1402879205263eb63f7a59153f11";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nn-NO/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/nn-NO/thunderbird-78.9.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "84fae5d60ec7223c0404033ad2e2b776c4a9353b55e0256c7ca7122aebc031a2";
+ sha256 = "1de52759f96302447829e0de40319394ac0b1802ec60c0c242cf85c0ca5110c6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pa-IN/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pa-IN/thunderbird-78.9.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "0fa48cf1ab0d1e23e4d230fb6f78e7f6d07d99360e341c239ea572c201204870";
+ sha256 = "39e0f5794e508dbf02c6aaedaead4173f5ae55d350aa3caeb7a1ad300a69e4e8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pl/thunderbird-78.9.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "90fa65f13718539a899dfae11aaaec05b9c1a4f56c8b835436f9401d7c453b01";
+ sha256 = "25bc49f2225c8aca7ea467a240234fa9ec2c7ec34f751537a199f6cbb30b390b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pt-BR/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pt-BR/thunderbird-78.9.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "f203c40580edbe2fc8645af1477bd1b750a64241702fda3bd0747efb7c44510b";
+ sha256 = "6091c0e84d89312db11a3714027881243db708ce3f28187e86076351786a3d70";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pt-PT/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pt-PT/thunderbird-78.9.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "42b5b7f39b75550e39accb221d0728cf6181e4251d130859c85a139bc4b2267c";
+ sha256 = "45fae3c271d226dee2410f8f97eadb62783291c570bf12cd9f5fe5ab23acae23";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/rm/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/rm/thunderbird-78.9.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "15165421181470218c152da68adea6e1f8a2abef4c7fd70f19d210620d29dab6";
+ sha256 = "56387dea25d3bc4742c297e0609be55a2db938d10a5e94db192018c706e7f398";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ro/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ro/thunderbird-78.9.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "974f8139cf98576a588088fef03788f513e6e45fa054d4d53cc2131254e0b794";
+ sha256 = "7e84c211675cbd59e805ffa499663b3c02dbc2075f2b734eaa9f41862e59c59f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ru/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ru/thunderbird-78.9.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "eae2f2f1e5bfcf389f34b9635c838cfcbfbc0d93e9daf6635c0faffea2df1d7f";
+ sha256 = "c9374d0b813baa7aa837e2283d75c9c47d75fca7bfc640be4782d90b480fa145";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/si/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/si/thunderbird-78.9.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "cac0bdfbbc3b5cb21e38473aae44e4f8d2ebf192b6c35d7e075c47e25684da48";
+ sha256 = "ac8ff38bf196886f8b95c34a07ed701416c58b78758517377f6d8eefc85050ad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sk/thunderbird-78.9.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "6a30b2b648b24e3cd4e2c3b668e73802796f296a2f81aa8e470ec0909f8dbc87";
+ sha256 = "dd44494bec41af06317266ee7d8f8f16ac6c648728636aa68c93f57ca9594231";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sl/thunderbird-78.9.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "0d4e597db5264bef212cdc3e86564acad1ed4cad3cae9eb61e583025b401bfa2";
+ sha256 = "2be1af23f71b22812a90ab2be33649ad53bf2d14acbbcc9540b835eade0fd9bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sq/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sq/thunderbird-78.9.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "8a4dd36ac981c89924755526fae8634f20d0d7dbdbb6fc9c324a5badbf7394db";
+ sha256 = "5c65db4fcc190408aa8a1c5f0170ede3f86f1c9f07dacc6fd7a9aa54bff533d1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sr/thunderbird-78.9.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "6002d49812cbba0289db444e84b8a139c0784056a26e3a0592fd1806ce865cbe";
+ sha256 = "7a42279c8a4352c18d583503b2324f5dd98b6c927582fa1d5e8cd72a5b1ca782";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sv-SE/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sv-SE/thunderbird-78.9.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "498303591a0d28ce2bbb59693fd55bdbf292c7feba8002c9cacdce7ec08b50d0";
+ sha256 = "3f508f801f1f4afc477ee1a0bd81d49d957429360b9691b5945a88b609dc9a21";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/th/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/th/thunderbird-78.9.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "6c31f40537ba39bdba93eb46f480f8a1a446a6b028834f6886934b102ce1b861";
+ sha256 = "bd50cac75236ee9e1ad7226c605b37cc2f4aa57eafc4978af9f2563aff7dda0c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/tr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/tr/thunderbird-78.9.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "b8f5a0be988b89dc7e8b14750d6aa0ccbdbf2c1a1c3abee376b94b1443223757";
+ sha256 = "af134487b9c2d6f84df56e2da1fcbc7b4abd3960fa3d11a366281768812fd9e6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/uk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/uk/thunderbird-78.9.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "036065e1fc91907370ffe75883b1d1e8fd1a416a9a726583c758d7a0765b84ad";
+ sha256 = "a094a6fe935b002805252ad4694a15231587a66c31cff3064c2842332f1e82ae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/uz/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/uz/thunderbird-78.9.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "3b5d683b237a88018e5b1999aee497d766007a3c1743517ab0b54e43f37e52b1";
+ sha256 = "6b8b7622374c92036828990db1de3042e1a7cebf12974d30d73dcdd0e564d707";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/vi/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/vi/thunderbird-78.9.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "0d31b2bd82161ec51314e57405345a9a004b268371c16de06fa4d2160eda0230";
+ sha256 = "4ffcd1d5f21145f857ee525169fe59ee8a1cdef6a1c4f3cc1918be1fc7c66e6a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/zh-CN/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/zh-CN/thunderbird-78.9.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "3994c114510a6c7457c78d3755518b1332bcf1b48371d2b88c000f977b5bb3a0";
+ sha256 = "8cd65c054b6fefcbd0ac9a057e277009c732af6baef08ccb3f57bee73b75ae20";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/zh-TW/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/zh-TW/thunderbird-78.9.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "c38e5b2378bd0af57945e0e172e49b30fed491b91ffa79a946cce8f2bccf96f8";
+ sha256 = "1e39b1e38bfcc1735801dcd6c073ba1eeb344b23d9e859495947a37d95a4b3b8";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix
index f3594d97801d..4433551d2e10 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix
@@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
rustc
which
yasm
+ unzip
] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [
@@ -125,7 +126,6 @@ stdenv.mkDerivation rec {
pango
perl
sqlite
- unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 61041639387d..447c4b3f3b5c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true;
stdenv.mkDerivation rec {
pname = "thunderbird";
- version = "78.8.1";
+ version = "78.9.0";
src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
- "08dnjqcdd5bs7wpl5imir0nsmvaqkri67cas1sn7ab4nb1f61lfdz4xg4x5v6f39sm5yxw2cy6rg5fc5lbiqza5bgs00gfg79kgfn2i";
+ "35n9l1kjx52davwf1k5gdx2y81hws3mfb5755464z9db48n0vfj756jlg9d8f2m2s29js27bdswl64mralw4j085dl11661g7p9ypzs";
};
nativeBuildInputs = [
@@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
rustc
which
yasm
+ unzip
] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [
@@ -126,7 +127,6 @@ stdenv.mkDerivation rec {
pango
perl
sqlite
- unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor
diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix
index 01528df856c0..613226a2dc18 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "mpop";
- version = "1.4.11";
+ version = "1.4.13";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
- sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv";
+ sha256 = "sha256-s0mEZsZbZQrdGm55IJsnuoY3VnOkXJalknvtaFoyfcE=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 02131b41ea41..d8f53f4b2566 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "msmtp";
- version = "1.8.14";
+ version = "1.8.15";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
- sha256 = "1W8GXXEUhunCNGGFFaAqSKSNq0BRs08+EI++y2+3c7Q=";
+ sha256 = "sha256-ImXcY56/Lt8waf/+CjvXZ0n4tY9AAdXN6uGYc5SQmc4=";
};
patches = [
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 4432d9ddeece..088391ba48f7 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -6,7 +6,7 @@
, speechdSupport ? false, speechd
, pulseSupport ? false, libpulseaudio
, iceSupport ? false, zeroc-ice
-, grpcSupport ? false, grpc, c-ares, abseil-cpp, which
+, grpcSupport ? false, grpc, which
, nixosTests
}:
@@ -115,7 +115,7 @@ let
buildInputs = [ libcap ]
++ lib.optional iceSupport zeroc-ice
- ++ lib.optionals grpcSupport [ grpc c-ares abseil-cpp which ];
+ ++ lib.optionals grpcSupport [ grpc which ];
installPhase = ''
# bin stuff
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 163faf02af0c..67ddcf599725 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -55,6 +55,10 @@ mkDerivation rec {
sqlite
];
+ qtWrapperArgs = [
+ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
+ ];
+
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
"-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 0174d133011c..f86eefe668f9 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, bzip2, libX11
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libX11
, mkDerivation, qtbase, qttools, qtmultimedia, qtscript
, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }:
@@ -14,30 +14,32 @@ mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ qtbase qttools qtmultimedia qtscript boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext
+ buildInputs = [ qtbase qttools qtmultimedia qtscript bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext
(perl.withPackages (p: with p; [
GetoptLong
- RpcXML
TermShellUI
])) ]
++ lib.optional stdenv.isDarwin libiconv;
cmakeFlags = [
- "-DUSE_ASPELL=ON"
- "-DFREE_SPACE_BAR_C=ON"
- "-DUSE_MINIUPNP=ON"
- "-DLOCAL_MINIUPNP=ON"
"-DDBUS_NOTIFY=ON"
- "-DUSE_JS=ON"
- "-DPERL_REGEX=ON"
- "-DUSE_CLI_XMLRPC=ON"
- "-DWITH_SOUNDS=ON"
+ "-DFREE_SPACE_BAR_C=ON"
"-DLUA_SCRIPT=ON"
+ "-DPERL_REGEX=ON"
+ "-DUSE_ASPELL=ON"
+ "-DUSE_CLI_JSONRPC=ON"
+ "-DUSE_MINIUPNP=ON"
+ "-DUSE_JS=ON"
"-DWITH_LUASCRIPTS=ON"
+ "-DWITH_SOUNDS=ON"
];
+ postInstall = ''
+ ln -s $out/bin/$pname-qt $out/bin/$pname
+ '';
+
preFixup = ''
- substituteInPlace $out/bin/eiskaltdcpp-cli-xmlrpc \
+ substituteInPlace $out/bin/eiskaltdcpp-cli-jsonrpc \
--replace "/usr/local" "$out"
'';
diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix
index 4090814b3da8..2532671bc25e 100644
--- a/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, gnome3
+, glade
, gnunet
, gnutls
, gtk3
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.glade
+ glade
gnunet
gnutls
gtk3
@@ -39,5 +39,7 @@ stdenv.mkDerivation rec {
meta = gnunet.meta // {
description = "GNUnet GTK User Interface";
homepage = "https://git.gnunet.org/gnunet-gtk.git";
+ # configure: error: compiling gnunet-gtk requires GNUnet core headers
+ broken = true;
};
}
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 3ceeb4b002e4..d80165c44056 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tixati";
- version = "2.74";
+ version = "2.81";
src = fetchurl {
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
- sha256 = "1slsrqv97hnj1vxx3hw32dhqckbr05w622samjbrimh4dv8yrd29";
+ sha256 = "sha256-qwKxlmE59V+rXtuYWBMwD1O7OO4gb36lN8syFyQ6uLc=";
};
installPhase = ''
diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix
index 809e4528df9a..ceccf44819fc 100644
--- a/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/pkgs/applications/networking/p2p/transgui/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
- unzip fpc lazarus stdenv.cc
+ fpc lazarus stdenv.cc
libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl
];
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 8cc674b1ea79..7e8b6b671cd2 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -12,7 +12,7 @@
, pcre
# Build options
, enableGTK3 ? false
-, gnome3
+, gtk3
, xorg
, wrapGAppsHook
, enableQt ? false
@@ -65,7 +65,7 @@ in stdenv.mkDerivation {
pcre
]
++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ]
- ++ lib.optionals enableGTK3 [ gnome3.gtk xorg.libpthreadstubs ]
+ ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ]
++ lib.optionals enableSystemd [ systemd ]
++ lib.optionals stdenv.isLinux [ inotify-tools ]
;
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 6e2533621e6c..3aa5b4a8da82 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -85,5 +85,6 @@ stdenv.mkDerivation rec {
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
license = licenses.lgpl21;
platforms = platforms.linux;
+ broken = true; # 2021-03-17 see https://github.com/NixOS/nixpkgs/issues/93053
};
}
diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix
index 4229fef4fe6f..08a8bc98e1a5 100644
--- a/pkgs/applications/networking/pcloud/default.nix
+++ b/pkgs/applications/networking/pcloud/default.nix
@@ -21,7 +21,7 @@
# Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here.
- alsaLib, dbus-glib, fuse, gnome3, libdbusmenu-gtk2, udev, nss
+ alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, udev, nss
}:
let
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
alsaLib
dbus-glib
fuse
- gnome3.gtk
+ gtk3
libdbusmenu-gtk2
nss
udev
@@ -92,7 +92,7 @@ in stdenv.mkDerivation {
# This is required for the file picker dialog - otherwise pcloud just
# crashes
- export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gnome3.gtk}/share/gsettings-schemas/${gnome3.gtk.name}:$XDG_DATA_DIRS"
+ export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
exec "$out/app/pcloud"
EOF
diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix
deleted file mode 100644
index 8eb0c2298fd3..000000000000
--- a/pkgs/applications/networking/pyload/beautifulsoup.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pythonPackages, isPy3k, pkgs }:
-
-pythonPackages.buildPythonPackage {
- name = "beautifulsoup-3.2.1";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
- sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
- };
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = {
- homepage = "http://www.crummy.com/software/BeautifulSoup/";
- license = "bsd";
- description = "Undemanding HTML/XML parser";
- };
-}
diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix
deleted file mode 100644
index f70359cf7ac2..000000000000
--- a/pkgs/applications/networking/pyload/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }:
-
-let
- beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix {
- inherit pythonPackages;
- };
-
-in pythonPackages.buildPythonApplication rec {
- version = "0.4.9-next";
- name = "pyLoad-" + version;
-
- src = fetchFromGitHub {
- owner = "pyload";
- repo = "pyload";
- rev = "721ea9f089217b9cb0f2799c051116421faac081";
- sha256 = "1ad4r9slx1wgvd2fs4plfbpzi4i2l2bk0lybzsb2ncgh59m87h54";
- };
-
- patches =
- let
- # gets merged in next release version of pyload
- configParserPatch = fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2625.diff";
- sha256 = "1bisgx78kcr5c0x0i3h0ch5mykns5wx5wx7gvjj0pc71lfzlxzb9";
- };
- setupPyPatch = fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2638.diff";
- sha256 = "006g4qbl582262ariflbyfrszcx8ck2ac1cpry1f82f76p4cgf6z";
- };
- in [ configParserPatch setupPyPatch ];
-
- buildInputs = [
- unrar rhino spidermonkey_38 gocr pythonPackages.paver
- ];
-
- propagatedBuildInputs = with pythonPackages; [
- pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter
- beautifulsoup send2trash
- ];
-
- #remove this once the PR patches above are merged. Needed because githubs diff endpoint
- #does not support diff -N
- prePatch = ''
- touch module/config/__init__.py
- '';
-
- preBuild = ''
- ${pythonPackages.paver}/bin/paver generate_setup
- '';
-
- doCheck = false;
-
- meta = with lib; {
- description = "Free and open source downloader for 1-click-hosting sites";
- homepage = "https://github.com/pyload/pyload";
- license = licenses.gpl3;
- maintainers = [ maintainers.mahe ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 10b3f2d175a5..8e0f4dde8168 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -18,13 +18,13 @@ let
in stdenv.mkDerivation rec {
pname = "freerdp";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
- sha256 = "sha256-qKvzxIFUiRoX/fCTDoGOGFMfzMTCRq+A5b9K2J2Wnwk=";
+ sha256 = "sha256-qqpdMBDcVfXm/KB54zv23O8raGqBhAKqXo6Kj2VaI8w=";
};
postPatch = ''
diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index e038fba6d84c..a226085c511c 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "seaweedfs";
- version = "2.29";
+ version = "2.34";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
- sha256 = "sha256-wyqshtL3wGrmb1oEMOMk2QmDXW9M5tt9d1QEtMFiXa4=";
+ sha256 = "sha256-YQL9xx4dpT1psZqLiF5ojQcEY2EI0szWTS4oOPbG7Co=";
};
- vendorSha256 = "sha256-uT/Y/TfpqDyOUElc4M/w/v77bWF3tTJz+Yu0KRMcxk4=";
+ vendorSha256 = "sha256-8o/Y5SXMgDrid1a5KTQieiVrWce0wcgrhPbSsbravEI=";
subPackages = [ "weed" ];
diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix
index 7382e1aba4ac..58ff92b5484b 100644
--- a/pkgs/applications/networking/shellhub-agent/default.nix
+++ b/pkgs/applications/networking/shellhub-agent/default.nix
@@ -7,18 +7,18 @@
buildGoModule rec {
pname = "shellhub-agent";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
- sha256 = "1g3sjkc6p9w3mm7lnr513zwjh7y945hx311b6g068q2lywisqf0x";
+ sha256 = "0vdasz3qph73xb9y831bnr1hpcw0669n9zckqn95v1bsjc936313";
};
modRoot = "./agent";
- vendorSha256 = "1l8x9cvisjb8smnsg91v04j1vvawpjzp0lcq0ahw8slz8rfdm80c";
+ vendorSha256 = "059772rd1l7zyf2vlqjm35hg8ibmjc1p6cfazqd47n8mqqlqkilw";
buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ];
diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix
index ec983276de82..300214e58b78 100644
--- a/pkgs/applications/networking/sync/onedrive/default.nix
+++ b/pkgs/applications/networking/sync/onedrive/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "onedrive";
- version = "2.4.7";
+ version = "2.4.10";
src = fetchFromGitHub {
owner = "abraunegg";
repo = pname;
rev = "v${version}";
- sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn";
+ sha256 = "sha256:0dvxjkni66g82j9wr6yy07sn7d7yr7bbc0py89pxybvsbid88l65";
};
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];
diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
index 7c7d3a1f418e..3479458088ed 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, fetchurl }:
rec {
version = "3.2.3";
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index c50ea08510af..a38352a328aa 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -15,7 +15,7 @@ assert enableXXHash -> xxHash != null;
assert enableZstd -> zstd != null;
let
- base = import ./base.nix { inherit lib stdenv fetchurl; };
+ base = import ./base.nix { inherit lib fetchurl; };
in
stdenv.mkDerivation rec {
name = "rsync-${base.version}";
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 5a4c2600569e..83eb4658d2f3 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, perl, rsync }:
let
- base = import ./base.nix { inherit stdenv lib fetchurl; };
+ base = import ./base.nix { inherit lib fetchurl; };
in
stdenv.mkDerivation {
name = "rrsync-${base.version}";
diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index bf45db92098a..d1378598876d 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "umurmur";
- version = "0.2.19";
+ version = "0.2.20";
src = fetchFromGitHub {
owner = "umurmur";
repo = "umurmur";
rev = version;
- sha256 = "sha256-86wveYlM493RIuU8aKac6XTOMPv0JxlZL4qH2N2AqRU=";
+ sha256 = "sha256-jp5+NbGmT90ksffvpLYIX2q5cPeVidDCYMPvLHCiP68=";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index f926391ac488..263a555ab4c1 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -7,11 +7,11 @@ let
inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
- version = "1.12.48";
+ version = "1.12.49";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p";
+ sha256 = "kcBy7JXDLgCxVv/oAVyTsyuO3zaPkEFDYZPPoy6E7Vc=";
};
configureFlags = [ "--disable-component" ];
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 17c72e8a3306..a586cea47ab3 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "homebank-5.5";
+ name = "homebank-5.5.1";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
- sha256 = "sha256-3tqmsCxQXNAsDsLdiyuk4MydH0WgHqsNpgqxvCp+bHU=";
+ sha256 = "sha256-m7OeqtPExo0ry+IeL2xKUnTjo/OFr7Ky/3OuX9mY2gg=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix
index 35aebf232606..0815dfc8982f 100644
--- a/pkgs/applications/office/ib/controller/default.nix
+++ b/pkgs/applications/office/ib/controller/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
phases = [ "unpackPhase" "installPhase" ];
- buildInputs = [ unzip jdk ib-tws ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ jdk ib-tws ];
installPhase = ''
mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController
diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix
index ea6fc1d777e9..75c6b5704716 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/download.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix
@@ -476,11 +476,11 @@
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
}
{
- name = "language-subtag-registry-2020-09-29.tar.bz2";
- url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";
- sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f";
+ name = "language-subtag-registry-2020-12-18.tar.bz2";
+ url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-12-18.tar.bz2";
+ sha256 = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1";
md5 = "";
- md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2";
+ md5name = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1-language-subtag-registry-2020-12-18.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@@ -546,11 +546,11 @@
md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2";
}
{
- name = "libnumbertext-1.0.6.tar.xz";
- url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz";
- sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57";
+ name = "libnumbertext-1.0.7.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz";
+ sha256 = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc";
md5 = "";
- md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz";
+ md5name = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc-libnumbertext-1.0.7.tar.xz";
}
{
name = "ltm-1.0.zip";
@@ -735,11 +735,11 @@
md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz";
}
{
- name = "postgresql-9.2.24.tar.bz2";
- url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2";
- sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126";
+ name = "postgresql-13.1.tar.bz2";
+ url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2";
+ sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f";
md5 = "";
- md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
+ md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
}
{
name = "Python-3.8.4.tar.xz";
diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index 6fbc8c5cfc60..ab320f067857 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -8,8 +8,8 @@ rec {
major = "7";
minor = "1";
- patch = "0";
- tweak = "3";
+ patch = "1";
+ tweak = "2";
subdir = "${major}.${minor}.${patch}";
@@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "1rpk90g1g8m70nrj4lwkg50aiild73d29yjlgyrgg8wx6hzq7l4y";
+ sha256 = "1vz028hzbc4n8jznigs419ygylz1vp426dprrkm62bzckv2p1rfn";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
- sha256 = "0m6cxyrxig8akv9183xdn6ialmjddicn676149nm506yc5y0szmi";
+ sha256 = "1vidv8077f394zn87b2ng1hsld0hgr1zb1p9lmjx0n9k7s7clavh";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
- sha256 = "1kvsi28n8x3gxpiszxh84x05aw23i3z4id63pgw2s7mfclby52k9";
+ sha256 = "14wn0lvvplsj194jdqqv184xx0adb4mm8bjflddvcqsl7xsfqx27";
};
}
diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix
new file mode 100644
index 000000000000..bfd3c3529e7d
--- /dev/null
+++ b/pkgs/applications/office/onlyoffice-bin/default.nix
@@ -0,0 +1,168 @@
+{ stdenv
+, lib
+, fetchurl
+# Alphabetic ordering below
+, alsaLib
+, at-spi2-atk
+, atk
+, autoPatchelfHook
+, cairo
+, curl
+, dbus
+, dconf
+, dpkg
+, fontconfig
+, gdk-pixbuf
+, glib
+, glibc
+, gsettings-desktop-schemas
+, gst_all_1
+, gtk2
+, gtk3
+, libpulseaudio
+, libudev0-shim
+, makeWrapper
+, nspr
+, nss
+, pulseaudio
+, qt5
+, wrapGAppsHook
+, xkeyboard_config
+, xorg
+}:
+let
+
+ # Note on fonts:
+ #
+ # OnlyOffice does not distribute unfree fonts, but makes it easy to pick up
+ # any fonts you install. See:
+ #
+ # * https://helpcenter.onlyoffice.com/en/installation/docs-community-install-fonts-linux.aspx
+ # * https://www.onlyoffice.com/blog/2020/04/how-to-add-new-fonts-to-onlyoffice-desktop-editors/
+ #
+ # As recommended there, you should download
+ #
+ # arial.ttf, calibri.ttf, cour.ttf, symbol.ttf, times.ttf, wingding.ttf
+ #
+ # into `~/.local/share/fonts/`, otherwise the default template fonts, and
+ # things like bullet points, will not look as expected.
+
+ # TODO: Find out which of these fonts we'd be allowed to distribute along
+ # with this package, or how to make this easier for users otherwise.
+
+ # Not using the `noto-fonts-cjk` package from nixpkgs, because it was
+ # reported that its `.ttc` file is not picked up by OnlyOffice, see:
+ # https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816
+ noto-fonts-cjk = fetchurl {
+ url =
+ let
+ version = "v20201206-cjk";
+ in
+ "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf";
+ sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4=";
+ };
+
+ runtimeLibs = lib.makeLibraryPath [
+ curl
+ glibc
+ libudev0-shim
+ pulseaudio
+ ];
+
+in stdenv.mkDerivation rec {
+ pname = "onlyoffice-desktopeditors";
+ version = "6.1.0";
+ minor = "90";
+ src = fetchurl {
+ url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_${version}-${minor}_amd64.deb";
+ sha256 = "sha256-TUaECChM3GxtB54/zNIKjRIocnAxpBVK7XsX3z7aq8o=";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ dpkg
+ makeWrapper
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ alsaLib
+ at-spi2-atk
+ atk
+ cairo
+ dbus
+ dconf
+ fontconfig
+ gdk-pixbuf
+ glib
+ gsettings-desktop-schemas
+ gst_all_1.gst-plugins-base
+ gst_all_1.gstreamer
+ gtk2
+ gtk3
+ libpulseaudio
+ nspr
+ nss
+ qt5.qtbase
+ qt5.qtdeclarative
+ qt5.qtsvg
+ xorg.libX11
+ xorg.libxcb
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXScrnSaver
+ xorg.libXtst
+ ];
+
+ dontWrapQtApps = true;
+
+ unpackPhase = ''
+ dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner
+ '';
+
+ preConfigure = ''
+ cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/{bin,lib,share}
+
+ mv usr/bin/* $out/bin
+ mv usr/share/* $out/share/
+ mv opt/onlyoffice/desktopeditors $out/share
+
+ substituteInPlace $out/bin/onlyoffice-desktopeditors \
+ --replace "/opt/onlyoffice/" "$out/share/"
+
+ ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors
+
+ wrapProgram $out/bin/DesktopEditors \
+ --set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \
+ --set QTCOMPOSE ${xorg.libX11.out}/share/X11/locale
+
+ substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \
+ --replace "/usr/bin/onlyoffice-desktopeditor" "$out/bin/DesktopEditor"
+
+ runHook preInstall
+ '';
+
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${runtimeLibs}" )
+ '';
+
+ meta = with lib; {
+ description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents";
+ homepage = "https://www.onlyoffice.com/";
+ platforms = [ "x86_64-linux" ];
+ license = licenses.agpl3Plus;
+ maintainers = with maintainers; [ nh2 gtrunsec ];
+ };
+}
diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index 95d4ef34afb0..73cd5d7cd6c1 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
- version = "0.51.1";
+ version = "0.51.2";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "sha256-sQisFv+MVGod/gmF0/EWNDvYzkpF3qbDuL5eDr7w0Bs=";
+ sha256 = "sha256-5wBzGj4DkTOqtN7X8/EBDoiBtbYB6vGJJ5IkuME7a9A=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix
new file mode 100644
index 000000000000..371dd52a8402
--- /dev/null
+++ b/pkgs/applications/office/semantik/default.nix
@@ -0,0 +1,90 @@
+{ lib
+, mkDerivation
+, fetchFromGitLab
+, wafHook
+, pkg-config
+, cmake
+, qtbase
+, python3
+, qtwebengine
+, qtsvg
+, ncurses6
+, kio
+, kauth
+, kiconthemes
+, kconfigwidgets
+, kxmlgui
+, kcoreaddons
+, kconfig
+, kwidgetsaddons
+, ki18n
+, sonnet
+, kdelibs4support
+}:
+
+mkDerivation rec {
+ pname = "semantik";
+ version = "1.2.5";
+
+ src = fetchFromGitLab {
+ owner = "ita1024";
+ repo = "semantik";
+ rev = "semantik-${version}";
+ sha256 = "0dkg6mbnsbvbis17iz8v59wlhld93nc51abnkbyqvvkyyiqb006c";
+ };
+
+ patches = [ ./qt5.patch ];
+
+ postPatch = ''
+ echo "${lib.getDev qtwebengine}"
+ substituteInPlace wscript \
+ --replace @Qt5Base_dev@ "${lib.getDev qtbase}" \
+ --replace @KF5KIOCore_dev@ "${lib.getDev kio}" \
+ --replace @KF5Auth_dev@ "${lib.getDev kauth}" \
+ --replace @KF5IconThemes_dev@ "${lib.getDev kiconthemes}" \
+ --replace @KF5ConfigWidgets_dev@ "${lib.getDev kconfigwidgets}" \
+ --replace @KF5XmlGui_dev@ "${lib.getDev kxmlgui}" \
+ --replace @KF5CoreAddons_dev@ "${lib.getDev kcoreaddons}" \
+ --replace @KF5Config_dev@ "${lib.getDev kconfig}" \
+ --replace @KF5WidgetsAddons_dev@ "${lib.getDev kwidgetsaddons}" \
+ --replace @KF5I18n_dev@ "${lib.getDev ki18n}" \
+ --replace @KF5SonnetUi_dev@ "${lib.getDev sonnet}" \
+ --replace @Qt5Svg@ "${qtsvg}" \
+ --replace @Qt5Svg_dev@ "${lib.getDev qtsvg}" \
+ --replace @Qt5WebEngine@ "${qtwebengine}" \
+ --replace @Qt5WebEngine_dev@ "${lib.getDev qtwebengine}" \
+ --replace /usr/include/KF5/KDELibs4Support "${lib.getDev kdelibs4support}/include/KF5/KDELibs4Support"
+ '';
+
+ nativeBuildInputs = [ (lib.getDev qtsvg) (lib.getLib qtsvg) python3 pkg-config wafHook cmake ];
+
+ buildInputs = [
+ qtbase
+ qtwebengine
+ qtsvg
+ ncurses6
+ kio
+ kauth
+ kiconthemes
+ kconfigwidgets
+ kxmlgui
+ kcoreaddons
+ kconfig
+ kwidgetsaddons
+ ki18n
+ sonnet
+ kdelibs4support
+ ];
+
+ wafConfigureFlags = [
+ "--qtlibs=${lib.getLib qtbase}/lib"
+ ];
+
+ meta = with lib; {
+ description = "A mind-mapping application for KDE";
+ license = licenses.mit;
+ homepage = "https://waf.io/semantik.html";
+ maintainers = [ maintainers.shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/office/semantik/qt5.patch b/pkgs/applications/office/semantik/qt5.patch
new file mode 100644
index 000000000000..6d41babdff47
--- /dev/null
+++ b/pkgs/applications/office/semantik/qt5.patch
@@ -0,0 +1,78 @@
+diff --color -ur a/wscript b/wscript
+--- a/wscript 2020-08-17 19:49:43.389864343 +0200
++++ b/wscript 2020-08-18 00:22:51.172556519 +0200
+@@ -149,6 +149,26 @@
+ if not conf.env.QT_LRELEASE: conf.fatal('Semantik requires the program lrelease (from the Qt linguist package? - compilation only)')
+ conf.find_program('python3', var='PYTHON')
+ conf.load('python')
++ conf.env.HAVE_QT5SVG = 1
++ conf.env.DEFINES_QT5SVG = [ 'QT_SVG_LIB' ]
++ conf.env.INCLUDES_QT5SVG = [ '@Qt5Svg_dev@/include/QtSvg' ]
++ conf.env.LIBPATH_QT5SVG = '@Qt5Svg@/lib'
++ conf.env.LIB_QT5SVG = [ 'Qt5Svg', 'Qt5Core', 'Qt5Gui', 'Qt5Widgets' ]
++ conf.env.HAVE_QT5WEBENGINEWIDGETS = 1
++ conf.env.DEFINES_QT5WEBENGINEWIDGETS = [ 'QT_WEBENGINEWIDGETS_LIB' ]
++ conf.env.INCLUDES_QT5WEBENGINEWIDGETS = [ '@Qt5WebEngine_dev@/include/QtWebEngineWidgets' ]
++ conf.env.LIBPATH_QT5WEBENGINEWIDGETS = '@Qt5WebEngine@/lib'
++ conf.env.LIB_QT5WEBENGINEWIDGETS = [
++ 'Qt5WebEngineWidgets',
++ 'Qt5Core',
++ 'Qt5Gui',
++ 'Qt5WebEngineCore',
++ 'Qt5Widgets',
++ 'Qt5Network',
++ 'Qt5Quick',
++ 'Qt5PrintSupport'
++ ]
++ print("conf.env.LIB_QT5SVG : ",conf.env)
+ if not conf.env.LIB_QT5SVG: conf.fatal('Could not find Qt5Svg - Semantik requires Qt >= 5')
+ if not conf.env.LIB_QT5WEBENGINEWIDGETS: conf.fatal('Could not find Qt5WebEngineWidgets - check `pkg-config --libs Qt5WebEngineWidgets`')
+ if not conf.env.LIB_QT5DBUS: conf.fatal('Install Qt Dbus')
+@@ -186,7 +206,11 @@
+ raise ValueError('Could not find QT_HOST_DATA')
+
+ specpath = conf.cmd_and_log(conf.env.QMAKE + ['-query', 'QMAKE_SPEC'], quiet=0, stdout=True)
++ path = "@Qt5Base_dev@"
++ print("\n\n[log] specpath = ",specpath,"\n")
++ print("\n\n[log] path = ",path,"\n")
+ specpath = os.path.join(path, 'mkspecs', specpath.strip())
++ print("\n\n[log] specpath = ",specpath,"\n")
+ if not os.path.exists(specpath):
+ raise ValueError('No spec path, cannot build')
+
+@@ -196,17 +220,28 @@
+
+ conf.env.append_value('INCLUDES_KDECORE', specpath)
+
+- libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets',
+- 'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui',
+- 'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore',
+- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi']
++ libs = {
++ 'KF5KIOCore': '@KF5KIOCore_dev@',
++ 'KF5Auth': '@KF5Auth_dev@',
++ 'KF5KIOWidgets': '@KF5KIOCore_dev@',
++ 'KF5IconThemes': '@KF5IconThemes_dev@',
++ 'KF5ConfigWidgets': '@KF5ConfigWidgets_dev@',
++ 'KF5XmlGui': '@KF5XmlGui_dev@',
++ 'KF5CoreAddons': '@KF5CoreAddons_dev@',
++ 'KF5ConfigGui': '@KF5Config_dev@',
++ 'KF5ConfigCore': '@KF5Config_dev@',
++ 'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@',
++ 'KF5I18n': '@KF5I18n_dev@',
++ 'KF5SonnetUi': '@KF5SonnetUi_dev@',
++ }
+
+- for lib in libs:
++ for lib,mkspec_path in libs.items():
++ print("[log] mkspec : ", mkspec_path)
+ name = lib[3:]
+ if not name.startswith('K') and name != 'SonnetUi':
+ name = 'K' + name
+-
+- p = '%s/qt_%s.pri' % (path, name)
++ p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name)
++ print("[log] path :",path,", name : ",name)
+ for line in Utils.readf(p).splitlines():
+ lst = line.strip().split(' = ')
+ if lst[0].endswith('.name'):
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index 067b06747d77..8f5beee38451 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -7,11 +7,11 @@
mkDerivation rec {
pname = "skrooge";
- version = "2.23.0";
+ version = "2.24.6";
src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
- sha256 = "10k3j67x5xm5whsvb84k9p70bkn4jbbbvdfan7q49dh2mmpair5a";
+ sha256 = "sha256-DReIm9lcq0j761wWTpJu7HnfEWz9QsRGgUtyVaXFs6A=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
index 1a4350ca71a1..21b6b1c579cd 100644
--- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
+++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
@@ -1,17 +1,8 @@
-From 5be803a1171855f976a5b607970fa3949db72181 Mon Sep 17 00:00:00 2001
-From: Christian Kampka
-Date: Mon, 9 Dec 2019 19:40:27 +0100
-Subject: [PATCH] Use console logger instead of rolling files
-
----
- src/services/log.js | 26 +++-----------------------
- 1 file changed, 3 insertions(+), 23 deletions(-)
-
diff --git a/src/services/log.js b/src/services/log.js
-index 1514c209..456c3749 100644
+index b4c39e99..4c249154 100644
--- a/src/services/log.js
+++ b/src/services/log.js
-@@ -1,35 +1,15 @@
+@@ -1,14 +1,5 @@
"use strict";
-const fs = require('fs');
@@ -21,49 +12,50 @@ index 1514c209..456c3749 100644
- fs.mkdirSync(dataDir.LOG_DIR, 0o700);
-}
-
--const logger = require('simple-node-logger').createRollingFileLogger({
-- errorEventName: 'error',
-- logDirectory: dataDir.LOG_DIR,
-- fileNamePattern: 'trilium-.log',
-- dateFormat:'YYYY-MM-DD'
--});
+-let logFile = null;
-
- function info(message) {
- // info messages are logged asynchronously
- setTimeout(() => {
- console.log(message);
+ const SECOND = 1000;
+ const MINUTE = 60 * SECOND;
+ const HOUR = 60 * MINUTE;
+@@ -16,41 +7,7 @@ const DAY = 24 * HOUR;
+
+ const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n';
+
+-let todaysMidnight = null;
-
-- logger.info(message);
- }, 0);
+-initLogFile();
+-
+-function getTodaysMidnight() {
+- const now = new Date();
+-
+- return new Date(now.getFullYear(), now.getMonth(), now.getDate());
+-}
+-
+-function initLogFile() {
+- todaysMidnight = getTodaysMidnight();
+-
+- const path = dataDir.LOG_DIR + '/trilium-' + formatDate() + '.log';
+-
+- if (logFile) {
+- logFile.end();
+- }
+-
+- logFile = fs.createWriteStream(path, {flags: 'a'});
+-}
+-
+-function checkDate(millisSinceMidnight) {
+- if (millisSinceMidnight >= DAY) {
+- initLogFile();
+- }
+-}
+-
+ function log(str) {
+- const millisSinceMidnight = Date.now() - todaysMidnight.getTime();
+-
+- checkDate(millisSinceMidnight);
+-
+- logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE);
+-
+ console.log(str);
}
- function error(message) {
- message = "ERROR: " + message;
-
-- // we're using .info() instead of .error() because simple-node-logger emits weird error for showError()
-- // errors are logged synchronously to make sure it doesn't get lost in case of crash
-- logger.info(message);
--
- console.trace(message);
- }
-
-@@ -45,12 +25,12 @@ function request(req) {
- if (req.url.includes(".js.map") || req.url.includes(".css.map")) {
- return;
- }
--
-- logger.info(req.method + " " + req.url);
-+ if(process.env.DEBUG)
-+ console.log(req.method + " " + req.url);
- }
-
- module.exports = {
- info,
- error,
- request
--};
-\ No newline at end of file
-+};
---
-2.23.0
-
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index cb0781f74e19..2680a9a6a536 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }:
+{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }:
let
description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases";
@@ -14,21 +14,21 @@ let
meta = with lib; {
inherit description;
homepage = "https://github.com/zadam/trilium";
- license = licenses.agpl3;
+ license = licenses.agpl3Plus;
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ emmanuelrosa dtzWill ];
+ maintainers = with maintainers; [ fliegendewurst ];
};
- version = "0.43.4";
+ version = "0.46.6";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- sha256 = "0kjysam5alsmnj93fcqq1ivawnra42gn7dch99rrfmvbkxp7hhr8";
+ sha256 = "0nxlph23gkxrn10gnm0ncsy54fzcmbqcrrk492ygfgw8a8pl4ah1";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
- sha256 = "128mvmp15mjpb5ipkmr0yn7ahby26shbix3f8q094f4zpxjp83zx";
+ sha256 = "0z9wg84sdbpk8zhljydm05z7cqqv2ly9s921cli7rs8hcpl175cz";
};
in {
@@ -58,6 +58,7 @@ in {
buildInputs = atomEnv.packages ++ [ gtk3 ];
installPhase = ''
+ runHook preInstall
mkdir -p $out/bin
mkdir -p $out/share/trilium
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
@@ -67,6 +68,7 @@ in {
ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg
cp ${desktopItem}/share/applications/* $out/share/applications
+ runHook postInstall
'';
# LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
@@ -91,16 +93,20 @@ in {
buildInputs = [
stdenv.cc.cc.lib
- zlib
- libxkbfile
];
- patches = [ ./0001-Use-console-logger-instead-of-rolling-files.patch ] ;
+ patches = [
+ # patch logger to use console instead of rolling files
+ ./0001-Use-console-logger-instead-of-rolling-files.patch
+ ];
+
installPhase = ''
+ runHook preInstall
mkdir -p $out/bin
mkdir -p $out/share/trilium-server
cp -r ./* $out/share/trilium-server
+ runHook postInstall
'';
postFixup = ''
diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix
new file mode 100644
index 000000000000..198c090b0ea1
--- /dev/null
+++ b/pkgs/applications/radio/btlejack/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonApplication, fetchFromGitHub, pyserial, halo }:
+
+buildPythonApplication rec {
+ pname = "btlejack";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "virtualabs";
+ repo = "btlejack";
+ rev = "v${version}";
+ sha256 = "1r17079kx7dvsrbmw5sgvz3vj5m3pn2543gxj2xmw4s0lcihy378";
+ };
+
+ postPatch = ''
+ sed -i "s|^.*'argparse',$||" setup.py
+ '';
+
+ propagatedBuildInputs = [ pyserial halo ];
+
+ meta = with lib; {
+ homepage = "https://github.com/virtualabs/btlejack";
+ description = "Bluetooth Low Energy Swiss-army knife";
+ license = licenses.mit;
+ maintainers = with maintainers; [ oxzi ];
+ };
+}
diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix
index e74cc551d497..a9f5fc991fff 100644
--- a/pkgs/applications/radio/dablin/default.nix
+++ b/pkgs/applications/radio/dablin/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, mpg123, SDL2, gnome3, faad2, pcre
+, mpg123, SDL2, gtkmm3, faad2, pcre
} :
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ faad2 mpg123 SDL2 gnome3.gtkmm pcre ];
+ buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ];
meta = with lib; {
description = "Play DAB/DAB+ from ETI-NI aligned stream";
diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix
index e7da78034cc2..4f8ca550490a 100644
--- a/pkgs/applications/radio/direwolf/default.nix
+++ b/pkgs/applications/radio/direwolf/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd
-, hamlib, perl, python, udev }:
+, hamlib, perl, python3, udev }:
with lib;
@@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
+ strictDeps = true;
+
buildInputs = [
- espeak gpsd hamlib perl python
+ espeak gpsd hamlib perl python3
] ++ (optionals stdenv.isLinux [alsaLib udev]);
patches = [
diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix
index 19e635da5ac8..d6a82049a23d 100644
--- a/pkgs/applications/radio/svxlink/default.nix
+++ b/pkgs/applications/radio/svxlink/default.nix
@@ -14,13 +14,13 @@ let
in stdenv.mkDerivation rec {
pname = "svxlink";
- version = "19.09.1";
+ version = "19.09.2";
src = fetchFromGitHub {
owner = "sm0svx";
repo = pname;
rev = version;
- sha256 = "0xmbac821w9kl7imlz0mra19mlhi0rlpbyyay26w1y7h98j4g4yp";
+ sha256 = "sha256-riyFEuEmJ7+jYT3UoTTsMUwFdO3y5mjo4z0fcC3O8gY=";
};
cmakeFlags = [
diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix
index eb57048c5c2c..a013fe41d830 100644
--- a/pkgs/applications/radio/xlog/default.nix
+++ b/pkgs/applications/radio/xlog/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }:
stdenv.mkDerivation rec {
pname = "xlog";
- version = "2.0.19";
+ version = "2.0.20";
src = fetchurl {
url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz";
- sha256 = "0y38gkcm4mgv6wn31pjq6d5bm22m63rpwa55qjmrlywrmw76rppy";
+ sha256 = "sha256-pSGmKLHGc+Eb9OG27k1rYOMn/2BiRejrBajARjEgsUA=";
};
# glib-2.62 deprecations
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index e15cac60295e..80506bb79b6c 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }:
+{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python3, bash }:
stdenv.mkDerivation rec {
pname = "bcftools";
@@ -9,7 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0r508mp15pqzf8r1269kb4v5naw9zsvbwd3cz8s1yj7carsf9viw";
};
- buildInputs = [ htslib zlib bzip2 lzma curl perl python ];
+ nativeBuildInputs = [
+ perl
+ python3
+ ];
+
+ buildInputs = [ htslib zlib bzip2 lzma curl ];
+
+ strictDeps = true;
makeFlags = [
"HSTDIR=${htslib}"
diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix
index d0553bb0649a..f5aad5d05543 100644
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}:
+{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, lzma}:
stdenv.mkDerivation rec {
pname = "bedtools";
@@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-NqKldF7ePJn3pT+AkESIQghBKSFFOEBBsTaKEbU+oaQ=";
};
- buildInputs = [ zlib python bzip2 lzma ];
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ python3
+ ];
+
+ buildInputs = [ zlib bzip2 lzma ];
cxx = if stdenv.cc.isClang then "clang++" else "g++";
cc = if stdenv.cc.isClang then "clang" else "gcc";
buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES";
diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/applications/science/biology/sambamba/default.nix
index 8802736efac8..7b5141302f7b 100644
--- a/pkgs/applications/science/biology/sambamba/default.nix
+++ b/pkgs/applications/science/biology/sambamba/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, python3, which, dmd, ldc, zlib }:
+{ lib, stdenv, fetchFromGitHub, python3, which, ldc, zlib }:
stdenv.mkDerivation rec {
pname = "sambamba";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "biod";
repo = "sambamba";
rev = "v${version}";
- sha256 = "0k5wy06zrbsc40x6answgz7rz2phadyqwlhi9nqxbfqanbg9kq20";
+ sha256 = "sha256:0kx5a0fmvv9ldz2hnh7qavgf7711kqc73zxf51k4cca4hr58zxr9";
fetchSubmodules = true;
};
- nativeBuildInputs = [ which python3 dmd ldc ];
+ nativeBuildInputs = [ which python3 ldc ];
buildInputs = [ zlib ];
# Upstream's install target is broken; copy manually
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
index b48e13ecf003..4c32516b29f6 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip jre ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ jre ];
sourceRoot = "snpEff";
diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix
index ec381693aedf..e6f33d6cde90 100644
--- a/pkgs/applications/science/biology/spades/default.nix
+++ b/pkgs/applications/science/biology/spades/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "SPAdes";
- version = "3.14.1";
+ version = "3.15.2";
src = fetchurl {
url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz";
- sha256 = "1ji3afn6yvx7ysg7p9j0d1g28zrnxg1b7x90mhs2bj3lgs7vfafn";
+ sha256 = "03cxz4m1n4rc81lqb4p1pz2ammms7f31wvi4daywfkc13aal6fz9";
};
nativeBuildInputs = [ cmake ];
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
homepage = "http://cab.spbu.ru/software/spades/";
- platforms = platforms.unix;
+ platforms = with platforms; [ "x86_64-linux" "x86_64-darwin"];
maintainers = [ maintainers.bzizou ];
};
}
diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix
index c208d80d5769..16091514f154 100644
--- a/pkgs/applications/science/biology/stacks/default.nix
+++ b/pkgs/applications/science/biology/stacks/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "stacks";
- version = "2.53";
+ version = "2.55";
src = fetchurl {
url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz";
- sha256 = "1zchds205nwdqch1246953dr8c0019yas178qbq3jypbxvmgq7pf";
+ sha256 = "sha256-p8L0F3A+GdNsPgTQNn9Em5EjFCc9f7gUvyLIRCTd05c=";
};
buildInputs = [ zlib ];
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix
index 8d9ea7a3917b..74a6b495587c 100644
--- a/pkgs/applications/science/chemistry/gwyddion/default.nix
+++ b/pkgs/applications/science/chemistry/gwyddion/default.nix
@@ -35,10 +35,10 @@ in
stdenv.mkDerivation rec {
pname = "gwyddion";
- version = "2.56";
+ version = "2.57";
src = fetchurl {
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
- sha256 = "0z83p3ifdkv5dds8s6fqqbycql1zmgppdc7ygqmm12z5zlrl9p12";
+ sha256 = "sha256-kx/WqtNDaJQyVehxZ3weddXyaM1knX+fCuv47A9GaH0=";
};
nativeBuildInputs = [ pkg-config file ];
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 27f9a5c2ab0b..bb523cddd196 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
- version = "14.31.32";
+ version = "14.31.35";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- sha256 = "sha256-lY4DvtSAC8VDYwzZVZVHNXnyJiSn1vo829DEsLEG/hM=";
+ sha256 = "sha256-uB7d27eicfmE1TpjLAxUoC8LBYAOrg3B48M1/CxWZdg=";
};
patchPhase = ''
diff --git a/pkgs/applications/science/electronics/gnucap/default.nix b/pkgs/applications/science/electronics/gnucap/default.nix
new file mode 100644
index 000000000000..c51e5de93d64
--- /dev/null
+++ b/pkgs/applications/science/electronics/gnucap/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "gnucap";
+ version = "20210107";
+
+ src = fetchurl {
+ url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz";
+ sha256 = "12rlwd4mfc54qq1wrx5k8qk578xls5z4isf94ybkf2z6qxk4mhnj";
+ };
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Gnu Circuit Analysis Package";
+ longDescription = ''
+Gnucap is a modern general purpose circuit simulator with several advantages over Spice derivatives.
+It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis.
+ '';
+ homepage = "http://www.gnucap.org/";
+ changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = [ maintainers.raboof ];
+ };
+}
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 971891a5b011..3a3994d9ad62 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gtkwave";
- version = "3.3.107";
+ version = "3.3.108";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
- sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl";
+ sha256 = "sha256-LtlexZKih+Si/pH3oQpWdpzfZ6j+41Otgfx7nLMfFSQ=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix
index ef68eb999fac..dee0a851bf8c 100644
--- a/pkgs/applications/science/electronics/horizon-eda/default.nix
+++ b/pkgs/applications/science/electronics/horizon-eda/default.nix
@@ -6,7 +6,7 @@
, epoxy
, fetchFromGitHub
, glm
-, gnome3
+, gtkmm3
, lib
, libgit2
, librsvg
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
curl
epoxy
glm
- gnome3.gtkmm
+ gtkmm3
libgit2
librsvg
libuuid
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index dcf51e657c4a..b91b5ad14a9c 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, fetchFromGitLab
, gnome3
+, dconf
, wxGTK30
, wxGTK31
, makeWrapper
@@ -186,12 +187,12 @@ stdenv.mkDerivation rec {
makeWrapperArgs = with passthru.libraries; [
"--prefix XDG_DATA_DIRS : ${base}/share"
"--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
- "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share"
+ "--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}"
"--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
# wrapGAppsHook did these two as well, no idea if it matters...
"--prefix XDG_DATA_DIRS : ${cups}/share"
- "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules"
+ "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
"--set-default KISYSMOD ${footprints}/share/kicad/modules"
"--set-default KICAD_SYMBOL_DIR ${symbols}/share/kicad/library"
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix
index 69ff7b2e69f3..d28f1d181215 100644
--- a/pkgs/applications/science/electronics/pcb/default.nix
+++ b/pkgs/applications/science/electronics/pcb/default.nix
@@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "pcb";
- version = "4.2.2";
+ version = "4.3.0";
src = fetchurl {
url = "mirror://sourceforge/pcb/${pname}-${version}.tar.gz";
- sha256 = "0pbfyfadbia1jf9ywkf02j8mfdh8c3mj390c2jdqnl70vcdszvhw";
+ sha256 = "sha256-roUvRq+Eq6f1HYE/uRb8f82+6kP3E08VBQcCThdD+14=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 8713abe4bcff..560e8dd733af 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -8,7 +8,7 @@
{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
, customOCamlPackages ? null
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses
-, buildIde ? !(stdenv.isDarwin && lib.versionAtLeast version "8.10")
+, buildIde ? true
, glib, gnome3, wrapGAppsHook
, csdp ? null
, version, coq-version ? null,
@@ -127,7 +127,7 @@ self = stdenv.mkDerivation {
buildInputs = [ ncurses ] ++ ocamlBuildInputs
++ optionals buildIde
(if versionAtLeast "8.10"
- then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
+ then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ]
else [ ocamlPackages.lablgtk ]);
postPatch = ''
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index d57db0fd0d70..b57ee0f61f13 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lean";
- version = "3.27.0";
+ version = "3.28.0";
src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
- sha256 = "sha256-DSIWuMlweu9dsah5EdVCNQ9ADjYoEZongfw/Yh7/N/A=";
+ sha256 = "sha256-IzoFE92F559WeSUCiYZ/fx2hrsyRzgOACr3/pzJ4OOY=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix
index da8985818e7b..defe218b119e 100644
--- a/pkgs/applications/science/logic/tlaplus/toolbox.nix
+++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix
@@ -1,11 +1,8 @@
{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv
-, gtk, libXtst, glib, zlib
+, gtk3, libXtst, glib, zlib
}:
let
- version = "1.7.0";
- arch = "x86_64";
-
desktopItem = makeDesktopItem rec {
name = "TLA+Toolbox";
exec = "tla-toolbox";
@@ -20,12 +17,12 @@ let
};
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
pname = "tla-toolbox";
- inherit version;
+ version = "1.7.1";
src = fetchzip {
- url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
- sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02";
+ url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.x86_64.zip";
+ sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80";
};
nativeBuildInputs = [ makeWrapper ];
@@ -33,6 +30,8 @@ in stdenv.mkDerivation {
phases = [ "installPhase" ];
installPhase = ''
+ runHook preInstall
+
mkdir -p "$out/bin"
cp -r "$src" "$out/toolbox"
chmod -R +w "$out/toolbox"
@@ -43,12 +42,17 @@ in stdenv.mkDerivation {
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ --set-rpath "${lib.makeLibraryPath [ zlib ]}:$(patchelf --print-rpath $(find "$out/toolbox" -name java))" \
"$(find "$out/toolbox" -name java)"
+ patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ "$(find "$out/toolbox" -name jspawnhelper)"
+
makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \
--run "set -x; cd $out/toolbox" \
--add-flags "-data ~/.tla-toolbox" \
- --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}"
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}"
echo -e "\nCreating TLA Toolbox icons..."
pushd "$src"
@@ -63,6 +67,8 @@ in stdenv.mkDerivation {
echo -e "\nCreating TLA Toolbox desktop entry..."
cp -r "${desktopItem}/share/applications"* "$out/share/applications"
+
+ runHook postInstall
'';
meta = {
@@ -75,7 +81,7 @@ in stdenv.mkDerivation {
'';
# http://lamport.azurewebsites.net/tla/license.html
license = with lib.licenses; [ mit ];
- platforms = lib.platforms.linux;
+ platforms = [ "x86_64-linux" ];
maintainers = [ ];
};
}
diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
new file mode 100644
index 000000000000..771d6227a86c
--- /dev/null
+++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
@@ -0,0 +1,46 @@
+{ lib, stdenv, fetchFromGitHub, cmake, boost169, rapidjson, zlib }:
+
+stdenv.mkDerivation rec {
+ pname = "vowpal-wabbit";
+ version = "8.9.2";
+
+ src = fetchFromGitHub {
+ owner = "VowpalWabbit";
+ repo = "vowpal_wabbit";
+ rev = version;
+ sha256 = "0ng1kip7sh3br85691xvszxd6lhv8nhfkgqkpwxd89wy85znzhmd";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [
+ boost169
+ rapidjson
+ zlib
+ ];
+
+ # -DBUILD_TESTS=OFF is set as both it saves time in the build and the default
+ # cmake flags appended by the builder include -DBUILD_TESTING=OFF for which
+ # this is the equivalent flag.
+ cmakeFlags = [
+ "-DVW_INSTALL=ON"
+ "-DBUILD_TESTS=OFF"
+ "-DBUILD_JAVA=OFF"
+ "-DBUILD_PYTHON=OFF"
+ "-DUSE_LATEST_STD=ON"
+ "-DRAPIDJSON_SYS_DEP=ON"
+ ];
+
+ meta = with lib; {
+ broken = stdenv.isAarch32 || stdenv.isAarch64;
+ description = "Machine learning system focused on online reinforcement learning";
+ homepage = "https://github.com/VowpalWabbit/vowpal_wabbit/";
+ license = licenses.bsd3;
+ longDescription = ''
+ Machine learning system which pushes the frontier of machine learning with techniques such as online,
+ hashing, allreduce, reductions, learning2search, active, and interactive and reinforcement learning
+ '';
+ maintainers = with maintainers; [ jackgerrits ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix
index 04a49becc973..ce93c14b334f 100644
--- a/pkgs/applications/science/math/gap/default.nix
+++ b/pkgs/applications/science/math/gap/default.nix
@@ -101,6 +101,9 @@ stdenv.mkDerivation rec {
excludes = ["tst/testinstall/stringobj.tst"];
sha256 = "1mz5b4mbw2jdd1ypp5s0dy6pp0jsvwsxr2dm4kbkls20r1r192sc";
})
+
+ # fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965
+ ./mark-genstackfuncbags-as-noinline.patch
];
postPatch = ''
diff --git a/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch b/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch
new file mode 100644
index 000000000000..3a2f7231c091
--- /dev/null
+++ b/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gasman.c b/src/gasman.c
+index 417811401..314a74190 100644
+--- a/src/gasman.c
++++ b/src/gasman.c
+@@ -1861,7 +1861,7 @@ void SparcStackFuncBags( void )
+ #endif
+
+
+-void GenStackFuncBags ( void )
++NOINLINE void GenStackFuncBags ( void )
+ {
+ Bag * top; /* top of stack */
+ Bag * p; /* loop variable */
diff --git a/pkgs/applications/science/math/gfm/default.nix b/pkgs/applications/science/math/gfm/default.nix
index a8031b3e8a3d..1078be99c3a9 100644
--- a/pkgs/applications/science/math/gfm/default.nix
+++ b/pkgs/applications/science/math/gfm/default.nix
@@ -5,6 +5,7 @@
, pkg-config
, autoreconfHook
, gnome2
+, gtk2
, glib
, libtifiles2
, libticables2
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome2.gtk
+ gtk2
gnome2.libglade
glib
libtifiles2
diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix
index 242f2e2cea5d..d53236d8070c 100644
--- a/pkgs/applications/science/math/perseus/default.nix
+++ b/pkgs/applications/science/math/perseus/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "perseus-4-beta";
version = "4-beta";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
hardeningDisable = [ "stackprotector" ];
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 3e4ed900a925..1fb605b35998 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -87,6 +87,14 @@ stdenv.mkDerivation rec {
rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6";
sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0=";
})
+
+ # fix intermittent errors in doctest/test.py: https://trac.sagemath.org/ticket/26912
+ (fetchSageDiff {
+ base = "9.3.beta8";
+ name = "set-cysignals-crash-ndebug.patch";
+ rev = "ca5257a5d0f32efc9f8f07e126020856270b1a18";
+ sha256 = "sha256-KViw63xE3O0eUiOYzoxNrr4NL+csql9GPJLDJCf/EZs=";
+ })
];
# Patches needed because of package updates. We could just pin the versions of
@@ -153,6 +161,14 @@ stdenv.mkDerivation rec {
rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30";
sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0=";
})
+
+ # cypari 2.1.2 update (https://trac.sagemath.org/ticket/31029)
+ (fetchSageDiff {
+ base = "9.3.beta3";
+ name = "cypari-2.1.2-update.patch";
+ rev = "b9aadfd08e81d74ca7c229bb80eb853b592887d0";
+ sha256 = "sha256-eKaMy7kpu+YKdL8bPStgocxBCTfc2Z/10RrGy2LENFw=";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 1c2235bf71b4..245ddcedeee0 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -32,7 +32,7 @@
, ntl
, numpy
, pari
-, pkgconfig
+, pkgconfig # the python module, not the pkg-config alias
, pkg-config
, planarity
, ppl
diff --git a/pkgs/applications/science/math/tilp2/default.nix b/pkgs/applications/science/math/tilp2/default.nix
index 1b46f982b419..ebcca69f0940 100644
--- a/pkgs/applications/science/math/tilp2/default.nix
+++ b/pkgs/applications/science/math/tilp2/default.nix
@@ -7,6 +7,7 @@
, intltool
, glib
, gnome2
+, gtk2
, gfm
, libticables2
, libticalcs2
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
- gnome2.gtk
+ gtk2
gnome2.libglade
gfm
libticables2
diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index 05b95140b1bd..9d18763aa32d 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
# The -Xmx1000M comes suggested from their download page:
# http://www.cs.waikato.ac.nz/ml/weka/downloading.html
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 89bdc4155481..25215d7abb56 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wxmaxima";
- version = "20.06.6";
+ version = "21.02.0";
src = fetchFromGitHub {
owner = "wxMaxima-developers";
repo = "wxmaxima";
rev = "Version-${version}";
- sha256 = "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w";
+ sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc=";
};
buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ];
diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix
new file mode 100644
index 000000000000..e4a5f22891e8
--- /dev/null
+++ b/pkgs/applications/science/medicine/xmedcon/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, lib
+, fetchurl
+, gtk3
+, glib
+, pkg-config
+, libpng
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "xmedcon";
+ version = "0.21.0";
+
+ src = fetchurl {
+ url = "https://prdownloads.sourceforge.net/${pname}/${pname}-${version}.tar.bz2";
+ sha256 = "0yfnbrcil5i76z1wbg308pb1mnjbcxy6nih46qpqs038v1lhh4q8";
+ };
+
+ buildInputs = [
+ gtk3
+ glib
+ libpng
+ zlib
+ ];
+
+ nativeBuildInputs = [ pkg-config ];
+
+ meta = with lib; {
+ description = "An open source toolkit for medical image conversion ";
+ homepage = "https://xmedcon.sourceforge.io/Main/HomePage";
+ license = licenses.lgpl2Plus;
+ maintainers = with maintainers; [ arianvp flokli ];
+ platforms = with platforms; [ darwin linux ];
+ };
+}
diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix
new file mode 100644
index 000000000000..af252da04f81
--- /dev/null
+++ b/pkgs/applications/science/networking/sumo/default.nix
@@ -0,0 +1,68 @@
+{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal,
+ git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
+ libpng, libtiff, openscenegraph , proj, python3, python37Packages,
+ stdenv, swig, xercesc, xorg, zlib }:
+
+stdenv.mkDerivation rec {
+ pname = "sumo";
+ version = "1.8.0";
+
+ src = fetchFromGitHub {
+ owner = "eclipse";
+ repo = "sumo";
+ rev = "v${lib.replaceStrings ["."] ["_"] version}";
+ sha256 = "1w9im1zz8xnkdwmv4v11kn1xcqm889268g1fw4y2s9f6shi41mxx";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ cmake
+ git
+ swig
+ ];
+
+ buildInputs = [
+ bzip2
+ eigen
+ ffmpeg
+ fox_1_6
+ gdal
+ gl2ps
+ gpp
+ gtest
+ jdk
+ libGL
+ libGLU
+ libX11
+ libjpeg
+ libpng
+ libtiff
+ openscenegraph
+ proj
+ python37Packages.setuptools
+ xercesc
+ zlib
+ python3
+ ] ++ (with xorg; [
+ libXcursor
+ libXext
+ libXfixes
+ libXft
+ libXrandr
+ libXrender
+ ]);
+
+ meta = with lib; {
+ description = "The SUMO traffic simulator";
+ longDescription = ''
+ Eclipse SUMO is an open source, highly
+ portable, microscopic and continuous traffic simulation package
+ designed to handle large networks. It allows for intermodal
+ simulation including pedestrians and comes with a large set of
+ tools for scenario creation.
+ '';
+ homepage = "https://github.com/eclipse/sumo";
+ license = licenses.epl20;
+ maintainers = with maintainers; [ mtreca ];
+ };
+}
diff --git a/pkgs/applications/science/physics/professor/default.nix b/pkgs/applications/science/physics/professor/default.nix
new file mode 100644
index 000000000000..6d52951ee9c9
--- /dev/null
+++ b/pkgs/applications/science/physics/professor/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv, fetchurl, eigen, makeWrapper, python3 }:
+
+stdenv.mkDerivation rec {
+ pname = "professor";
+ version = "2.3.3";
+
+ src = fetchurl {
+ name = "Professor-${version}.tar.gz";
+ url = "https://professor.hepforge.org/downloads/?f=Professor-${version}.tar.gz";
+ sha256 = "17q026r2fpfxzf74d1013ksy3a9m57rcr2q164n9x02ci40bmib0";
+ };
+
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ substituteInPlace Makefile \
+ --replace '-shared -o' '-shared -install_name "$(out)/$@" -o'
+ '';
+
+ nativeBuildInputs = [ python3.pkgs.cython makeWrapper ];
+ buildInputs = [ python3 eigen ];
+ propagatedBuildInputs = with python3.pkgs; [ iminuit numpy matplotlib yoda ];
+
+ CPPFLAGS = [ "-I${eigen}/include/eigen3" ];
+ PREFIX = placeholder "out";
+
+ postInstall = ''
+ for prog in "$out"/bin/*; do
+ wrapProgram "$prog" --set PYTHONPATH "$PYTHONPATH:$(toPythonPath "$out")"
+ done
+ '';
+
+ doInstallCheck = true;
+ installCheckTarget = "check";
+
+ meta = with lib; {
+ description = "A tuning tool for Monte Carlo event generators";
+ homepage = "https://professor.hepforge.org/";
+ license = licenses.unfree; # no license specified
+ maintainers = [ maintainers.veprbl ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
index 9a304272fe9b..2fafa2ebf875 100644
--- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix
+++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1";
};
- nativeBuildInputs = [ wrapGAppsHook ];
+ nativeBuildInputs = [ wrapGAppsHook unzip ];
- buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];
+ buildInputs = [ gsettings-desktop-schemas gtk3 ];
installPhase = ''
mkdir -p $out/bin \
diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix
index 83dbb6511442..c4f6362465ff 100644
--- a/pkgs/applications/search/doodle/default.nix
+++ b/pkgs/applications/search/doodle/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, libextractor, gettext }:
stdenv.mkDerivation rec {
- name = "doodle-0.7.1";
+ name = "doodle-0.7.2";
buildInputs = [ libextractor gettext ];
src = fetchurl {
url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz";
- sha256 = "086va4q8swiablv5x72yikrdh5swhy7kzmg5wlszi5a7vjya29xw";
+ sha256 = "sha256-dtRPfUjhBNgN+5zHMYmszISmBv1+K6yjKsbQBiAXWRA=";
};
meta = {
diff --git a/pkgs/applications/terminal-emulators/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix
index 06dafe09168a..5d5ce5d772e5 100644
--- a/pkgs/applications/terminal-emulators/evilvte/default.nix
+++ b/pkgs/applications/terminal-emulators/evilvte/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, makeWrapper, pkg-config,
- gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
+ gnome2, gtk2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
configH ? ""
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
};
buildInputs = [
- gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11
+ gnome2.vte glib pango gtk2 cairo gdk-pixbuf atk freetype xorg.libX11
xorg.xorgproto xorg.libXext makeWrapper pkg-config
];
diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix
index 63642af708f6..2631bae57e50 100644
--- a/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/pkgs/applications/terminal-emulators/foot/default.nix
@@ -21,19 +21,21 @@
}:
let
- version = "1.6.4";
+ version = "1.7.0";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
# and avoid unnecessary rebuilds as it can take relatively long
# to generate
+ #
+ # For every bump, make sure that the hash is still accurate.
stimulusGenerator = stdenv.mkDerivation {
pname = "foot-generate-alt-random-writes";
inherit version;
src = fetchurl {
url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py";
- sha256 = "0pnc5nvqrbgx5618ylrkrs9fyxjh4jcsbryfk6vlnk8x4wyyaibz";
+ sha256 = "019bdiqfi3wx2lwrv3nhq83knc1r3lmqd5zgisa33wwshm2kyv7p";
};
dontUnpack = true;
@@ -87,7 +89,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
- sha256 = "0awv53l3039s1rnkhdkzc0gwawlnd1m8cl4qhaijhxzzq68w0dfb";
+ sha256 = "0w07fw7y31g891335ji3fm783r4dsk5py82qp0zx6z3rfr07paby";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/terminal-emulators/kgx/default.nix b/pkgs/applications/terminal-emulators/kgx/default.nix
index 9f8b3444ffb4..4e8cf06c1fdb 100644
--- a/pkgs/applications/terminal-emulators/kgx/default.nix
+++ b/pkgs/applications/terminal-emulators/kgx/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitLab
, gettext
, gnome3
+, libgtop
, gtk3
, libhandy
, pcre2
@@ -33,7 +34,7 @@ stdenv.mkDerivation {
buildInputs = [
gettext
- gnome3.libgtop
+ libgtop
gnome3.nautilus
gtk3
libhandy
diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix
index 80956a512442..c0f4ea32576e 100644
--- a/pkgs/applications/terminal-emulators/tilix/default.nix
+++ b/pkgs/applications/terminal-emulators/tilix/default.nix
@@ -5,7 +5,7 @@
, ninja
, python3
, pkg-config
-, dmd
+, ldc
, dconf
, dbus
, gsettings-desktop-schemas
@@ -16,17 +16,18 @@
, glib
, wrapGAppsHook
, libunwind
+, appstream
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "tilix";
- version = "unstable-2019-10-02";
+ version = "1.9.4";
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
- rev = "ffcd31e3c0e1a560ce89468152d8726065e8fb1f";
- sha256 = "1bzv7xiqhyblz1rw8ln4zpspmml49vnshn1zsv9di5q7kfgpqrgq";
+ rev = "${version}";
+ sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9";
};
# Default upstream else LDC fails to link
@@ -36,12 +37,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [
desktop-file-utils
- dmd
+ ldc
meson
ninja
pkg-config
python3
wrapGAppsHook
+ appstream
];
buildInputs = [
diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix
index ded8f7ba6993..756a031ae1e7 100644
--- a/pkgs/applications/version-management/bumpver/default.nix
+++ b/pkgs/applications/version-management/bumpver/default.nix
@@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "bumpver";
- version = "2020.1108";
+ version = "2021.1110";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1bhbrq8fk8rsr78vq9xjz8v9lgv571va0nmg86dwmv6qnj6dymzm";
+ sha256 = "b6a0ddb78db7e00ae7ffe895bf8ef97f91e6310dfc1c4721896bdfd044b1cb03";
};
prePatch = ''
diff --git a/pkgs/applications/version-management/git-and-tools/bit/default.nix b/pkgs/applications/version-management/git-and-tools/bit/default.nix
new file mode 100644
index 000000000000..e41c2569fcb3
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bit/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, git
+}:
+
+buildGoModule rec {
+ pname = "bit";
+ version = "1.0.5";
+
+ src = fetchFromGitHub {
+ owner = "chriswalz";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0dv6ma2vwb21cbxkxzrpmj7cqlhwr7a86i4g728m3y1aclh411sn";
+ };
+
+ vendorSha256 = "1j6w7bll4zyp99579dhs2rza4y9kgfz3g8d5grfzgqck6cjj9mn8";
+
+ propagatedBuildInputs = [ git ];
+
+ # Tests require a repository
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Command-line tool for git";
+ homepage = "https://github.com/chriswalz/bit";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
index 4bfe06fee747..74e2a34aec1a 100644
--- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ghorg";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "gabrie30";
repo = "ghorg";
rev = version;
- sha256 = "sha256-OoNHKDxYKTmfm1rrQxG7PnH7DINa2M/NKc/5iKaUybg=";
+ sha256 = "sha256-HkOMG7VG8jyvr1W1T/62murtNYE8wyT/p3lDtuxfm5M=";
};
doCheck = false;
diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index 9933535475a3..99772f60bc50 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "077xs3grjidahxz1gc93565b25blf97lwsljmkmr0yapps8z630d";
+ sha256 = "0bb6ap8sdp4ad0xkh3y8vj46a363g5gdw0dzf9ycw0z9ah8ispfx";
};
nativeBuildInputs = [ installShellFiles pbr ];
diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix
index f980ea5d0151..caf179f645b1 100644
--- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix
@@ -1,16 +1,16 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
rustPlatform.buildRustPackage rec {
pname = "gitui";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "extrawurst";
repo = pname;
rev = "v${version}";
- sha256 = "1fcv9bxfv7f7ysmnqan9vdp2z3kvdb4h4zwbr0l3cs8kbapk713n";
+ sha256 = "0fc8vxpy1zarxd5lqgwdj2jzv35qsxaydczg0qkws1f88m43n33x";
};
- cargoSha256 = "1mnh8jza8lkw5rgkx2bnnqvk9w7l9c2ab9hmfmgx049wn42ylb41";
+ cargoSha256 = "1j5cf5z8ksf5kvi6zfrabv1c127yb6s0dpkl9p8vqdgdc6mzghvd";
nativeBuildInputs = [ python3 perl ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix
index 7a23ec678a62..8e7e739e6100 100644
--- a/pkgs/applications/version-management/git-and-tools/glab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
- version = "1.15.0";
+ version = "1.16.0";
src = fetchFromGitHub {
owner = "profclems";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-wOeWqgN0VYmTXPTU3z5Utau8diW18QKV7w/2y86R8U0=";
+ sha256 = "sha256-KkkP/qkIrwJUxmZTY8zxJKMbOiaGl8XqJhHAU7oejGs=";
};
- vendorSha256 = "sha256-Ge3nwI0cY2JxRTn3EZtlal5c6A6TIKfH/CkJnQ1C6PY=";
+ vendorSha256 = "sha256-DO8eH0DAitxX0NOYQBs4/ME9TFQYfXedwbld1DnBWXk=";
runVend = true;
# Tests are trying to access /homeless-shelter
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index a9138fa0c877..856ee616efb7 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "lab";
- version = "0.20.0";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
- sha256 = "sha256-EQqbWM/4CInFNndfD+k7embPUFLXgxRT44e/+Ik2TDs=";
+ sha256 = "sha256-mkhJmrKpIISd0m0m8fQ9vKuEr6h23BBxK6yo5fB+xcA=";
};
subPackages = [ "." ];
- vendorSha256 = "sha256-T6kGhje3K2HnR8xRuio6AsYbSwIdbWvAk3ZSnbm1NsA=";
+ vendorSha256 = "sha256-cf+DVnGjSNV2eZ8S/Vk+VPlykoSjngrQuPeA9IshBUg=";
doCheck = false;
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index c9570bb134da..64c98768fdd3 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -1,5 +1,12 @@
-{ lib, buildGoPackage, fetchurl, makeWrapper
-, git, bash, gzip, openssh, pam
+{ lib
+, buildGoPackage
+, fetchurl
+, makeWrapper
+, git
+, bash
+, gzip
+, openssh
+, pam
, sqliteSupport ? true
, pamSupport ? true
, nixosTests
@@ -9,11 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.13.4";
+ version = "1.13.6";
+ # not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "sha256-Q9wM+TGgE9oFFzg6516bG7iFNjhxOxPMLKtTHghA/OU=";
+ sha256 = "1f0fsqcmmqygv0r796ddr2fjhh333i9nr0cqk9x2b2kbs1z264vf";
};
unpackPhase = ''
@@ -36,16 +44,18 @@ buildGoPackage rec {
buildInputs = optional pamSupport pam;
- preBuild = let
- tags = optional pamSupport "pam"
+ preBuild =
+ let
+ tags = optional pamSupport "pam"
++ optional sqliteSupport "sqlite sqlite_unlock_notify";
- tagsString = concatStringsSep " " tags;
- in ''
- export buildFlagsArray=(
- -tags="${tagsString}"
- -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"'
- )
- '';
+ tagsString = concatStringsSep " " tags;
+ in
+ ''
+ export buildFlagsArray=(
+ -tags="${tagsString}"
+ -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"'
+ )
+ '';
outputs = [ "out" "data" ];
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 001d0b158b25..df9f2255368d 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
{
- "version": "13.8.5",
- "repo_hash": "0dpyqynd6rscg07s58y0cjn7vfj2h21h51ja0fm6ll76wb02sbm6",
+ "version": "13.9.4",
+ "repo_hash": "0gwxjmph3ac5v0h5zz8664412yq09cka5p4amdbxk7hna24igksz",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v13.8.5-ee",
+ "rev": "v13.9.4-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "13.8.5",
- "GITLAB_PAGES_VERSION": "1.34.0",
- "GITLAB_SHELL_VERSION": "13.15.1",
- "GITLAB_WORKHORSE_VERSION": "8.59.2"
+ "GITALY_SERVER_VERSION": "13.9.4",
+ "GITLAB_PAGES_VERSION": "1.35.0",
+ "GITLAB_SHELL_VERSION": "13.17.0",
+ "GITLAB_WORKHORSE_VERSION": "8.63.2"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 1a9f3ea8fd6b..d2b3d2ea0e11 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -1,23 +1,23 @@
source 'https://rubygems.org'
-gem 'rugged', '~> 0.28'
+gem 'rugged', '~> 1.0.1'
gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.0.3.4'
gem 'rdoc', '~> 6.0'
-gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false
-gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
+gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
+gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.3.gitlab.1', require: false
gem 'grpc', '~> 1.30.2'
gem 'sentry-raven', '~> 3.0', require: false
gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
# Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.13.2'
+gem 'gitlab-labkit', '~> 0.15.0'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
-gem 'licensee', '~> 8.9.0'
+gem 'licensee', '~> 9.14.1'
gem 'google-protobuf', '~> 3.12'
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index acfc05c8747b..83c5f20f73db 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -24,6 +24,8 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
ast (2.4.1)
binding_ninja (0.2.3)
builder (3.2.4)
@@ -35,8 +37,9 @@ GEM
concurrent-ruby (1.1.7)
crass (1.0.6)
diff-lcs (1.3)
+ dotenv (2.7.6)
equalizer (0.0.11)
- erubi (1.9.0)
+ erubi (1.10.0)
escape_utils (1.2.1)
factory_bot (5.0.2)
activesupport (>= 4.2.0)
@@ -51,23 +54,24 @@ GEM
mini_mime (~> 1.0)
rugged (>= 0.25.1)
github-markup (1.7.0)
- gitlab-gollum-lib (4.2.7.9)
+ gitlab-gollum-lib (4.2.7.10.gitlab.1)
gemojione (~> 3.2)
github-markup (~> 1.6)
- gitlab-gollum-rugged_adapter (~> 0.4.4.2)
+ gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1)
nokogiri (>= 1.6.1, < 2.0)
rouge (~> 3.1)
sanitize (~> 4.6.4)
stringex (~> 2.6)
- gitlab-gollum-rugged_adapter (0.4.4.2)
+ gitlab-gollum-rugged_adapter (0.4.4.3.gitlab.1)
mime-types (>= 1.15)
- rugged (~> 0.25)
- gitlab-labkit (0.13.2)
- actionpack (>= 5.0.0, < 6.1.0)
- activesupport (>= 5.0.0, < 6.1.0)
+ rugged (~> 1.0)
+ gitlab-labkit (0.15.0)
+ actionpack (>= 5.0.0, < 7.0.0)
+ activesupport (>= 5.0.0, < 7.0.0)
grpc (~> 1.19)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
+ pg_query (~> 1.3)
redis (> 3.0.0, < 5.0.0)
gitlab-markup (1.7.1)
google-protobuf (3.12.4)
@@ -83,10 +87,14 @@ GEM
jaeger-client (1.1.0)
opentracing (~> 0.3)
thrift
- json (2.3.1)
- licensee (8.9.2)
- rugged (~> 0.24)
- loofah (2.8.0)
+ json (2.5.1)
+ licensee (9.14.1)
+ dotenv (~> 2.0)
+ octokit (~> 4.17)
+ reverse_markdown (~> 1.0)
+ rugged (>= 0.24, < 2.0)
+ thor (>= 0.19, < 2.0)
+ loofah (2.9.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
@@ -94,7 +102,7 @@ GEM
method_source (0.9.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2020.0512)
+ mime-types-data (3.2020.1104)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
minitest (5.14.2)
@@ -105,11 +113,15 @@ GEM
racc (~> 1.4)
nokogumbo (1.5.0)
nokogiri
+ octokit (4.20.0)
+ faraday (>= 0.9)
+ sawyer (~> 0.8.0, >= 0.5.3)
opentracing (0.5.0)
optimist (3.0.1)
parallel (1.19.2)
parser (2.7.2.0)
ast (~> 2.4.1)
+ pg_query (1.3.0)
proc_to_ast (0.1.0)
coderay
parser
@@ -118,6 +130,7 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
+ public_suffix (4.0.6)
racc (1.5.2)
rack (2.2.3)
rack-test (1.1.0)
@@ -133,8 +146,10 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (6.2.0)
- redis (4.1.3)
+ redis (4.2.5)
regexp_parser (1.8.1)
+ reverse_markdown (1.4.0)
+ nokogiri
rexml (3.2.4)
rouge (3.26.0)
rspec (3.8.0)
@@ -168,16 +183,20 @@ GEM
rubocop-ast (0.2.0)
parser (>= 2.7.0.1)
ruby-progressbar (1.10.1)
- rugged (0.28.4.1)
+ rugged (1.0.1)
sanitize (4.6.6)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
+ sawyer (0.8.2)
+ addressable (>= 2.3.5)
+ faraday (> 0.8, < 2.0)
sentry-raven (3.0.4)
faraday (>= 1.0)
stringex (2.8.5)
+ thor (1.1.0)
thread_safe (0.3.6)
- thrift (0.11.0.0)
+ thrift (0.13.0)
timecop (0.9.1)
tzinfo (1.2.9)
thread_safe (~> 0.1)
@@ -200,21 +219,21 @@ DEPENDENCIES
factory_bot
faraday (~> 1.0)
github-linguist (~> 7.12)
- gitlab-gollum-lib (~> 4.2.7.9)
- gitlab-gollum-rugged_adapter (~> 0.4.4.2)
- gitlab-labkit (~> 0.13.2)
+ gitlab-gollum-lib (~> 4.2.7.10.gitlab.1)
+ gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1)
+ gitlab-labkit (~> 0.15.0)
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.12)
grpc (~> 1.30.2)
grpc-tools (= 1.30.2)
- licensee (~> 8.9.0)
+ licensee (~> 9.14.1)
pry (~> 0.12.2)
rbtrace
rdoc (~> 6.0)
rspec
rspec-parameterized
rubocop (~> 0.69)
- rugged (~> 0.28)
+ rugged (~> 1.0.1)
sentry-raven (~> 3.0)
timecop
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index a201d79a12a4..37e97522fad4 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -33,17 +33,17 @@ let
};
};
in buildGoModule rec {
- version = "13.8.5";
+ version = "13.9.4";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-hKIjKltPPmz50Ru7elpHdeoyGAqgp+txR3fKleqY7hM=";
+ sha256 = "sha256-6ocP4SMafvLI2jfvcB8jk1AemAI/TiBQ1iaVxK7I54A=";
};
- vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM=";
+ vendorSha256 = "10ssx0dvbzg70vr2sgnhzijnjxfw6533wdjxwakj62rpfayklp51";
passthru = {
inherit rubyEnv;
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index 9159b62c8df7..7b4928918f64 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -49,6 +49,17 @@
};
version = "0.2.0";
};
+ addressable = {
+ dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ type = "gem";
+ };
+ version = "2.7.0";
+ };
ast = {
groups = ["default" "development" "test"];
platforms = [];
@@ -134,6 +145,16 @@
};
version = "1.3";
};
+ dotenv = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
+ type = "gem";
+ };
+ version = "2.7.6";
+ };
equalizer = {
source = {
remotes = ["https://rubygems.org"];
@@ -147,10 +168,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
+ sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
type = "gem";
};
- version = "1.9.0";
+ version = "1.10.0";
};
escape_utils = {
source = {
@@ -226,10 +247,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y21k8bix3h2qdys2kz2z831cclmx3zc15x67cp8s945dkmh39sj";
+ sha256 = "0r6smbqnh0m84fxwb2g11qjfbcsljfin4vhnf43nmmbql2l1i3ah";
type = "gem";
};
- version = "4.2.7.9";
+ version = "4.2.7.10.gitlab.1";
};
gitlab-gollum-rugged_adapter = {
dependencies = ["mime-types" "rugged"];
@@ -237,21 +258,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d32d3yfadzwrarv0biwbfbkz2bqcc0dc3q0imnk962jaay19gc4";
+ sha256 = "0rqi9h6k32azljmx2q0zibvs1m59wgh879h04jflxkcqyzj6wyyj";
type = "gem";
};
- version = "0.4.4.2";
+ version = "0.4.4.3.gitlab.1";
};
gitlab-labkit = {
- dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
+ dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vgd61xdclihifcdivddfs1gipxy1ql0kf9q47k9h0xisscyjhd2";
+ sha256 = "1l9bsjszp5zyzbdsr9ls09d4yr2sb0xjc40x4rv7fbzk19n9xs71";
type = "gem";
};
- version = "0.13.2";
+ version = "0.15.0";
};
gitlab-markup = {
groups = ["default"];
@@ -336,23 +357,25 @@
version = "1.1.0";
};
json = {
- groups = ["default" "development" "test"];
+ groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
+ sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
- version = "2.3.1";
+ version = "2.5.1";
};
licensee = {
- dependencies = ["rugged"];
+ dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc";
+ sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5";
type = "gem";
};
- version = "8.9.2";
+ version = "9.14.1";
};
loofah = {
dependencies = ["crass" "nokogiri"];
@@ -360,10 +383,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
+ sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
type = "gem";
};
- version = "2.8.0";
+ version = "2.9.0";
};
memoizable = {
dependencies = ["thread_safe"];
@@ -398,10 +421,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
+ sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
type = "gem";
};
- version = "3.2020.0512";
+ version = "3.2020.1104";
};
mini_mime = {
groups = ["default"];
@@ -473,6 +496,17 @@
};
version = "1.5.0";
};
+ octokit = {
+ dependencies = ["faraday" "sawyer"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
+ type = "gem";
+ };
+ version = "4.20.0";
+ };
opentracing = {
groups = ["default"];
platforms = [];
@@ -514,6 +548,16 @@
};
version = "2.7.2.0";
};
+ pg_query = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
source = {
@@ -540,6 +584,16 @@
};
version = "0.12.2";
};
+ public_suffix = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+ type = "gem";
+ };
+ version = "4.0.6";
+ };
racc = {
groups = ["default"];
platforms = [];
@@ -627,10 +681,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh";
+ sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48";
type = "gem";
};
- version = "4.1.3";
+ version = "4.2.5";
};
regexp_parser = {
groups = ["default" "development" "test"];
@@ -642,6 +696,17 @@
};
version = "1.8.1";
};
+ reverse_markdown = {
+ dependencies = ["nokogiri"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
rexml = {
groups = ["default" "development" "test"];
platforms = [];
@@ -764,10 +829,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx";
+ sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn";
type = "gem";
};
- version = "0.28.4.1";
+ version = "1.0.1";
};
sanitize = {
dependencies = ["crass" "nokogiri" "nokogumbo"];
@@ -778,6 +843,17 @@
};
version = "4.6.6";
};
+ sawyer = {
+ dependencies = ["addressable" "faraday"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
+ type = "gem";
+ };
+ version = "0.8.2";
+ };
sentry-raven = {
dependencies = ["faraday"];
groups = ["default"];
@@ -799,6 +875,16 @@
};
version = "2.8.5";
};
+ thor = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
thread_safe = {
source = {
remotes = ["https://rubygems.org"];
@@ -812,10 +898,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+ sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q";
type = "gem";
};
- version = "0.11.0.0";
+ version = "0.13.0";
};
timecop = {
source = {
@@ -867,4 +953,4 @@
};
version = "2.4.2";
};
-}
+}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index dcd24bab3cf6..c86c63a5656a 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gitlab-shell";
- version = "13.15.1";
+ version = "13.17.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 05be0e16818d..64e1668ba065 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,16 +3,16 @@
buildGoModule rec {
pname = "gitlab-workhorse";
- version = "8.59.2";
+ version = "8.63.2";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "sha256-hMcE7dlUw34DyUO0v5JxwvvEh/HC2emrIKc1K1U4bPE=";
+ sha256 = "1vjk7r7228p2gblx9nmqiz70ckbllg1p3bwkyfd4m49jhp13hryi";
};
- vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";
+ vendorSha256 = "0hc02nxw5jp1mhpjcx1f2a2dfaq7ji4qkf5g7lbpd1rzhqwp6zsz";
buildInputs = [ git ];
buildFlagsArray = "-ldflags=-X main.Version=${version}";
doCheck = false;
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 23b58d721f3b..ec253c37b3a6 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
source 'https://rubygems.org'
gem 'rails', '~> 6.0.3.1'
@@ -10,12 +12,12 @@ gem 'responders', '~> 3.0'
gem 'sprockets', '~> 3.7.0'
# Default values for AR models
-gem 'default_value_for', '~> 3.3.0'
+gem 'default_value_for', '~> 3.4.0'
# Supported DBs
gem 'pg', '~> 1.1'
-gem 'rugged', '~> 0.28'
+gem 'rugged', '~> 1.0.1'
gem 'grape-path-helpers', '~> 1.6.1'
gem 'faraday', '~> 1.0'
@@ -25,8 +27,8 @@ gem 'marginalia', '~> 1.10.0'
gem 'devise', '~> 4.7.2'
# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828)
gem 'bcrypt', '3.1.12'
-gem 'doorkeeper', '~> 5.3.0'
-gem 'doorkeeper-openid_connect', '~> 1.7.4'
+gem 'doorkeeper', '~> 5.5.0.rc2'
+gem 'doorkeeper-openid_connect', '~> 1.7.5'
gem 'omniauth', '~> 1.8'
gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
@@ -81,7 +83,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap', '~> 0.16.3'
# API
-gem 'grape', '~> 1.5.1'
+gem 'grape', '~> 1.5.2'
gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
@@ -103,7 +105,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0'
# HAML
-gem 'hamlit', '~> 2.11.0'
+gem 'hamlit', '~> 2.14.4'
# Files attachments
gem 'carrierwave', '~> 1.3'
@@ -154,7 +156,7 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'asciidoctor-kroki', '~> 0.2.2', require: false
+gem 'asciidoctor-kroki', '~> 0.4.0', require: false
gem 'rouge', '~> 3.26.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
@@ -266,7 +268,7 @@ gem 'babosa', '~> 1.0.2'
gem 'loofah', '~> 2.2'
# Working with license
-gem 'licensee', '~> 8.9'
+gem 'licensee', '~> 9.14.1'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
@@ -284,6 +286,7 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2'
gem 'rack-proxy', '~> 0.6.0'
gem 'sassc-rails', '~> 2.1.0'
+gem 'autoprefixer-rails', '10.2.0.0'
gem 'terser', '1.0.2'
gem 'addressable', '~> 2.7'
@@ -292,7 +295,7 @@ gem 'gon', '~> 6.2'
gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0'
-gem "gitlab-license", "~> 1.0"
+gem "gitlab-license", "~> 1.3"
# Protect against bruteforcing
gem 'rack-attack', '~> 6.3.0'
@@ -339,6 +342,7 @@ end
group :development do
gem 'brakeman', '~> 4.2', require: false
gem 'danger', '~> 8.0.6', require: false
+ gem 'lefthook', '~> 0.7', require: false
gem 'letter_opener_web', '~> 1.3.4'
@@ -346,12 +350,12 @@ group :development do
gem 'better_errors', '~> 2.7.1'
# thin instead webrick
- gem 'thin', '~> 1.7.0'
+ gem 'thin', '~> 1.8.0'
end
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false
- gem 'bullet', '~> 6.1.0'
+ gem 'bullet', '~> 6.1.3'
gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
gem 'pry-rails', '~> 0.3.9'
gem 'pry-remote'
@@ -360,7 +364,7 @@ group :development, :test do
gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 6.1.0'
- gem 'rspec-rails', '~> 4.0.1'
+ gem 'rspec-rails', '~> 4.0.2'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.11.0'
@@ -375,7 +379,7 @@ group :development, :test do
gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
- gem 'bundler-audit', '~> 0.6.1', require: false
+ gem 'bundler-audit', '~> 0.7.0.1', require: false
gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -465,7 +469,7 @@ group :ed25519 do
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.8.0.pre.rc2'
+gem 'gitaly', '~> 13.9.0.pre.rc1'
gem 'grpc', '~> 1.30.2'
@@ -478,7 +482,7 @@ gem 'flipper', '~> 0.17.1'
gem 'flipper-active_record', '~> 0.17.1'
gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5'
-gem 'gitlab-experiment', '~> 0.4.5'
+gem 'gitlab-experiment', '~> 0.4.9'
# Structured logging
gem 'lograge', '~> 0.5'
@@ -520,3 +524,5 @@ gem 'webauthn', '~> 2.3'
# IPAddress utilities
gem 'ipaddress', '~> 0.8.3'
+
+gem 'parslet', '~> 1.8'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 26a757a76831..1b6701e8e3d2 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -81,10 +81,10 @@ GEM
faraday_middleware (~> 1.0)
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.4)
- asciidoctor (2.0.10)
+ asciidoctor (2.0.12)
asciidoctor-include-ext (0.3.1)
asciidoctor (>= 1.5.6, < 3.0.0)
- asciidoctor-kroki (0.2.2)
+ asciidoctor-kroki (0.4.0)
asciidoctor (~> 2.0)
asciidoctor-plantuml (0.0.12)
asciidoctor (>= 1.5.6, < 3.0.0)
@@ -94,6 +94,8 @@ GEM
attr_encrypted (3.1.0)
encryptor (~> 3.0.0)
attr_required (1.0.1)
+ autoprefixer-rails (10.2.0.0)
+ execjs
awesome_print (1.8.0)
awrence (1.1.1)
aws-eventstream (1.1.0)
@@ -145,12 +147,12 @@ GEM
brakeman (4.2.1)
browser (4.2.0)
builder (3.2.4)
- bullet (6.1.0)
+ bullet (6.1.3)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
- bundler-audit (0.6.1)
+ bundler-audit (0.7.0.1)
bundler (>= 1.2.0, < 3)
- thor (~> 0.18)
+ thor (>= 0.18, < 2)
byebug (11.1.3)
capybara (3.34.0)
addressable
@@ -205,7 +207,7 @@ GEM
git
css_parser (1.7.0)
addressable
- daemons (1.2.6)
+ daemons (1.3.1)
danger (8.0.6)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
@@ -225,8 +227,8 @@ GEM
html-pipeline
declarative (0.0.20)
declarative-option (0.1.0)
- default_value_for (3.3.0)
- activerecord (>= 3.2.0, < 6.1)
+ default_value_for (3.4.0)
+ activerecord (>= 3.2.0, < 7.0)
deprecation_toolkit (1.5.1)
activesupport (>= 4.2)
derailed_benchmarks (1.8.1)
@@ -260,11 +262,12 @@ GEM
docile (1.3.2)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
- doorkeeper (5.3.3)
+ doorkeeper (5.5.0.rc2)
railties (>= 5)
- doorkeeper-openid_connect (1.7.4)
+ doorkeeper-openid_connect (1.7.5)
doorkeeper (>= 5.2, < 5.5)
json-jwt (>= 1.11.0)
+ dotenv (2.7.6)
dry-configurable (0.12.0)
concurrent-ruby (~> 1.0)
dry-core (~> 0.5, >= 0.5.0)
@@ -417,12 +420,12 @@ GEM
rails (>= 3.2.0)
git (1.7.0)
rchardet (~> 1.8)
- gitaly (13.8.0.pre.rc2)
+ gitaly (13.9.0.pre.rc1)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
- gitlab-experiment (0.4.5)
+ gitlab-experiment (0.4.9)
activesupport (>= 3.0)
scientist (~> 1.5, >= 1.5.0)
gitlab-fog-azure-rm (1.0.0)
@@ -440,7 +443,7 @@ GEM
jaeger-client (~> 1.1)
opentracing (~> 0.4)
redis (> 3.0.0, < 5.0.0)
- gitlab-license (1.0.0)
+ gitlab-license (1.3.0)
gitlab-mail_room (0.0.8)
gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1)
@@ -492,7 +495,7 @@ GEM
signet (~> 0.14)
gpgme (2.0.20)
mini_portile2 (~> 2.3)
- grape (1.5.1)
+ grape (1.5.2)
activesupport
builder
dry-types (>= 1.1)
@@ -557,7 +560,7 @@ GEM
rainbow
rubocop (>= 0.50.0)
sysexits (~> 1.1)
- hamlit (2.11.0)
+ hamlit (2.14.4)
temple (>= 0.8.2)
thor
tilt
@@ -658,6 +661,7 @@ GEM
rest-client (~> 2.0)
launchy (2.4.3)
addressable (~> 2.3)
+ lefthook (0.7.2)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (1.3.4)
@@ -671,8 +675,12 @@ GEM
toml (= 0.2.0)
with_env (= 1.1.0)
xml-simple
- licensee (8.9.2)
- rugged (~> 0.24)
+ licensee (9.14.1)
+ dotenv (~> 2.0)
+ octokit (~> 4.17)
+ reverse_markdown (~> 1.0)
+ rugged (>= 0.24, < 2.0)
+ thor (>= 0.19, < 2.0)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
@@ -753,7 +761,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
- octokit (4.15.0)
+ octokit (4.20.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
oj (3.10.6)
@@ -987,6 +995,8 @@ GEM
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (3.1.2)
+ reverse_markdown (1.4.0)
+ nokogiri
rexml (3.2.4)
rinku (2.0.0)
rotp (2.1.2)
@@ -999,12 +1009,12 @@ GEM
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
- rspec-core (3.10.0)
+ rspec-core (3.10.1)
rspec-support (~> 3.10.0)
- rspec-expectations (3.10.0)
+ rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
- rspec-mocks (3.10.0)
+ rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-parameterized (0.4.2)
@@ -1013,17 +1023,17 @@ GEM
proc_to_ast
rspec (>= 2.13, < 4)
unparser
- rspec-rails (4.0.1)
+ rspec-rails (4.0.2)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
- rspec-core (~> 3.9)
- rspec-expectations (~> 3.9)
- rspec-mocks (~> 3.9)
- rspec-support (~> 3.9)
+ rspec-core (~> 3.10)
+ rspec-expectations (~> 3.10)
+ rspec-mocks (~> 3.10)
+ rspec-support (~> 3.10)
rspec-retry (0.6.1)
rspec-core (> 3.3)
- rspec-support (3.10.0)
+ rspec-support (3.10.2)
rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.6)
@@ -1069,7 +1079,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (2.0.0)
- rugged (0.28.4.1)
+ rugged (1.0.1)
safe_yaml (1.0.4)
safety_net_attestation (0.4.0)
jwt (~> 2.0)
@@ -1170,11 +1180,11 @@ GEM
execjs (>= 0.3.0, < 3)
test-prof (0.12.0)
text (1.3.1)
- thin (1.7.2)
+ thin (1.8.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
- thor (0.20.3)
+ thor (1.1.0)
thread_safe (0.3.6)
thrift (0.14.0)
tilt (2.0.10)
@@ -1281,10 +1291,11 @@ DEPENDENCIES
asana (~> 0.10.3)
asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1)
- asciidoctor-kroki (~> 0.2.2)
+ asciidoctor-kroki (~> 0.4.0)
asciidoctor-plantuml (~> 0.0.12)
atlassian-jwt (~> 0.2.0)
attr_encrypted (~> 3.1.0)
+ autoprefixer-rails (= 10.2.0.0)
awesome_print
aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3)
@@ -1301,8 +1312,8 @@ DEPENDENCIES
bootstrap_form (~> 4.2.0)
brakeman (~> 4.2)
browser (~> 4.2)
- bullet (~> 6.1.0)
- bundler-audit (~> 0.6.1)
+ bullet (~> 6.1.3)
+ bundler-audit (~> 0.7.0.1)
capybara (~> 3.34.0)
capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3)
@@ -1316,7 +1327,7 @@ DEPENDENCIES
danger (~> 8.0.6)
database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.1)
- default_value_for (~> 3.3.0)
+ default_value_for (~> 3.4.0)
deprecation_toolkit (~> 1.5.1)
derailed_benchmarks
device_detector
@@ -1325,8 +1336,8 @@ DEPENDENCIES
diff_match_patch (~> 0.1.0)
diffy (~> 3.3)
discordrb-webhooks-blackst0ne (~> 3.3)
- doorkeeper (~> 5.3.0)
- doorkeeper-openid_connect (~> 1.7.4)
+ doorkeeper (~> 5.5.0.rc2)
+ doorkeeper-openid_connect (~> 1.7.5)
ed25519 (~> 1.2)
elasticsearch-api (~> 6.8.2)
elasticsearch-model (~> 6.1)
@@ -1357,13 +1368,13 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly (~> 13.8.0.pre.rc2)
+ gitaly (~> 13.9.0.pre.rc1)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
- gitlab-experiment (~> 0.4.5)
+ gitlab-experiment (~> 0.4.9)
gitlab-fog-azure-rm (~> 1.0)
gitlab-labkit (= 0.14.0)
- gitlab-license (~> 1.0)
+ gitlab-license (~> 1.3)
gitlab-mail_room (~> 0.0.8)
gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1)
@@ -1376,7 +1387,7 @@ DEPENDENCIES
google-api-client (~> 0.33)
google-protobuf (~> 3.12)
gpgme (~> 2.0.19)
- grape (~> 1.5.1)
+ grape (~> 1.5.2)
grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.6.1)
grape_logging (~> 1.7)
@@ -1388,7 +1399,7 @@ DEPENDENCIES
gssapi
guard-rspec
haml_lint (~> 0.36.0)
- hamlit (~> 2.11.0)
+ hamlit (~> 2.14.4)
hangouts-chat (~> 0.0.5)
hashie
hashie-forbidden_attributes
@@ -1410,9 +1421,10 @@ DEPENDENCIES
knapsack (~> 1.17)
kramdown (~> 2.3.0)
kubeclient (~> 4.9.1)
+ lefthook (~> 0.7)
letter_opener_web (~> 1.3.4)
license_finder (~> 6.0)
- licensee (~> 8.9)
+ licensee (~> 9.14.1)
lockbox (~> 0.3.3)
lograge (~> 0.5)
loofah (~> 2.2)
@@ -1452,6 +1464,7 @@ DEPENDENCIES
omniauth_openid_connect (~> 0.3.5)
org-ruby (~> 0.9.12)
parallel (~> 1.19)
+ parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.1)
pg_query (~> 1.3.0)
@@ -1487,7 +1500,7 @@ DEPENDENCIES
rouge (~> 3.26.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
- rspec-rails (~> 4.0.1)
+ rspec-rails (~> 4.0.2)
rspec-retry (~> 0.6.1)
rspec_junit_formatter
rspec_profiling (~> 0.0.6)
@@ -1496,7 +1509,7 @@ DEPENDENCIES
ruby-progressbar (~> 1.10)
ruby_parser (~> 3.15)
rubyzip (~> 2.0.0)
- rugged (~> 0.28)
+ rugged (~> 1.0.1)
sanitize (~> 5.2.1)
sassc-rails (~> 2.1.0)
scss_lint (~> 0.59.0)
@@ -1521,7 +1534,7 @@ DEPENDENCIES
sys-filesystem (~> 1.1.6)
terser (= 1.0.2)
test-prof (~> 0.12.0)
- thin (~> 1.7.0)
+ thin (~> 1.8.0)
thrift (>= 0.14.0)
timecop (~> 0.9.1)
toml-rb (~> 1.0.0)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index d13ca2986359..64d38a9a2747 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -242,10 +242,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz";
+ sha256 = "1gjk9v83vw0pz4x0xqqnw231z9sgscm6vnacjw7hy5njkw8fskj9";
type = "gem";
};
- version = "2.0.10";
+ version = "2.0.12";
};
asciidoctor-include-ext = {
dependencies = ["asciidoctor"];
@@ -264,10 +264,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10yc07x2z9f122wnncf34s91vlfcd4wy8y9wshxc7j2m4a2jlzm5";
+ sha256 = "13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w";
type = "gem";
};
- version = "0.2.2";
+ version = "0.4.0";
};
asciidoctor-plantuml = {
dependencies = ["asciidoctor"];
@@ -322,6 +322,17 @@
};
version = "1.0.1";
};
+ autoprefixer-rails = {
+ dependencies = ["execjs"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0p9j0sxw0nm27x7wj0n8a9zikwb0v8b6varr601rcgymsjj2v7wy";
+ type = "gem";
+ };
+ version = "10.2.0.0";
+ };
awesome_print = {
groups = ["development" "test"];
platforms = [];
@@ -599,10 +610,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18ifwnvn13755qkfigapyj5bflpby3phxzbb7x5336d0kzv5k7d9";
+ sha256 = "04wm807czdixpgnqp446vj8vc7dj96k26p90rmwll9ahlib37mmm";
type = "gem";
};
- version = "6.1.0";
+ version = "6.1.3";
};
bundler-audit = {
dependencies = ["thor"];
@@ -610,10 +621,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pm22xpn3xyymsainixnrk8v3l3xi9bzwkjkspx00cfzp84xvxbq";
+ sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j";
type = "gem";
};
- version = "0.6.1";
+ version = "0.7.0.1";
};
byebug = {
groups = ["default" "development" "test"];
@@ -910,10 +921,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2";
+ sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
type = "gem";
};
- version = "1.2.6";
+ version = "1.3.1";
};
danger = {
dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"];
@@ -987,10 +998,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08hwnnqm3bxd4n627isliq79zysdlmfkf813403v0b4mkhika5my";
+ sha256 = "03zln3mp8wa734jl7abd6gby08xq8j6n4y2phzxfsssscx8xrlim";
type = "gem";
};
- version = "3.3.0";
+ version = "3.4.0";
};
deprecation_toolkit = {
dependencies = ["activesupport"];
@@ -1114,10 +1125,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01scvhvrw44ksv1aaywpp9kfm4c8qs4gwnnha40r5mq0vpc0qrny";
+ sha256 = "1mdjnw5n2r3hclg4gmzx19w750sdcxw9y6dhcawbzb9wrbzj58wk";
type = "gem";
};
- version = "5.3.3";
+ version = "5.5.0.rc2";
};
doorkeeper-openid_connect = {
dependencies = ["doorkeeper" "json-jwt"];
@@ -1125,10 +1136,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yylcg4j7msxma0s8rx8990bfgr0c414a7vafs3gpgmbwy47wq45";
+ sha256 = "1cj7b45lxiifi6pw8gnylfzlhji572v0pj896rbyqjwyzlgj1sid";
type = "gem";
};
- version = "1.7.4";
+ version = "1.7.5";
+ };
+ dotenv = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
+ type = "gem";
+ };
+ version = "2.7.6";
};
dry-configurable = {
dependencies = ["concurrent-ruby" "dry-core"];
@@ -1798,10 +1819,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kns9lw8gdxm61vyvf3jin448zrl2h3qdx2ggilzxig28hdi0vha";
+ sha256 = "137gr4nbxhcyh4s60r2z0js8q2bfnmxiggwnf122wp9csywlnyg2";
type = "gem";
};
- version = "13.8.0.pre.rc2";
+ version = "13.9.0.pre.rc1";
};
github-markup = {
groups = ["default"];
@@ -1830,10 +1851,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1v8ygrc2c98rz72za59g313n1mmr18jdbzr965lkp2zv2rw7cs9n";
+ sha256 = "0skqg90i6qdpm7dhy8bv99gk8siwgm6mpr675790ngri1ns4f5xk";
type = "gem";
};
- version = "0.4.5";
+ version = "0.4.9";
};
gitlab-fog-azure-rm = {
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
@@ -1862,10 +1883,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih";
+ sha256 = "04846kr8pw0fkw4mavakai978raq5d2kjna4rawxpc3dqlr897g4";
type = "gem";
};
- version = "1.0.0";
+ version = "1.3.0";
};
gitlab-mail_room = {
groups = ["default"];
@@ -2059,10 +2080,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lizcma35sygkd3q7zjv13mrr905ncn80f1ym6n305s75kc0pk9n";
+ sha256 = "0adf01kihxbmh8q84r6zyfgdmpbyb0lwcar3fi8j6bl6qcsbgwqx";
type = "gem";
};
- version = "1.5.1";
+ version = "1.5.2";
};
grape-entity = {
dependencies = ["activesupport" "multi_json"];
@@ -2233,10 +2254,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13wkrvyldk21xlc9illam495fpgf7w7bksaj8y6n00y036wmbg60";
+ sha256 = "1gjbdni9jdpsdahrx2q7cvrc6jkrzpf9rdi0rli8mdvwi9xjafz5";
type = "gem";
};
- version = "2.11.0";
+ version = "2.14.4";
};
hana = {
groups = ["default"];
@@ -2705,6 +2726,16 @@
};
version = "2.4.3";
};
+ lefthook = {
+ groups = ["development"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17bv6zfdzwbbh8n0iw8zgjngsvyp2imrrfshj62yrlxpka9ka0z3";
+ type = "gem";
+ };
+ version = "0.7.2";
+ };
letter_opener = {
dependencies = ["launchy"];
groups = ["default" "development"];
@@ -2739,15 +2770,15 @@
version = "6.0.0";
};
licensee = {
- dependencies = ["rugged"];
+ dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc";
+ sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5";
type = "gem";
};
- version = "8.9.2";
+ version = "9.14.1";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@@ -3236,10 +3267,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yg6dhd028j74sm8hpw9w7bwfwlkml9wiis7nq20ivfsbcz4g8ac";
+ sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
type = "gem";
};
- version = "4.15.0";
+ version = "4.20.0";
};
oj = {
groups = ["default"];
@@ -4260,6 +4291,17 @@
};
version = "3.1.2";
};
+ reverse_markdown = {
+ dependencies = ["nokogiri"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
rexml = {
groups = ["default" "development" "test"];
platforms = [];
@@ -4339,10 +4381,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0n2rdv8f26yw8c6asymc0mgddyr5d2b5n6mfvpd3n6lnpf1jdyv2";
+ sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc";
type = "gem";
};
- version = "3.10.0";
+ version = "3.10.1";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@@ -4350,10 +4392,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j37dvnvfbjwj8dqx27yfvz0frl7f2jc1abqg99h0ppriz9za6dc";
+ sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17";
type = "gem";
};
- version = "3.10.0";
+ version = "3.10.1";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
@@ -4361,10 +4403,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pz89y1522i6f8wzrg72ykmch3318ih87nlpl0y1ghsrs5hqymw3";
+ sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k";
type = "gem";
};
- version = "3.10.0";
+ version = "3.10.2";
};
rspec-parameterized = {
dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
@@ -4383,10 +4425,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lzik01ziaskgpdpy8knffpw0fsy9151f5lfigyhb89wq4q45hfs";
+ sha256 = "0aw5knjij21kzwis3vkcmqc16p55lbig1wq0i37093qga7zfsdg1";
type = "gem";
};
- version = "4.0.1";
+ version = "4.0.2";
};
rspec-retry = {
dependencies = ["rspec-core"];
@@ -4404,10 +4446,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j0n28i6zci5j7gg370bdy87dy43hlwx6dw428d9kamf5a0i2klz";
+ sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl";
type = "gem";
};
- version = "3.10.0";
+ version = "3.10.2";
};
rspec_junit_formatter = {
dependencies = ["rspec-core"];
@@ -4616,10 +4658,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx";
+ sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn";
type = "gem";
};
- version = "0.28.4.1";
+ version = "1.0.1";
};
safe_yaml = {
groups = ["default" "test"];
@@ -5124,20 +5166,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
+ sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
type = "gem";
};
- version = "1.7.2";
+ version = "1.8.0";
};
thor = {
groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+ sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
type = "gem";
};
- version = "0.20.3";
+ version = "1.1.0";
};
thread_safe = {
groups = ["default" "development" "test"];
@@ -5590,4 +5632,4 @@
};
version = "2.4.2";
};
-}
+}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
index a9e255417daa..916f5f602793 100644
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@@ -770,19 +770,27 @@
};
}
{
- name = "_gitlab_at.js___at.js_1.5.5.tgz";
+ name = "_eslint_eslintrc___eslintrc_0.3.0.tgz";
path = fetchurl {
- name = "_gitlab_at.js___at.js_1.5.5.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.5.tgz";
- sha1 = "5f6bfe6baaef360daa9b038fa78798d7a6a916b4";
+ name = "_eslint_eslintrc___eslintrc_0.3.0.tgz";
+ url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz";
+ sha1 = "d736d6963d7003b6514e6324bec9c602ac340318";
};
}
{
- name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz";
+ name = "_gitlab_at.js___at.js_1.5.7.tgz";
path = fetchurl {
- name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-6.0.0.tgz";
- sha1 = "deb18f63808af1cb1cc117a92558f07edb1e2256";
+ name = "_gitlab_at.js___at.js_1.5.7.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz";
+ sha1 = "1ee6f838cc4410a1d797770934df91d90df8179e";
+ };
+ }
+ {
+ name = "_gitlab_eslint_plugin___eslint_plugin_8.0.0.tgz";
+ path = fetchurl {
+ name = "_gitlab_eslint_plugin___eslint_plugin_8.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.0.0.tgz";
+ sha1 = "e8d30fd98e2102f417617d0c60ef1810520a8ac6";
};
}
{
@@ -794,11 +802,11 @@
};
}
{
- name = "_gitlab_svgs___svgs_1.178.0.tgz";
+ name = "_gitlab_svgs___svgs_1.182.0.tgz";
path = fetchurl {
- name = "_gitlab_svgs___svgs_1.178.0.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.178.0.tgz";
- sha1 = "069edb8abb4c7137d48f527592476655f066538b";
+ name = "_gitlab_svgs___svgs_1.182.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.182.0.tgz";
+ sha1 = "600cb577c598ff63325c3f6f049e3254abdbb580";
};
}
{
@@ -810,11 +818,11 @@
};
}
{
- name = "_gitlab_ui___ui_25.11.3.tgz";
+ name = "_gitlab_ui___ui_27.4.6.tgz";
path = fetchurl {
- name = "_gitlab_ui___ui_25.11.3.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-25.11.3.tgz";
- sha1 = "54719d1276f417e66904f9f951671633f1647006";
+ name = "_gitlab_ui___ui_27.4.6.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-27.4.6.tgz";
+ sha1 = "2364c2ba981024cdce32b4657c5f0eb2ae781a4d";
};
}
{
@@ -969,6 +977,14 @@
sha1 = "2b5a3ab3f918cca48a8c754c08168e3f03eba61b";
};
}
+ {
+ name = "_npmcli_move_file___move_file_1.0.1.tgz";
+ path = fetchurl {
+ name = "_npmcli_move_file___move_file_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz";
+ sha1 = "de103070dac0f48ce49cf6693c23af59c0f70464";
+ };
+ }
{
name = "_nuxt_opencollective___opencollective_0.3.0.tgz";
path = fetchurl {
@@ -1186,11 +1202,19 @@
};
}
{
- name = "_types_json_schema___json_schema_7.0.6.tgz";
+ name = "_types_json_schema___json_schema_7.0.7.tgz";
path = fetchurl {
- name = "_types_json_schema___json_schema_7.0.6.tgz";
- url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz";
- sha1 = "f4c7ec43e81b319a9815115031709f26987891f0";
+ name = "_types_json_schema___json_schema_7.0.7.tgz";
+ url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz";
+ sha1 = "98a993516c859eb0d5c4c8f098317a9ea68db9ad";
+ };
+ }
+ {
+ name = "_types_json5___json5_0.0.29.tgz";
+ path = fetchurl {
+ name = "_types_json5___json5_0.0.29.tgz";
+ url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz";
+ sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee";
};
}
{
@@ -1330,147 +1354,147 @@
};
}
{
- name = "_webassemblyjs_ast___ast_1.8.5.tgz";
+ name = "_webassemblyjs_ast___ast_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_ast___ast_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz";
- sha1 = "51b1c5fe6576a34953bf4b253df9f0d490d9e359";
+ name = "_webassemblyjs_ast___ast_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz";
+ sha1 = "bd850604b4042459a5a41cd7d338cbed695ed964";
};
}
{
- name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz";
+ name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz";
- sha1 = "1ba926a2923613edce496fd5b02e8ce8a5f49721";
+ name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz";
+ sha1 = "3c3d3b271bddfc84deb00f71344438311d52ffb4";
};
}
{
- name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz";
+ name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz";
- sha1 = "c49dad22f645227c5edb610bdb9697f1aab721f7";
+ name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz";
+ sha1 = "203f676e333b96c9da2eeab3ccef33c45928b6a2";
};
}
{
- name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz";
+ name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz";
- sha1 = "fea93e429863dd5e4338555f42292385a653f204";
+ name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz";
+ sha1 = "a1442d269c5feb23fcbc9ef759dac3547f29de00";
};
}
{
- name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz";
+ name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz";
- sha1 = "9a740ff48e3faa3022b1dff54423df9aa293c25e";
+ name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz";
+ sha1 = "647f8892cd2043a82ac0c8c5e75c36f1d9159f27";
};
}
{
- name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz";
+ name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz";
- sha1 = "ba0b7d3b3f7e4733da6059c9332275d860702452";
+ name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz";
+ sha1 = "c05256b71244214671f4b08ec108ad63b70eddb8";
};
}
{
- name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz";
+ name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz";
- sha1 = "def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245";
+ name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz";
+ sha1 = "25d8884b76839871a08a6c6f806c3979ef712f07";
};
}
{
- name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz";
+ name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz";
- sha1 = "537a750eddf5c1e932f3744206551c91c1b93e61";
+ name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz";
+ sha1 = "4fed8beac9b8c14f8c58b70d124d549dd1fe5790";
};
}
{
- name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz";
+ name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz";
- sha1 = "74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf";
+ name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz";
+ sha1 = "5a4138d5a6292ba18b04c5ae49717e4167965346";
};
}
{
- name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz";
+ name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz";
- sha1 = "712329dbef240f36bf57bd2f7b8fb9bf4154421e";
+ name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz";
+ sha1 = "15c7a0fbaae83fb26143bbacf6d6df1702ad39e4";
};
}
{
- name = "_webassemblyjs_leb128___leb128_1.8.5.tgz";
+ name = "_webassemblyjs_leb128___leb128_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_leb128___leb128_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz";
- sha1 = "044edeb34ea679f3e04cd4fd9824d5e35767ae10";
+ name = "_webassemblyjs_leb128___leb128_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz";
+ sha1 = "f19ca0b76a6dc55623a09cffa769e838fa1e1c95";
};
}
{
- name = "_webassemblyjs_utf8___utf8_1.8.5.tgz";
+ name = "_webassemblyjs_utf8___utf8_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_utf8___utf8_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz";
- sha1 = "a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc";
+ name = "_webassemblyjs_utf8___utf8_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz";
+ sha1 = "04d33b636f78e6a6813227e82402f7637b6229ab";
};
}
{
- name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz";
+ name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz";
- sha1 = "962da12aa5acc1c131c81c4232991c82ce56e01a";
+ name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz";
+ sha1 = "3fe6d79d3f0f922183aa86002c42dd256cfee9cf";
};
}
{
- name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz";
+ name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz";
- sha1 = "54840766c2c1002eb64ed1abe720aded714f98bc";
+ name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz";
+ sha1 = "50bc70ec68ded8e2763b01a1418bf43491a7a49c";
};
}
{
- name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz";
+ name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz";
- sha1 = "b24d9f6ba50394af1349f510afa8ffcb8a63d264";
+ name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz";
+ sha1 = "2211181e5b31326443cc8112eb9f0b9028721a61";
};
}
{
- name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz";
+ name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz";
- sha1 = "21576f0ec88b91427357b8536383668ef7c66b8d";
+ name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz";
+ sha1 = "9d48e44826df4a6598294aa6c87469d642fff65e";
};
}
{
- name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz";
+ name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz";
- sha1 = "e10eecd542d0e7bd394f6827c49f3df6d4eefb8c";
+ name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz";
+ sha1 = "3031115d79ac5bd261556cecc3fa90a3ef451914";
};
}
{
- name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz";
+ name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz";
path = fetchurl {
- name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz";
- url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz";
- sha1 = "114bbc481fd10ca0e23b3560fa812748b0bae5bc";
+ name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz";
+ sha1 = "4935d54c85fef637b00ce9f52377451d00d47899";
};
}
{
@@ -1553,14 +1577,6 @@
sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b";
};
}
- {
- name = "acorn_walk___acorn_walk_6.2.0.tgz";
- path = fetchurl {
- name = "acorn_walk___acorn_walk_6.2.0.tgz";
- url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz";
- sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c";
- };
- }
{
name = "acorn_walk___acorn_walk_7.2.0.tgz";
path = fetchurl {
@@ -1570,11 +1586,11 @@
};
}
{
- name = "acorn___acorn_6.3.0.tgz";
+ name = "acorn___acorn_6.4.2.tgz";
path = fetchurl {
- name = "acorn___acorn_6.3.0.tgz";
- url = "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz";
- sha1 = "0087509119ffa4fc0a0041d1e93a417e68cb856e";
+ name = "acorn___acorn_6.4.2.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz";
+ sha1 = "35866fd710528e92de10cf06016498e47e39e1e6";
};
}
{
@@ -1633,6 +1649,14 @@
sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4";
};
}
+ {
+ name = "ajv___ajv_7.0.4.tgz";
+ path = fetchurl {
+ name = "ajv___ajv_7.0.4.tgz";
+ url = "https://registry.yarnpkg.com/ajv/-/ajv-7.0.4.tgz";
+ sha1 = "827e5f5ae32f5e5c1637db61f253a112229b5e2f";
+ };
+ }
{
name = "amdefine___amdefine_1.0.1.tgz";
path = fetchurl {
@@ -1657,6 +1681,14 @@
sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf";
};
}
+ {
+ name = "ansi_colors___ansi_colors_4.1.1.tgz";
+ path = fetchurl {
+ name = "ansi_colors___ansi_colors_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz";
+ sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348";
+ };
+ }
{
name = "ansi_escapes___ansi_escapes_4.3.0.tgz";
path = fetchurl {
@@ -1914,11 +1946,11 @@
};
}
{
- name = "array_includes___array_includes_3.0.3.tgz";
+ name = "array_includes___array_includes_3.1.2.tgz";
path = fetchurl {
- name = "array_includes___array_includes_3.0.3.tgz";
- url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz";
- sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d";
+ name = "array_includes___array_includes_3.1.2.tgz";
+ url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz";
+ sha1 = "a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8";
};
}
{
@@ -1946,11 +1978,11 @@
};
}
{
- name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
+ name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz";
path = fetchurl {
- name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
- url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz";
- sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b";
+ name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz";
+ url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz";
+ sha1 = "6ef638b43312bd401b4c6199fdec7e2dc9e9a123";
};
}
{
@@ -2017,6 +2049,14 @@
sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9";
};
}
+ {
+ name = "astral_regex___astral_regex_2.0.0.tgz";
+ path = fetchurl {
+ name = "astral_regex___astral_regex_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz";
+ sha1 = "483143c567aeed4785759c0865786dc77d7d2e31";
+ };
+ }
{
name = "async_foreach___async_foreach_0.1.3.tgz";
path = fetchurl {
@@ -2130,11 +2170,11 @@
};
}
{
- name = "babel_loader___babel_loader_8.0.6.tgz";
+ name = "babel_loader___babel_loader_8.2.2.tgz";
path = fetchurl {
- name = "babel_loader___babel_loader_8.0.6.tgz";
- url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz";
- sha1 = "e33bdb6f362b03f4bb141a0c21ab87c501b70dfb";
+ name = "babel_loader___babel_loader_8.2.2.tgz";
+ url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz";
+ sha1 = "9363ce84c10c9a40e6c753748e1441b60c8a0b81";
};
}
{
@@ -2330,11 +2370,11 @@
};
}
{
- name = "bn.js___bn.js_4.11.8.tgz";
+ name = "bn.js___bn.js_4.11.9.tgz";
path = fetchurl {
- name = "bn.js___bn.js_4.11.8.tgz";
- url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz";
- sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f";
+ name = "bn.js___bn.js_4.11.9.tgz";
+ url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz";
+ sha1 = "26d556829458f9d1e81fc48952493d0ba3507828";
};
}
{
@@ -2466,11 +2506,11 @@
};
}
{
- name = "browserslist___browserslist_4.12.0.tgz";
+ name = "browserslist___browserslist_4.16.1.tgz";
path = fetchurl {
- name = "browserslist___browserslist_4.12.0.tgz";
- url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz";
- sha1 = "06c6d5715a1ede6c51fc39ff67fd647f740b656d";
+ name = "browserslist___browserslist_4.16.1.tgz";
+ url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz";
+ sha1 = "bf757a2da376b3447b800a16f0f1c96358138766";
};
}
{
@@ -2562,11 +2602,11 @@
};
}
{
- name = "cacache___cacache_13.0.1.tgz";
+ name = "cacache___cacache_15.0.5.tgz";
path = fetchurl {
- name = "cacache___cacache_13.0.1.tgz";
- url = "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz";
- sha1 = "a8000c21697089082f85287a1aec6e382024a71c";
+ name = "cacache___cacache_15.0.5.tgz";
+ url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz";
+ sha1 = "69162833da29170d6732334643c60e005f5f17d0";
};
}
{
@@ -2593,6 +2633,14 @@
sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912";
};
}
+ {
+ name = "call_bind___call_bind_1.0.2.tgz";
+ path = fetchurl {
+ name = "call_bind___call_bind_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz";
+ sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c";
+ };
+ }
{
name = "call_me_maybe___call_me_maybe_1.0.1.tgz";
path = fetchurl {
@@ -2698,11 +2746,11 @@
};
}
{
- name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz";
+ name = "caniuse_lite___caniuse_lite_1.0.30001178.tgz";
path = fetchurl {
- name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz";
- url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001081.tgz";
- sha1 = "40615a3c416a047c5a4d45673e5257bf128eb3b5";
+ name = "caniuse_lite___caniuse_lite_1.0.30001178.tgz";
+ url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz";
+ sha1 = "3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc";
};
}
{
@@ -2737,14 +2785,6 @@
sha1 = "f1cec43f332e2ea5a569fd46f9f5bde4e6102aff";
};
}
- {
- name = "chalk___chalk_2.4.2.tgz";
- path = fetchurl {
- name = "chalk___chalk_2.4.2.tgz";
- url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
- sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
- };
- }
{
name = "chalk___chalk_1.1.3.tgz";
path = fetchurl {
@@ -2753,6 +2793,14 @@
sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
};
}
+ {
+ name = "chalk___chalk_2.4.2.tgz";
+ path = fetchurl {
+ name = "chalk___chalk_2.4.2.tgz";
+ url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
+ sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
+ };
+ }
{
name = "chalk___chalk_3.0.0.tgz";
path = fetchurl {
@@ -2809,14 +2857,6 @@
sha1 = "21e421ad3d84055952dab4a43a04e73cd425d3ed";
};
}
- {
- name = "chardet___chardet_0.7.0.tgz";
- path = fetchurl {
- name = "chardet___chardet_0.7.0.tgz";
- url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz";
- sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e";
- };
- }
{
name = "charenc___charenc_0.0.2.tgz";
path = fetchurl {
@@ -2849,6 +2889,14 @@
sha1 = "42d837d5239688d55f303003a508230fa6727142";
};
}
+ {
+ name = "chownr___chownr_2.0.0.tgz";
+ path = fetchurl {
+ name = "chownr___chownr_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz";
+ sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece";
+ };
+ }
{
name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz";
path = fetchurl {
@@ -2905,22 +2953,6 @@
sha1 = "538ecae8f9c6ca508e3c3c95b453fe93cb4c168d";
};
}
- {
- name = "cli_cursor___cli_cursor_3.1.0.tgz";
- path = fetchurl {
- name = "cli_cursor___cli_cursor_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz";
- sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307";
- };
- }
- {
- name = "cli_width___cli_width_2.2.0.tgz";
- path = fetchurl {
- name = "cli_width___cli_width_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz";
- sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
- };
- }
{
name = "clipboard___clipboard_1.7.1.tgz";
path = fetchurl {
@@ -2937,14 +2969,6 @@
sha1 = "52921296eec0fdf77ead1749421b21c968647376";
};
}
- {
- name = "cliui___cliui_4.1.0.tgz";
- path = fetchurl {
- name = "cliui___cliui_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz";
- sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49";
- };
- }
{
name = "cliui___cliui_5.0.0.tgz";
path = fetchurl {
@@ -3097,6 +3121,14 @@
sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2";
};
}
+ {
+ name = "colorette___colorette_1.2.1.tgz";
+ path = fetchurl {
+ name = "colorette___colorette_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz";
+ sha1 = "4d0b921325c14faf92633086a536db6e89564b1b";
+ };
+ }
{
name = "colors___colors_1.3.3.tgz";
path = fetchurl {
@@ -3178,11 +3210,11 @@
};
}
{
- name = "compression_webpack_plugin___compression_webpack_plugin_3.0.1.tgz";
+ name = "compression_webpack_plugin___compression_webpack_plugin_5.0.2.tgz";
path = fetchurl {
- name = "compression_webpack_plugin___compression_webpack_plugin_3.0.1.tgz";
- url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.1.tgz";
- sha1 = "be7a343e6dfbccbd64a77c5fbe29627d140fc321";
+ name = "compression_webpack_plugin___compression_webpack_plugin_5.0.2.tgz";
+ url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-5.0.2.tgz";
+ sha1 = "df84e682cfa1fb2a230e71cf83d50c323d5369c2";
};
}
{
@@ -3234,11 +3266,11 @@
};
}
{
- name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz";
+ name = "confusing_browser_globals___confusing_browser_globals_1.0.10.tgz";
path = fetchurl {
- name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz";
- url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz";
- sha1 = "72bc13b483c0276801681871d4898516f8f54fdd";
+ name = "confusing_browser_globals___confusing_browser_globals_1.0.10.tgz";
+ url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz";
+ sha1 = "30d1e7f3d1b882b25ec4933d1d1adac353d20a59";
};
}
{
@@ -3378,11 +3410,11 @@
};
}
{
- name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz";
+ name = "copy_webpack_plugin___copy_webpack_plugin_5.1.2.tgz";
path = fetchurl {
- name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz";
- url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz";
- sha1 = "5481a03dea1123d88a988c6ff8b78247214f0b88";
+ name = "copy_webpack_plugin___copy_webpack_plugin_5.1.2.tgz";
+ url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz";
+ sha1 = "8a889e1dcafa6c91c6cd4be1ad158f1d3823bae2";
};
}
{
@@ -3402,11 +3434,11 @@
};
}
{
- name = "core_js___core_js_3.6.4.tgz";
+ name = "core_js___core_js_3.8.3.tgz";
path = fetchurl {
- name = "core_js___core_js_3.6.4.tgz";
- url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz";
- sha1 = "440a83536b458114b9cb2ac1580ba377dc470647";
+ name = "core_js___core_js_3.8.3.tgz";
+ url = "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz";
+ sha1 = "c21906e1f14f3689f93abcc6e26883550dd92dd0";
};
}
{
@@ -3473,14 +3505,6 @@
sha1 = "607461d4e7aa7a7fe15a26834b14b7f0c2801562";
};
}
- {
- name = "cross_spawn___cross_spawn_6.0.5.tgz";
- path = fetchurl {
- name = "cross_spawn___cross_spawn_6.0.5.tgz";
- url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz";
- sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4";
- };
- }
{
name = "cross_spawn___cross_spawn_3.0.1.tgz";
path = fetchurl {
@@ -3489,6 +3513,14 @@
sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982";
};
}
+ {
+ name = "cross_spawn___cross_spawn_6.0.5.tgz";
+ path = fetchurl {
+ name = "cross_spawn___cross_spawn_6.0.5.tgz";
+ url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz";
+ sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4";
+ };
+ }
{
name = "cross_spawn___cross_spawn_7.0.3.tgz";
path = fetchurl {
@@ -3521,14 +3553,6 @@
sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5";
};
}
- {
- name = "crypto_random_string___crypto_random_string_3.0.1.tgz";
- path = fetchurl {
- name = "crypto_random_string___crypto_random_string_3.0.1.tgz";
- url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.0.1.tgz";
- sha1 = "29d7dc759d577a768afb3b7b2765dd9bd7ffe36a";
- };
- }
{
name = "css_b64_images___css_b64_images_0.2.5.tgz";
path = fetchurl {
@@ -4426,11 +4450,11 @@
};
}
{
- name = "dot_prop___dot_prop_4.2.0.tgz";
+ name = "dot_prop___dot_prop_4.2.1.tgz";
path = fetchurl {
- name = "dot_prop___dot_prop_4.2.0.tgz";
- url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz";
- sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
+ name = "dot_prop___dot_prop_4.2.1.tgz";
+ url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz";
+ sha1 = "45884194a71fc2cda71cbb4bceb3a4dd2f433ba4";
};
}
{
@@ -4482,11 +4506,11 @@
};
}
{
- name = "echarts___echarts_4.6.0.tgz";
+ name = "echarts___echarts_4.9.0.tgz";
path = fetchurl {
- name = "echarts___echarts_4.6.0.tgz";
- url = "https://registry.yarnpkg.com/echarts/-/echarts-4.6.0.tgz";
- sha1 = "b5a47a1046cec93ceeef954f9ee54751340558ec";
+ name = "echarts___echarts_4.9.0.tgz";
+ url = "https://registry.yarnpkg.com/echarts/-/echarts-4.9.0.tgz";
+ sha1 = "a9b9baa03f03a2a731e6340c55befb57a9e1347d";
};
}
{
@@ -4522,19 +4546,19 @@
};
}
{
- name = "electron_to_chromium___electron_to_chromium_1.3.466.tgz";
+ name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz";
path = fetchurl {
- name = "electron_to_chromium___electron_to_chromium_1.3.466.tgz";
- url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz";
- sha1 = "89f716db3afc4bb482ea2aaaa16c4808f89f762a";
+ name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz";
+ url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz";
+ sha1 = "8b884f50296c2ae2a9997f024d0e3e57facc2b94";
};
}
{
- name = "elliptic___elliptic_6.4.0.tgz";
+ name = "elliptic___elliptic_6.5.4.tgz";
path = fetchurl {
- name = "elliptic___elliptic_6.4.0.tgz";
- url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz";
- sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
+ name = "elliptic___elliptic_6.5.4.tgz";
+ url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz";
+ sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb";
};
}
{
@@ -4569,14 +4593,6 @@
sha1 = "0ebf3666b5414097971d34994e299fce75cdbafc";
};
}
- {
- name = "emojis_list___emojis_list_2.1.0.tgz";
- path = fetchurl {
- name = "emojis_list___emojis_list_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz";
- sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
- };
- }
{
name = "emojis_list___emojis_list_3.0.0.tgz";
path = fetchurl {
@@ -4625,14 +4641,6 @@
sha1 = "54332506f42f2edc71690d2f2a42349359f3bf7d";
};
}
- {
- name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz";
- path = fetchurl {
- name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz";
- sha1 = "41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f";
- };
- }
{
name = "enhanced_resolve___enhanced_resolve_0.9.1.tgz";
path = fetchurl {
@@ -4641,6 +4649,22 @@
sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
};
}
+ {
+ name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz";
+ path = fetchurl {
+ name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz";
+ url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz";
+ sha1 = "2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec";
+ };
+ }
+ {
+ name = "enquirer___enquirer_2.3.6.tgz";
+ path = fetchurl {
+ name = "enquirer___enquirer_2.3.6.tgz";
+ url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz";
+ sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d";
+ };
+ }
{
name = "ent___ent_2.2.0.tgz";
path = fetchurl {
@@ -4690,11 +4714,11 @@
};
}
{
- name = "es_abstract___es_abstract_1.17.4.tgz";
+ name = "es_abstract___es_abstract_1.18.0_next.2.tgz";
path = fetchurl {
- name = "es_abstract___es_abstract_1.17.4.tgz";
- url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz";
- sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184";
+ name = "es_abstract___es_abstract_1.18.0_next.2.tgz";
+ url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
+ sha1 = "088101a55f0541f595e7e057199e27ddc8f3a5c2";
};
}
{
@@ -4729,6 +4753,14 @@
sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
};
}
+ {
+ name = "escalade___escalade_3.1.1.tgz";
+ path = fetchurl {
+ name = "escalade___escalade_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz";
+ sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40";
+ };
+ }
{
name = "escape_goat___escape_goat_2.1.1.tgz";
path = fetchurl {
@@ -4761,14 +4793,6 @@
sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344";
};
}
- {
- name = "escaper___escaper_2.5.3.tgz";
- path = fetchurl {
- name = "escaper___escaper_2.5.3.tgz";
- url = "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz";
- sha1 = "8b8fe90ba364054151ab7eff18b4ce43b1e13ab5";
- };
- }
{
name = "escodegen___escodegen_1.14.3.tgz";
path = fetchurl {
@@ -4778,11 +4802,11 @@
};
}
{
- name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.0.0.tgz";
+ name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.2.1.tgz";
path = fetchurl {
- name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.0.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.0.0.tgz";
- sha1 = "8a7bcb9643d13c55df4dd7444f138bf4efa61e17";
+ name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.2.1.tgz";
+ url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz";
+ sha1 = "8a2eb38455dc5a312550193b319cdaeef042cd1e";
};
}
{
@@ -4794,35 +4818,35 @@
};
}
{
- name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.2.tgz";
+ name = "eslint_import_resolver_jest___eslint_import_resolver_jest_3.0.0.tgz";
path = fetchurl {
- name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.2.tgz";
- url = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.2.tgz";
- sha1 = "8720fbe8b8498e95cb2bc6ef52b46b713aedaa59";
+ name = "eslint_import_resolver_jest___eslint_import_resolver_jest_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-3.0.0.tgz";
+ sha1 = "fd61da30fe58f4c1074af1f069b4267c70a91fd6";
};
}
{
- name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz";
+ name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz";
path = fetchurl {
- name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz";
- url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz";
- sha1 = "58f15fb839b8d0576ca980413476aab2472db66a";
+ name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz";
+ url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz";
+ sha1 = "85ffa81942c25012d8231096ddf679c03042c717";
};
}
{
- name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.12.1.tgz";
+ name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.13.0.tgz";
path = fetchurl {
- name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.12.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.1.tgz";
- sha1 = "771ae561e887ca4e53ee87605fbb36c5e290b0f5";
+ name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.13.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.0.tgz";
+ sha1 = "5cb19cf4b6996c8a2514aeb10f909e2c70488dc3";
};
}
{
- name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
+ name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
path = fetchurl {
- name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
- url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz";
- sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708";
+ name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz";
+ sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6";
};
}
{
@@ -4842,19 +4866,19 @@
};
}
{
- name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz";
+ name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz";
path = fetchurl {
- name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz";
- sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3";
+ name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz";
+ url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz";
+ sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702";
};
}
{
- name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.0.tgz";
+ name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.2.tgz";
path = fetchurl {
- name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.1.0.tgz";
- sha1 = "4f6d41b1a8622348c97559cbcd29badffa74dbfa";
+ name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.2.tgz";
+ url = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.1.2.tgz";
+ sha1 = "50cc20d603b02b37727f8d174d4b83b9b8ef25a5";
};
}
{
@@ -4866,11 +4890,11 @@
};
}
{
- name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.1.tgz";
+ name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.5.0.tgz";
path = fetchurl {
- name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.1.tgz";
- sha1 = "1c364cb863a38cc1570c8020155b6004cca62178";
+ name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.5.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.5.0.tgz";
+ sha1 = "6c12e3aae172bfd3363b7ac8c3f3e944704867f4";
};
}
{
@@ -4882,11 +4906,11 @@
};
}
{
- name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz";
+ name = "eslint_plugin_vue___eslint_plugin_vue_7.5.0.tgz";
path = fetchurl {
- name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz";
- sha1 = "2526ef0c010c218824a89423dbe6ddbe76f04fd6";
+ name = "eslint_plugin_vue___eslint_plugin_vue_7.5.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.5.0.tgz";
+ sha1 = "cc6d983eb22781fa2440a7573cf39af439bb5725";
};
}
{
@@ -4906,19 +4930,11 @@
};
}
{
- name = "eslint_scope___eslint_scope_5.0.0.tgz";
+ name = "eslint_scope___eslint_scope_5.1.1.tgz";
path = fetchurl {
- name = "eslint_scope___eslint_scope_5.0.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz";
- sha1 = "e87c8887c73e8d1ec84f1ca591645c358bfc8fb9";
- };
- }
- {
- name = "eslint_utils___eslint_utils_1.4.3.tgz";
- path = fetchurl {
- name = "eslint_utils___eslint_utils_1.4.3.tgz";
- url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz";
- sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f";
+ name = "eslint_scope___eslint_scope_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz";
+ sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c";
};
}
{
@@ -4930,19 +4946,27 @@
};
}
{
- name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
+ name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
path = fetchurl {
- name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
- sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2";
+ name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz";
+ sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e";
};
}
{
- name = "eslint___eslint_6.8.0.tgz";
+ name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz";
path = fetchurl {
- name = "eslint___eslint_6.8.0.tgz";
- url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz";
- sha1 = "62262d6729739f9275723824302fb227c8c93ffb";
+ name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz";
+ sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8";
+ };
+ }
+ {
+ name = "eslint___eslint_7.19.0.tgz";
+ path = fetchurl {
+ name = "eslint___eslint_7.19.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz";
+ sha1 = "6719621b196b5fad72e43387981314e5d0dc3f41";
};
}
{
@@ -4953,6 +4977,14 @@
sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a";
};
}
+ {
+ name = "espree___espree_7.3.1.tgz";
+ path = fetchurl {
+ name = "espree___espree_7.3.1.tgz";
+ url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz";
+ sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6";
+ };
+ }
{
name = "esprima___esprima_4.0.1.tgz";
path = fetchurl {
@@ -4962,19 +4994,19 @@
};
}
{
- name = "esquery___esquery_1.0.1.tgz";
+ name = "esquery___esquery_1.3.1.tgz";
path = fetchurl {
- name = "esquery___esquery_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz";
- sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708";
+ name = "esquery___esquery_1.3.1.tgz";
+ url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz";
+ sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57";
};
}
{
- name = "esrecurse___esrecurse_4.2.1.tgz";
+ name = "esrecurse___esrecurse_4.3.0.tgz";
path = fetchurl {
- name = "esrecurse___esrecurse_4.2.1.tgz";
- url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz";
- sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf";
+ name = "esrecurse___esrecurse_4.3.0.tgz";
+ url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz";
+ sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921";
};
}
{
@@ -4985,6 +5017,14 @@
sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d";
};
}
+ {
+ name = "estraverse___estraverse_5.2.0.tgz";
+ path = fetchurl {
+ name = "estraverse___estraverse_5.2.0.tgz";
+ url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz";
+ sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880";
+ };
+ }
{
name = "esutils___esutils_2.0.3.tgz";
path = fetchurl {
@@ -5153,14 +5193,6 @@
sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa";
};
}
- {
- name = "external_editor___external_editor_3.1.0.tgz";
- path = fetchurl {
- name = "external_editor___external_editor_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz";
- sha1 = "cb03f740befae03ea4d283caed2741a83f335495";
- };
- }
{
name = "extglob___extglob_2.0.4.tgz";
path = fetchurl {
@@ -5250,19 +5282,11 @@
};
}
{
- name = "faye_websocket___faye_websocket_0.10.0.tgz";
+ name = "faye_websocket___faye_websocket_0.11.3.tgz";
path = fetchurl {
- name = "faye_websocket___faye_websocket_0.10.0.tgz";
- url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz";
- sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
- };
- }
- {
- name = "faye_websocket___faye_websocket_0.11.1.tgz";
- path = fetchurl {
- name = "faye_websocket___faye_websocket_0.11.1.tgz";
- url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz";
- sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38";
+ name = "faye_websocket___faye_websocket_0.11.3.tgz";
+ url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz";
+ sha1 = "5c0e9a8968e8912c286639fde977a8b209f2508e";
};
}
{
@@ -5281,14 +5305,6 @@
sha1 = "862470112901c727a0e495a80744bd5baa1d6790";
};
}
- {
- name = "figures___figures_3.2.0.tgz";
- path = fetchurl {
- name = "figures___figures_3.2.0.tgz";
- url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz";
- sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af";
- };
- }
{
name = "file_entry_cache___file_entry_cache_5.0.1.tgz";
path = fetchurl {
@@ -5297,6 +5313,14 @@
sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c";
};
}
+ {
+ name = "file_entry_cache___file_entry_cache_6.0.0.tgz";
+ path = fetchurl {
+ name = "file_entry_cache___file_entry_cache_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz";
+ sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a";
+ };
+ }
{
name = "file_loader___file_loader_5.1.0.tgz";
path = fetchurl {
@@ -5362,11 +5386,11 @@
};
}
{
- name = "find_cache_dir___find_cache_dir_3.0.0.tgz";
+ name = "find_cache_dir___find_cache_dir_3.3.1.tgz";
path = fetchurl {
- name = "find_cache_dir___find_cache_dir_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz";
- sha1 = "cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc";
+ name = "find_cache_dir___find_cache_dir_3.3.1.tgz";
+ url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz";
+ sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880";
};
}
{
@@ -5425,6 +5449,14 @@
sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0";
};
}
+ {
+ name = "flat_cache___flat_cache_3.0.4.tgz";
+ path = fetchurl {
+ name = "flat_cache___flat_cache_3.0.4.tgz";
+ url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz";
+ sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11";
+ };
+ }
{
name = "flatted___flatted_2.0.0.tgz";
path = fetchurl {
@@ -5433,6 +5465,14 @@
sha1 = "55122b6536ea496b4b44893ee2608141d10d9916";
};
}
+ {
+ name = "flatted___flatted_3.1.1.tgz";
+ path = fetchurl {
+ name = "flatted___flatted_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz";
+ sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469";
+ };
+ }
{
name = "flush_write_stream___flush_write_stream_1.1.1.tgz";
path = fetchurl {
@@ -5449,14 +5489,6 @@
sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db";
};
}
- {
- name = "font_awesome___font_awesome_4.7.0.tgz";
- path = fetchurl {
- name = "font_awesome___font_awesome_4.7.0.tgz";
- url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz";
- sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133";
- };
- }
{
name = "for_in___for_in_1.0.2.tgz";
path = fetchurl {
@@ -5617,14 +5649,6 @@
sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269";
};
}
- {
- name = "get_caller_file___get_caller_file_1.0.3.tgz";
- path = fetchurl {
- name = "get_caller_file___get_caller_file_1.0.3.tgz";
- url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz";
- sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a";
- };
- }
{
name = "get_caller_file___get_caller_file_2.0.5.tgz";
path = fetchurl {
@@ -5633,6 +5657,14 @@
sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e";
};
}
+ {
+ name = "get_intrinsic___get_intrinsic_1.1.1.tgz";
+ path = fetchurl {
+ name = "get_intrinsic___get_intrinsic_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz";
+ sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6";
+ };
+ }
{
name = "get_package_type___get_package_type_0.1.0.tgz";
path = fetchurl {
@@ -5706,19 +5738,19 @@
};
}
{
- name = "gettext_extractor_vue___gettext_extractor_vue_4.0.2.tgz";
+ name = "gettext_extractor_vue___gettext_extractor_vue_5.0.0.tgz";
path = fetchurl {
- name = "gettext_extractor_vue___gettext_extractor_vue_4.0.2.tgz";
- url = "https://registry.yarnpkg.com/gettext-extractor-vue/-/gettext-extractor-vue-4.0.2.tgz";
- sha1 = "16e1cdbdaf37e5bdf3cb0aff63685bdc5e74e906";
+ name = "gettext_extractor_vue___gettext_extractor_vue_5.0.0.tgz";
+ url = "https://registry.yarnpkg.com/gettext-extractor-vue/-/gettext-extractor-vue-5.0.0.tgz";
+ sha1 = "dc463868d49e14097c4545c8ed4851d8d3edd6dd";
};
}
{
- name = "gettext_extractor___gettext_extractor_3.4.3.tgz";
+ name = "gettext_extractor___gettext_extractor_3.5.3.tgz";
path = fetchurl {
- name = "gettext_extractor___gettext_extractor_3.4.3.tgz";
- url = "https://registry.yarnpkg.com/gettext-extractor/-/gettext-extractor-3.4.3.tgz";
- sha1 = "882679cefc71888eb6e69297e6b2dc14c0384fef";
+ name = "gettext_extractor___gettext_extractor_3.5.3.tgz";
+ url = "https://registry.yarnpkg.com/gettext-extractor/-/gettext-extractor-3.5.3.tgz";
+ sha1 = "6ed46931c154a7485a80fa8b91b835ff7b8d0411";
};
}
{
@@ -5769,14 +5801,6 @@
sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201";
};
}
- {
- name = "global_modules___global_modules_2.0.0.tgz";
- path = fetchurl {
- name = "global_modules___global_modules_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz";
- sha1 = "997605ad2345f27f51539bea26574421215c7780";
- };
- }
{
name = "global_modules___global_modules_1.0.0.tgz";
path = fetchurl {
@@ -5785,6 +5809,14 @@
sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea";
};
}
+ {
+ name = "global_modules___global_modules_2.0.0.tgz";
+ path = fetchurl {
+ name = "global_modules___global_modules_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz";
+ sha1 = "997605ad2345f27f51539bea26574421215c7780";
+ };
+ }
{
name = "global_prefix___global_prefix_1.0.2.tgz";
path = fetchurl {
@@ -6178,11 +6210,11 @@
};
}
{
- name = "html_entities___html_entities_1.2.1.tgz";
+ name = "html_entities___html_entities_1.4.0.tgz";
path = fetchurl {
- name = "html_entities___html_entities_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz";
- sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
+ name = "html_entities___html_entities_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz";
+ sha1 = "cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc";
};
}
{
@@ -6249,6 +6281,14 @@
sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
};
}
+ {
+ name = "http_parser_js___http_parser_js_0.5.3.tgz";
+ path = fetchurl {
+ name = "http_parser_js___http_parser_js_0.5.3.tgz";
+ url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz";
+ sha1 = "01d2709c79d41698bb01d4decc5e9da4e4a033d9";
+ };
+ }
{
name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz";
path = fetchurl {
@@ -6266,11 +6306,11 @@
};
}
{
- name = "http_proxy___http_proxy_1.18.0.tgz";
+ name = "http_proxy___http_proxy_1.18.1.tgz";
path = fetchurl {
- name = "http_proxy___http_proxy_1.18.0.tgz";
- url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz";
- sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a";
+ name = "http_proxy___http_proxy_1.18.1.tgz";
+ url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz";
+ sha1 = "401541f0534884bbf95260334e72f88ee3976549";
};
}
{
@@ -6402,11 +6442,11 @@
};
}
{
- name = "import_fresh___import_fresh_3.2.1.tgz";
+ name = "import_fresh___import_fresh_3.3.0.tgz";
path = fetchurl {
- name = "import_fresh___import_fresh_3.2.1.tgz";
- url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz";
- sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66";
+ name = "import_fresh___import_fresh_3.3.0.tgz";
+ url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz";
+ sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b";
};
}
{
@@ -6441,14 +6481,6 @@
sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6";
};
}
- {
- name = "imports_loader___imports_loader_0.8.0.tgz";
- path = fetchurl {
- name = "imports_loader___imports_loader_0.8.0.tgz";
- url = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz";
- sha1 = "030ea51b8ca05977c40a3abfd9b4088fe0be9a69";
- };
- }
{
name = "imurmurhash___imurmurhash_0.1.4.tgz";
path = fetchurl {
@@ -6530,11 +6562,11 @@
};
}
{
- name = "inherits___inherits_2.0.3.tgz";
+ name = "inherits___inherits_2.0.4.tgz";
path = fetchurl {
- name = "inherits___inherits_2.0.3.tgz";
- url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz";
- sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+ name = "inherits___inherits_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
+ sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
};
}
{
@@ -6546,19 +6578,19 @@
};
}
{
- name = "ini___ini_1.3.5.tgz";
+ name = "inherits___inherits_2.0.3.tgz";
path = fetchurl {
- name = "ini___ini_1.3.5.tgz";
- url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz";
- sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927";
+ name = "inherits___inherits_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz";
+ sha1 = "633c2c83e3da42a502f52466022480f4208261de";
};
}
{
- name = "inquirer___inquirer_7.0.4.tgz";
+ name = "ini___ini_1.3.8.tgz";
path = fetchurl {
- name = "inquirer___inquirer_7.0.4.tgz";
- url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz";
- sha1 = "99af5bde47153abca23f5c7fc30db247f39da703";
+ name = "ini___ini_1.3.8.tgz";
+ url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz";
+ sha1 = "a29da425b48806f34767a4efce397269af28432c";
};
}
{
@@ -6570,11 +6602,11 @@
};
}
{
- name = "interpret___interpret_1.2.0.tgz";
+ name = "interpret___interpret_1.4.0.tgz";
path = fetchurl {
- name = "interpret___interpret_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz";
- sha1 = "d5061a6224be58e8083985f5014d844359576296";
+ name = "interpret___interpret_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz";
+ sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e";
};
}
{
@@ -6585,14 +6617,6 @@
sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6";
};
}
- {
- name = "invert_kv___invert_kv_2.0.0.tgz";
- path = fetchurl {
- name = "invert_kv___invert_kv_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz";
- sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02";
- };
- }
{
name = "ip_regex___ip_regex_2.1.0.tgz";
path = fetchurl {
@@ -6706,11 +6730,11 @@
};
}
{
- name = "is_callable___is_callable_1.1.5.tgz";
+ name = "is_callable___is_callable_1.2.3.tgz";
path = fetchurl {
- name = "is_callable___is_callable_1.1.5.tgz";
- url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz";
- sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab";
+ name = "is_callable___is_callable_1.2.3.tgz";
+ url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz";
+ sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e";
};
}
{
@@ -6881,6 +6905,14 @@
sha1 = "fd3efa79ee670d1187233182d5b0a1dd00313141";
};
}
+ {
+ name = "is_negative_zero___is_negative_zero_2.0.1.tgz";
+ path = fetchurl {
+ name = "is_negative_zero___is_negative_zero_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
+ sha1 = "3de746c18dda2319241a53675908d8f766f11c24";
+ };
+ }
{
name = "is_npm___is_npm_4.0.0.tgz";
path = fetchurl {
@@ -6978,27 +7010,11 @@
};
}
{
- name = "is_promise___is_promise_2.1.0.tgz";
+ name = "is_regex___is_regex_1.1.2.tgz";
path = fetchurl {
- name = "is_promise___is_promise_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz";
- sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
- };
- }
- {
- name = "is_regex___is_regex_1.0.5.tgz";
- path = fetchurl {
- name = "is_regex___is_regex_1.0.5.tgz";
- url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz";
- sha1 = "39d589a358bf18967f726967120b8fc1aed74eae";
- };
- }
- {
- name = "is_regexp___is_regexp_1.0.0.tgz";
- path = fetchurl {
- name = "is_regexp___is_regexp_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz";
- sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069";
+ name = "is_regex___is_regex_1.1.2.tgz";
+ url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz";
+ sha1 = "81c8ebde4db142f2cf1c53fc86d6a45788266251";
};
}
{
@@ -7025,6 +7041,14 @@
sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3";
};
}
+ {
+ name = "is_string___is_string_1.0.5.tgz";
+ path = fetchurl {
+ name = "is_string___is_string_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz";
+ sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6";
+ };
+ }
{
name = "is_symbol___is_symbol_1.0.2.tgz";
path = fetchurl {
@@ -7729,6 +7753,14 @@
sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660";
};
}
+ {
+ name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz";
+ path = fetchurl {
+ name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz";
+ sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2";
+ };
+ }
{
name = "json_schema___json_schema_0.2.3.tgz";
path = fetchurl {
@@ -7754,11 +7786,11 @@
};
}
{
- name = "json3___json3_3.3.2.tgz";
+ name = "json3___json3_3.3.3.tgz";
path = fetchurl {
- name = "json3___json3_3.3.2.tgz";
- url = "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz";
- sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
+ name = "json3___json3_3.3.3.tgz";
+ url = "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz";
+ sha1 = "7fc10e375fc5ae42c4705a5cc0aa6f62be305b81";
};
}
{
@@ -7905,6 +7937,14 @@
sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9";
};
}
+ {
+ name = "khroma___khroma_1.2.0.tgz";
+ path = fetchurl {
+ name = "khroma___khroma_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/khroma/-/khroma-1.2.0.tgz";
+ sha1 = "46dcc9d7533923c228b51724db108f11fec108d8";
+ };
+ }
{
name = "killable___killable_1.0.1.tgz";
path = fetchurl {
@@ -7938,11 +7978,11 @@
};
}
{
- name = "kind_of___kind_of_6.0.2.tgz";
+ name = "kind_of___kind_of_6.0.3.tgz";
path = fetchurl {
- name = "kind_of___kind_of_6.0.2.tgz";
- url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz";
- sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051";
+ name = "kind_of___kind_of_6.0.3.tgz";
+ url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz";
+ sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd";
};
}
{
@@ -7977,14 +8017,6 @@
sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face";
};
}
- {
- name = "lcid___lcid_2.0.0.tgz";
- path = fetchurl {
- name = "lcid___lcid_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz";
- sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf";
- };
- }
{
name = "leven___leven_3.1.0.tgz";
path = fetchurl {
@@ -8001,6 +8033,14 @@
sha1 = "842a9ee98d2075aa7faeedbe32679e9205f46f77";
};
}
+ {
+ name = "levn___levn_0.4.1.tgz";
+ path = fetchurl {
+ name = "levn___levn_0.4.1.tgz";
+ url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz";
+ sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade";
+ };
+ }
{
name = "levn___levn_0.3.0.tgz";
path = fetchurl {
@@ -8081,14 +8121,6 @@
sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357";
};
}
- {
- name = "loader_utils___loader_utils_1.2.3.tgz";
- path = fetchurl {
- name = "loader_utils___loader_utils_1.2.3.tgz";
- url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz";
- sha1 = "1ff5dc6911c9f0a062531a4c04b609406108c2c7";
- };
- }
{
name = "loader_utils___loader_utils_1.4.0.tgz";
path = fetchurl {
@@ -8386,11 +8418,11 @@
};
}
{
- name = "loglevel___loglevel_1.6.7.tgz";
+ name = "loglevel___loglevel_1.7.1.tgz";
path = fetchurl {
- name = "loglevel___loglevel_1.6.7.tgz";
- url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz";
- sha1 = "b3e034233188c68b889f5b862415306f565e2c56";
+ name = "loglevel___loglevel_1.7.1.tgz";
+ url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz";
+ sha1 = "005fde2f5e6e47068f935ff28573e125ef72f197";
};
}
{
@@ -8465,6 +8497,14 @@
sha1 = "1da27e6710271947695daf6848e847f01d84b920";
};
}
+ {
+ name = "lru_cache___lru_cache_6.0.0.tgz";
+ path = fetchurl {
+ name = "lru_cache___lru_cache_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz";
+ sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94";
+ };
+ }
{
name = "lz_string___lz_string_1.4.4.tgz";
path = fetchurl {
@@ -8482,11 +8522,11 @@
};
}
{
- name = "make_dir___make_dir_3.0.0.tgz";
+ name = "make_dir___make_dir_3.1.0.tgz";
path = fetchurl {
- name = "make_dir___make_dir_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz";
- sha1 = "1b5f39f6b9270ed33f9f054c5c0f84304989f801";
+ name = "make_dir___make_dir_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz";
+ sha1 = "415e967046b3a7f1d185277d84aa58203726a13f";
};
}
{
@@ -8505,22 +8545,6 @@
sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
};
}
- {
- name = "mamacro___mamacro_0.0.3.tgz";
- path = fetchurl {
- name = "mamacro___mamacro_0.0.3.tgz";
- url = "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz";
- sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4";
- };
- }
- {
- name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz";
- path = fetchurl {
- name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz";
- url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
- sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a";
- };
- }
{
name = "map_cache___map_cache_0.2.2.tgz";
path = fetchurl {
@@ -8673,14 +8697,6 @@
sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
};
}
- {
- name = "mem___mem_4.3.0.tgz";
- path = fetchurl {
- name = "mem___mem_4.3.0.tgz";
- url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz";
- sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178";
- };
- }
{
name = "memory_fs___memory_fs_0.2.0.tgz";
path = fetchurl {
@@ -8697,6 +8713,14 @@
sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
};
}
+ {
+ name = "memory_fs___memory_fs_0.5.0.tgz";
+ path = fetchurl {
+ name = "memory_fs___memory_fs_0.5.0.tgz";
+ url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz";
+ sha1 = "324c01288b88652966d161db77838720845a8e3c";
+ };
+ }
{
name = "meow___meow_3.7.0.tgz";
path = fetchurl {
@@ -8746,11 +8770,11 @@
};
}
{
- name = "mermaid___mermaid_8.5.2.tgz";
+ name = "mermaid___mermaid_8.9.0.tgz";
path = fetchurl {
- name = "mermaid___mermaid_8.5.2.tgz";
- url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.5.2.tgz";
- sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8";
+ name = "mermaid___mermaid_8.9.0.tgz";
+ url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.0.tgz";
+ sha1 = "e569517863ab903aa5389cd746b68ca958a8ca7c";
};
}
{
@@ -8850,11 +8874,11 @@
};
}
{
- name = "minimalistic_assert___minimalistic_assert_1.0.0.tgz";
+ name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz";
path = fetchurl {
- name = "minimalistic_assert___minimalistic_assert_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
- sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
+ name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
+ sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7";
};
}
{
@@ -8881,14 +8905,6 @@
sha1 = "fba4c8191339e13ecf4d61beb03f070103f3d954";
};
}
- {
- name = "minimist___minimist_0.0.8.tgz";
- path = fetchurl {
- name = "minimist___minimist_0.0.8.tgz";
- url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz";
- sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
- };
- }
{
name = "minimist___minimist_1.1.3.tgz";
path = fetchurl {
@@ -8905,6 +8921,14 @@
sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
};
}
+ {
+ name = "minimist___minimist_0.0.8.tgz";
+ path = fetchurl {
+ name = "minimist___minimist_0.0.8.tgz";
+ url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz";
+ sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+ };
+ }
{
name = "minipass_collect___minipass_collect_1.0.2.tgz";
path = fetchurl {
@@ -8937,6 +8961,14 @@
sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5";
};
}
+ {
+ name = "minizlib___minizlib_2.1.2.tgz";
+ path = fetchurl {
+ name = "minizlib___minizlib_2.1.2.tgz";
+ url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz";
+ sha1 = "e90d3466ba209b932451508a11ce3d3632145931";
+ };
+ }
{
name = "miragejs___miragejs_0.1.40.tgz";
path = fetchurl {
@@ -8970,11 +9002,11 @@
};
}
{
- name = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz";
+ name = "mkdirp___mkdirp_0.5.5.tgz";
path = fetchurl {
- name = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz";
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
- sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+ name = "mkdirp___mkdirp_0.5.5.tgz";
+ url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz";
+ sha1 = "d91cefd62d1436ca0f41620e251288d420099def";
};
}
{
@@ -9065,14 +9097,6 @@
sha1 = "6e7de86a570872ab17058adea7160bbeca814dde";
};
}
- {
- name = "mute_stream___mute_stream_0.0.8.tgz";
- path = fetchurl {
- name = "mute_stream___mute_stream_0.0.8.tgz";
- url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz";
- sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d";
- };
- }
{
name = "nan___nan_2.14.1.tgz";
path = fetchurl {
@@ -9138,19 +9162,19 @@
};
}
{
- name = "node_fetch___node_fetch_2.6.0.tgz";
+ name = "node_fetch___node_fetch_2.6.1.tgz";
path = fetchurl {
- name = "node_fetch___node_fetch_2.6.0.tgz";
- url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz";
- sha1 = "e633456386d4aa55863f676a7ab0daa8fdecb0fd";
+ name = "node_fetch___node_fetch_2.6.1.tgz";
+ url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz";
+ sha1 = "045bd323631f76ed2e2b55573394416b639a0052";
};
}
{
- name = "node_forge___node_forge_0.9.0.tgz";
+ name = "node_forge___node_forge_0.10.0.tgz";
path = fetchurl {
- name = "node_forge___node_forge_0.9.0.tgz";
- url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz";
- sha1 = "d624050edbb44874adca12bb9a52ec63cb782579";
+ name = "node_forge___node_forge_0.10.0.tgz";
+ url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz";
+ sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3";
};
}
{
@@ -9194,11 +9218,11 @@
};
}
{
- name = "node_releases___node_releases_1.1.58.tgz";
+ name = "node_releases___node_releases_1.1.70.tgz";
path = fetchurl {
- name = "node_releases___node_releases_1.1.58.tgz";
- url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz";
- sha1 = "8ee20eef30fa60e52755fcc0942def5a734fe935";
+ name = "node_releases___node_releases_1.1.70.tgz";
+ url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz";
+ sha1 = "66e0ed0273aa65666d7fe78febe7634875426a08";
};
}
{
@@ -9370,11 +9394,11 @@
};
}
{
- name = "object_inspect___object_inspect_1.7.0.tgz";
+ name = "object_inspect___object_inspect_1.9.0.tgz";
path = fetchurl {
- name = "object_inspect___object_inspect_1.7.0.tgz";
- url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz";
- sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67";
+ name = "object_inspect___object_inspect_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz";
+ sha1 = "c90521d74e1127b67266ded3394ad6116986533a";
};
}
{
@@ -9394,19 +9418,19 @@
};
}
{
- name = "object.assign___object.assign_4.1.0.tgz";
+ name = "object.assign___object.assign_4.1.2.tgz";
path = fetchurl {
- name = "object.assign___object.assign_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz";
- sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da";
+ name = "object.assign___object.assign_4.1.2.tgz";
+ url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz";
+ sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940";
};
}
{
- name = "object.entries___object.entries_1.1.1.tgz";
+ name = "object.entries___object.entries_1.1.3.tgz";
path = fetchurl {
- name = "object.entries___object.entries_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz";
- sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b";
+ name = "object.entries___object.entries_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz";
+ sha1 = "c601c7f168b62374541a07ddbd3e2d5e4f7711a6";
};
}
{
@@ -9418,11 +9442,11 @@
};
}
{
- name = "object.values___object.values_1.1.0.tgz";
+ name = "object.values___object.values_1.1.2.tgz";
path = fetchurl {
- name = "object.values___object.values_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz";
- sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9";
+ name = "object.values___object.values_1.1.2.tgz";
+ url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz";
+ sha1 = "7a2015e06fcb0f546bd652486ce8583a4731c731";
};
}
{
@@ -9505,6 +9529,14 @@
sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495";
};
}
+ {
+ name = "optionator___optionator_0.9.1.tgz";
+ path = fetchurl {
+ name = "optionator___optionator_0.9.1.tgz";
+ url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz";
+ sha1 = "4f236a6373dae0566a6d43e1326674f50c291499";
+ };
+ }
{
name = "orderedmap___orderedmap_1.0.0.tgz";
path = fetchurl {
@@ -9537,14 +9569,6 @@
sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
};
}
- {
- name = "os_locale___os_locale_3.1.0.tgz";
- path = fetchurl {
- name = "os_locale___os_locale_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz";
- sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a";
- };
- }
{
name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
path = fetchurl {
@@ -9569,14 +9593,6 @@
sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc";
};
}
- {
- name = "p_defer___p_defer_1.0.0.tgz";
- path = fetchurl {
- name = "p_defer___p_defer_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz";
- sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
- };
- }
{
name = "p_each_series___p_each_series_2.1.0.tgz";
path = fetchurl {
@@ -9593,14 +9609,6 @@
sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
};
}
- {
- name = "p_is_promise___p_is_promise_2.1.0.tgz";
- path = fetchurl {
- name = "p_is_promise___p_is_promise_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz";
- sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e";
- };
- }
{
name = "p_limit___p_limit_1.2.0.tgz";
path = fetchurl {
@@ -9650,11 +9658,11 @@
};
}
{
- name = "p_map___p_map_3.0.0.tgz";
+ name = "p_map___p_map_4.0.0.tgz";
path = fetchurl {
- name = "p_map___p_map_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz";
- sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d";
+ name = "p_map___p_map_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz";
+ sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b";
};
}
{
@@ -10017,14 +10025,6 @@
sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87";
};
}
- {
- name = "pixelmatch___pixelmatch_4.0.2.tgz";
- path = fetchurl {
- name = "pixelmatch___pixelmatch_4.0.2.tgz";
- url = "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz";
- sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854";
- };
- }
{
name = "pkg_dir___pkg_dir_2.0.0.tgz";
path = fetchurl {
@@ -10049,22 +10049,6 @@
sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3";
};
}
- {
- name = "pkg_up___pkg_up_2.0.0.tgz";
- path = fetchurl {
- name = "pkg_up___pkg_up_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz";
- sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f";
- };
- }
- {
- name = "pngjs___pngjs_3.3.3.tgz";
- path = fetchurl {
- name = "pngjs___pngjs_3.3.3.tgz";
- url = "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz";
- sha1 = "85173703bde3edac8998757b96e5821d0966a21b";
- };
- }
{
name = "pofile___pofile_1.0.11.tgz";
path = fetchurl {
@@ -10090,11 +10074,11 @@
};
}
{
- name = "portfinder___portfinder_1.0.25.tgz";
+ name = "portfinder___portfinder_1.0.28.tgz";
path = fetchurl {
- name = "portfinder___portfinder_1.0.25.tgz";
- url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz";
- sha1 = "254fd337ffba869f4b9d37edc298059cb4d35eca";
+ name = "portfinder___portfinder_1.0.28.tgz";
+ url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz";
+ sha1 = "67c4622852bd5374dd1dd900f779f53462fac778";
};
}
{
@@ -10265,6 +10249,14 @@
sha1 = "cc9378beffe46a02cbc4506a0477d05fcea9a8e2";
};
}
+ {
+ name = "prelude_ls___prelude_ls_1.2.1.tgz";
+ path = fetchurl {
+ name = "prelude_ls___prelude_ls_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz";
+ sha1 = "debc6489d7a6e6b0e7611888cec880337d316396";
+ };
+ }
{
name = "prelude_ls___prelude_ls_1.1.2.tgz";
path = fetchurl {
@@ -10658,11 +10650,11 @@
};
}
{
- name = "querystringify___querystringify_2.1.0.tgz";
+ name = "querystringify___querystringify_2.2.0.tgz";
path = fetchurl {
- name = "querystringify___querystringify_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz";
- sha1 = "7ded8dfbf7879dcc60d0a644ac6754b283ad17ef";
+ name = "querystringify___querystringify_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz";
+ sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6";
};
}
{
@@ -10674,11 +10666,11 @@
};
}
{
- name = "randombytes___randombytes_2.0.6.tgz";
+ name = "randombytes___randombytes_2.1.0.tgz";
path = fetchurl {
- name = "randombytes___randombytes_2.0.6.tgz";
- url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz";
- sha1 = "d302c522948588848a8d300c932b44c24231da80";
+ name = "randombytes___randombytes_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz";
+ sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a";
};
}
{
@@ -10714,11 +10706,11 @@
};
}
{
- name = "raw_loader___raw_loader_4.0.0.tgz";
+ name = "raw_loader___raw_loader_4.0.2.tgz";
path = fetchurl {
- name = "raw_loader___raw_loader_4.0.0.tgz";
- url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.0.tgz";
- sha1 = "d639c40fb9d72b5c7f8abc1fb2ddb25b29d3d540";
+ name = "raw_loader___raw_loader_4.0.2.tgz";
+ url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz";
+ sha1 = "1aac6b7d1ad1501e66efdac1522c73e59a584eb6";
};
}
{
@@ -10898,11 +10890,11 @@
};
}
{
- name = "regexpp___regexpp_2.0.1.tgz";
+ name = "regexpp___regexpp_3.1.0.tgz";
path = fetchurl {
- name = "regexpp___regexpp_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz";
- sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f";
+ name = "regexpp___regexpp_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz";
+ sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2";
};
}
{
@@ -11058,11 +11050,11 @@
};
}
{
- name = "require_main_filename___require_main_filename_1.0.1.tgz";
+ name = "require_from_string___require_from_string_2.0.2.tgz";
path = fetchurl {
- name = "require_main_filename___require_main_filename_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz";
- sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+ name = "require_from_string___require_from_string_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz";
+ sha1 = "89a7fdd938261267318eafe14f9c32e598c36909";
};
}
{
@@ -11177,14 +11169,6 @@
sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
};
}
- {
- name = "restore_cursor___restore_cursor_3.1.0.tgz";
- path = fetchurl {
- name = "restore_cursor___restore_cursor_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz";
- sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e";
- };
- }
{
name = "ret___ret_0.1.15.tgz";
path = fetchurl {
@@ -11209,14 +11193,6 @@
sha1 = "ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2";
};
}
- {
- name = "rimraf___rimraf_2.7.1.tgz";
- path = fetchurl {
- name = "rimraf___rimraf_2.7.1.tgz";
- url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz";
- sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec";
- };
- }
{
name = "rimraf___rimraf_2.6.3.tgz";
path = fetchurl {
@@ -11265,14 +11241,6 @@
sha1 = "b50e6b34583f3dd89329a2f23a8a2be072845911";
};
}
- {
- name = "run_async___run_async_2.3.0.tgz";
- path = fetchurl {
- name = "run_async___run_async_2.3.0.tgz";
- url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz";
- sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
- };
- }
{
name = "run_queue___run_queue_1.0.3.tgz";
path = fetchurl {
@@ -11289,14 +11257,6 @@
sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4";
};
}
- {
- name = "rxjs___rxjs_6.5.4.tgz";
- path = fetchurl {
- name = "rxjs___rxjs_6.5.4.tgz";
- url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz";
- sha1 = "e0777fe0d184cec7872df147f303572d414e211c";
- };
- }
{
name = "safe_buffer___safe_buffer_5.1.2.tgz";
path = fetchurl {
@@ -11378,11 +11338,11 @@
};
}
{
- name = "scope_css___scope_css_1.2.1.tgz";
+ name = "schema_utils___schema_utils_3.0.0.tgz";
path = fetchurl {
- name = "scope_css___scope_css_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz";
- sha1 = "c35768bc900cad030a3e0d663a818c0f6a57f40e";
+ name = "schema_utils___schema_utils_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz";
+ sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef";
};
}
{
@@ -11418,11 +11378,11 @@
};
}
{
- name = "selfsigned___selfsigned_1.10.7.tgz";
+ name = "selfsigned___selfsigned_1.10.8.tgz";
path = fetchurl {
- name = "selfsigned___selfsigned_1.10.7.tgz";
- url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz";
- sha1 = "da5819fd049d5574f28e88a9bcc6dbc6e6f3906b";
+ name = "selfsigned___selfsigned_1.10.8.tgz";
+ url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz";
+ sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30";
};
}
{
@@ -11450,11 +11410,11 @@
};
}
{
- name = "semver___semver_7.3.2.tgz";
+ name = "semver___semver_7.3.4.tgz";
path = fetchurl {
- name = "semver___semver_7.3.2.tgz";
- url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz";
- sha1 = "604962b052b81ed0786aae84389ffba70ffd3938";
+ name = "semver___semver_7.3.4.tgz";
+ url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz";
+ sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97";
};
}
{
@@ -11489,6 +11449,14 @@
sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61";
};
}
+ {
+ name = "serialize_javascript___serialize_javascript_4.0.0.tgz";
+ path = fetchurl {
+ name = "serialize_javascript___serialize_javascript_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz";
+ sha1 = "b525e1238489a5ecfc42afacc3fe99e666f4b1aa";
+ };
+ }
{
name = "serve_index___serve_index_1.9.1.tgz";
path = fetchurl {
@@ -11658,11 +11626,11 @@
};
}
{
- name = "slugify___slugify_1.3.1.tgz";
+ name = "slice_ansi___slice_ansi_4.0.0.tgz";
path = fetchurl {
- name = "slugify___slugify_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/slugify/-/slugify-1.3.1.tgz";
- sha1 = "f572127e8535329fbc6c1edb74ab856b61ad7de2";
+ name = "slice_ansi___slice_ansi_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz";
+ sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b";
};
}
{
@@ -11730,19 +11698,19 @@
};
}
{
- name = "sockjs_client___sockjs_client_1.4.0.tgz";
+ name = "sockjs_client___sockjs_client_1.5.0.tgz";
path = fetchurl {
- name = "sockjs_client___sockjs_client_1.4.0.tgz";
- url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz";
- sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5";
+ name = "sockjs_client___sockjs_client_1.5.0.tgz";
+ url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz";
+ sha1 = "2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add";
};
}
{
- name = "sockjs___sockjs_0.3.19.tgz";
+ name = "sockjs___sockjs_0.3.21.tgz";
path = fetchurl {
- name = "sockjs___sockjs_0.3.19.tgz";
- url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz";
- sha1 = "d976bbe800af7bd20ae08598d582393508993c0d";
+ name = "sockjs___sockjs_0.3.21.tgz";
+ url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz";
+ sha1 = "b34ffb98e796930b60a0cfa11904d6a339a7d417";
};
}
{
@@ -11866,11 +11834,11 @@
};
}
{
- name = "spdy___spdy_4.0.1.tgz";
+ name = "spdy___spdy_4.0.2.tgz";
path = fetchurl {
- name = "spdy___spdy_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz";
- sha1 = "6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2";
+ name = "spdy___spdy_4.0.2.tgz";
+ url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz";
+ sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b";
};
}
{
@@ -11922,11 +11890,11 @@
};
}
{
- name = "ssri___ssri_7.1.0.tgz";
+ name = "ssri___ssri_8.0.0.tgz";
path = fetchurl {
- name = "ssri___ssri_7.1.0.tgz";
- url = "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz";
- sha1 = "92c241bf6de82365b5c7fb4bd76e975522e1294d";
+ name = "ssri___ssri_8.0.0.tgz";
+ url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz";
+ sha1 = "79ca74e21f8ceaeddfcb4b90143c458b8d988808";
};
}
{
@@ -11985,14 +11953,6 @@
sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b";
};
}
- {
- name = "stickyfilljs___stickyfilljs_2.1.0.tgz";
- path = fetchurl {
- name = "stickyfilljs___stickyfilljs_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/stickyfilljs/-/stickyfilljs-2.1.0.tgz";
- sha1 = "46dabb599d8275d185bdb97db597f86a2e3afa7b";
- };
- }
{
name = "stream_browserify___stream_browserify_2.0.1.tgz";
path = fetchurl {
@@ -12057,14 +12017,6 @@
sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
};
}
- {
- name = "string_width___string_width_2.1.1.tgz";
- path = fetchurl {
- name = "string_width___string_width_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz";
- sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
- };
- }
{
name = "string_width___string_width_3.1.0.tgz";
path = fetchurl {
@@ -12082,19 +12034,19 @@
};
}
{
- name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
+ name = "string.prototype.trimend___string.prototype.trimend_1.0.3.tgz";
path = fetchurl {
- name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
- sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74";
+ name = "string.prototype.trimend___string.prototype.trimend_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
+ sha1 = "a22bd53cca5c7cf44d7c9d5c732118873d6cd18b";
};
}
{
- name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
+ name = "string.prototype.trimstart___string.prototype.trimstart_1.0.3.tgz";
path = fetchurl {
- name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
- sha1 = "440314b15996c866ce8a0341894d45186200c5d9";
+ name = "string.prototype.trimstart___string.prototype.trimstart_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
+ sha1 = "9b4cb590e123bb36564401d59824298de50fd5aa";
};
}
{
@@ -12177,14 +12129,6 @@
sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878";
};
}
- {
- name = "strip_css_comments___strip_css_comments_3.0.0.tgz";
- path = fetchurl {
- name = "strip_css_comments___strip_css_comments_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz";
- sha1 = "7a5625eff8a2b226cf8947a11254da96e13dae89";
- };
- }
{
name = "strip_eof___strip_eof_1.0.0.tgz";
path = fetchurl {
@@ -12218,11 +12162,11 @@
};
}
{
- name = "strip_json_comments___strip_json_comments_3.0.1.tgz";
+ name = "strip_json_comments___strip_json_comments_3.1.1.tgz";
path = fetchurl {
- name = "strip_json_comments___strip_json_comments_3.0.1.tgz";
- url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz";
- sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7";
+ name = "strip_json_comments___strip_json_comments_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz";
+ sha1 = "31f1281b3832630434831c310c01cccda8cbe006";
};
}
{
@@ -12273,6 +12217,14 @@
sha1 = "1bc4c4ce878107e7c396b19226d91ba28268911a";
};
}
+ {
+ name = "stylis___stylis_3.5.4.tgz";
+ path = fetchurl {
+ name = "stylis___stylis_3.5.4.tgz";
+ url = "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz";
+ sha1 = "f665f25f5e299cf3d64654ab949a57c768b73fbe";
+ };
+ }
{
name = "sugarss___sugarss_2.0.0.tgz";
path = fetchurl {
@@ -12281,14 +12233,6 @@
sha1 = "ddd76e0124b297d40bf3cca31c8b22ecb43bc61d";
};
}
- {
- name = "supports_color___supports_color_6.1.0.tgz";
- path = fetchurl {
- name = "supports_color___supports_color_6.1.0.tgz";
- url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz";
- sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3";
- };
- }
{
name = "supports_color___supports_color_2.0.0.tgz";
path = fetchurl {
@@ -12305,6 +12249,14 @@
sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f";
};
}
+ {
+ name = "supports_color___supports_color_6.1.0.tgz";
+ path = fetchurl {
+ name = "supports_color___supports_color_6.1.0.tgz";
+ url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz";
+ sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3";
+ };
+ }
{
name = "supports_color___supports_color_7.2.0.tgz";
path = fetchurl {
@@ -12361,6 +12313,14 @@
sha1 = "6e0f88fdae3692793d1077fd172a4667afe986a6";
};
}
+ {
+ name = "table___table_6.0.7.tgz";
+ path = fetchurl {
+ name = "table___table_6.0.7.tgz";
+ url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz";
+ sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34";
+ };
+ }
{
name = "taffydb___taffydb_2.6.2.tgz";
path = fetchurl {
@@ -12393,6 +12353,14 @@
sha1 = "0ca8848562c7299b8b446ff6a4d60cdbb23edc40";
};
}
+ {
+ name = "tar___tar_6.0.5.tgz";
+ path = fetchurl {
+ name = "tar___tar_6.0.5.tgz";
+ url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz";
+ sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f";
+ };
+ }
{
name = "term_size___term_size_2.2.0.tgz";
path = fetchurl {
@@ -12497,14 +12465,6 @@
sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd";
};
}
- {
- name = "through___through_2.3.8.tgz";
- path = fetchurl {
- name = "through___through_2.3.8.tgz";
- url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz";
- sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
- };
- }
{
name = "thunky___thunky_0.1.0.tgz";
path = fetchurl {
@@ -12793,6 +12753,14 @@
sha1 = "08ec0d3fc2c3a39e4a46eae5610b69fafa6babd0";
};
}
+ {
+ name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz";
+ path = fetchurl {
+ name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz";
+ url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz";
+ sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b";
+ };
+ }
{
name = "tslib___tslib_1.13.0.tgz";
path = fetchurl {
@@ -12833,6 +12801,14 @@
sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
};
}
+ {
+ name = "type_check___type_check_0.4.0.tgz";
+ path = fetchurl {
+ name = "type_check___type_check_0.4.0.tgz";
+ url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz";
+ sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1";
+ };
+ }
{
name = "type_check___type_check_0.3.2.tgz";
path = fetchurl {
@@ -12849,14 +12825,6 @@
sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c";
};
}
- {
- name = "type_fest___type_fest_0.5.2.tgz";
- path = fetchurl {
- name = "type_fest___type_fest_0.5.2.tgz";
- url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz";
- sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2";
- };
- }
{
name = "type_fest___type_fest_0.6.0.tgz";
path = fetchurl {
@@ -12898,11 +12866,11 @@
};
}
{
- name = "typescript___typescript_3.9.7.tgz";
+ name = "typescript___typescript_4.1.5.tgz";
path = fetchurl {
- name = "typescript___typescript_3.9.7.tgz";
- url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz";
- sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa";
+ name = "typescript___typescript_4.1.5.tgz";
+ url = "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz";
+ sha1 = "123a3b214aaff3be32926f0d8f1f6e704eb89a72";
};
}
{
@@ -13170,11 +13138,11 @@
};
}
{
- name = "url_parse___url_parse_1.4.4.tgz";
+ name = "url_parse___url_parse_1.4.7.tgz";
path = fetchurl {
- name = "url_parse___url_parse_1.4.4.tgz";
- url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz";
- sha1 = "cac1556e95faa0303691fec5cf9d5a1bc34648f8";
+ name = "url_parse___url_parse_1.4.7.tgz";
+ url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz";
+ sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278";
};
}
{
@@ -13282,11 +13250,11 @@
};
}
{
- name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz";
+ name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz";
path = fetchurl {
- name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz";
- url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz";
- sha1 = "00f7494d2ae2b688cfe2899df6ed2c54bef91dbe";
+ name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+ sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132";
};
}
{
@@ -13474,11 +13442,11 @@
};
}
{
- name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz";
+ name = "vue_eslint_parser___vue_eslint_parser_7.4.1.tgz";
path = fetchurl {
- name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz";
- url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz";
- sha1 = "894085839d99d81296fa081d19643733f23d7559";
+ name = "vue_eslint_parser___vue_eslint_parser_7.4.1.tgz";
+ url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz";
+ sha1 = "e4adcf7876a7379758d9056a72235af18a587f92";
};
}
{
@@ -13618,19 +13586,19 @@
};
}
{
- name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz";
+ name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz";
path = fetchurl {
- name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz";
- sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0";
+ name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz";
+ sha1 = "38500072ee6ece66f3769936950ea1771be1c957";
};
}
{
- name = "watchpack___watchpack_1.7.2.tgz";
+ name = "watchpack___watchpack_1.7.5.tgz";
path = fetchurl {
- name = "watchpack___watchpack_1.7.2.tgz";
- url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz";
- sha1 = "c02e4d4d49913c3e7e122c3325365af9d331e9aa";
+ name = "watchpack___watchpack_1.7.5.tgz";
+ url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz";
+ sha1 = "1267e6c55e0b9b5be44c2023aed5437a2c26c453";
};
}
{
@@ -13666,19 +13634,19 @@
};
}
{
- name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.6.0.tgz";
+ name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz";
path = fetchurl {
- name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.6.0.tgz";
- url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz";
- sha1 = "39b3a8f829ca044682bc6f9e011c95deb554aefd";
+ name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz";
+ url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz";
+ sha1 = "f6f94db108fb574e415ad313de41a2707d33ef3c";
};
}
{
- name = "webpack_cli___webpack_cli_3.3.11.tgz";
+ name = "webpack_cli___webpack_cli_3.3.12.tgz";
path = fetchurl {
- name = "webpack_cli___webpack_cli_3.3.11.tgz";
- url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz";
- sha1 = "3bf21889bf597b5d82c38f215135a411edfdc631";
+ name = "webpack_cli___webpack_cli_3.3.12.tgz";
+ url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz";
+ sha1 = "94e9ada081453cd0aa609c99e500012fd3ad2d4a";
};
}
{
@@ -13690,11 +13658,11 @@
};
}
{
- name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz";
+ name = "webpack_dev_server___webpack_dev_server_3.11.2.tgz";
path = fetchurl {
- name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz";
- url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz";
- sha1 = "f35945036813e57ef582c2420ef7b470e14d3af0";
+ name = "webpack_dev_server___webpack_dev_server_3.11.2.tgz";
+ url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz";
+ sha1 = "695ebced76a4929f0d5de7fd73fafe185fe33708";
};
}
{
@@ -13722,19 +13690,19 @@
};
}
{
- name = "webpack___webpack_4.42.0.tgz";
+ name = "webpack___webpack_4.46.0.tgz";
path = fetchurl {
- name = "webpack___webpack_4.42.0.tgz";
- url = "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz";
- sha1 = "b901635dd6179391d90740a63c93f76f39883eb8";
+ name = "webpack___webpack_4.46.0.tgz";
+ url = "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz";
+ sha1 = "bf9b4404ea20a073605e0a011d188d77cb6ad542";
};
}
{
- name = "websocket_driver___websocket_driver_0.6.5.tgz";
+ name = "websocket_driver___websocket_driver_0.7.4.tgz";
path = fetchurl {
- name = "websocket_driver___websocket_driver_0.6.5.tgz";
- url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz";
- sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36";
+ name = "websocket_driver___websocket_driver_0.7.4.tgz";
+ url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz";
+ sha1 = "89ad5295bbf64b480abcba31e4953aca706f5760";
};
}
{
@@ -13841,14 +13809,6 @@
sha1 = "45fda3ef76aca815771a89107399ee4119b430ac";
};
}
- {
- name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
- path = fetchurl {
- name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
- sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
- };
- }
{
name = "wrap_ansi___wrap_ansi_5.1.0.tgz";
path = fetchurl {
@@ -14081,14 +14041,6 @@
sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8";
};
}
- {
- name = "yargs_parser___yargs_parser_11.1.1.tgz";
- path = fetchurl {
- name = "yargs_parser___yargs_parser_11.1.1.tgz";
- url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz";
- sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4";
- };
- }
{
name = "yargs_parser___yargs_parser_13.1.2.tgz";
path = fetchurl {
@@ -14105,22 +14057,6 @@
sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0";
};
}
- {
- name = "yargs___yargs_12.0.5.tgz";
- path = fetchurl {
- name = "yargs___yargs_12.0.5.tgz";
- url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz";
- sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13";
- };
- }
- {
- name = "yargs___yargs_13.2.4.tgz";
- path = fetchurl {
- name = "yargs___yargs_13.2.4.tgz";
- url = "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz";
- sha1 = "0b562b794016eb9651b98bd37acf364aa5d6dc83";
- };
- }
{
name = "yargs___yargs_13.3.2.tgz";
path = fetchurl {
@@ -14178,11 +14114,11 @@
};
}
{
- name = "zrender___zrender_4.2.0.tgz";
+ name = "zrender___zrender_4.3.2.tgz";
path = fetchurl {
- name = "zrender___zrender_4.2.0.tgz";
- url = "https://registry.yarnpkg.com/zrender/-/zrender-4.2.0.tgz";
- sha1 = "d001302e155f28de1f9fc7fcd5c254bad28471cf";
+ name = "zrender___zrender_4.3.2.tgz";
+ url = "https://registry.yarnpkg.com/zrender/-/zrender-4.3.2.tgz";
+ sha1 = "ec7432f9415c82c73584b6b7b8c47e1b016209c6";
};
}
];
diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix
index f499be17f7c8..d2511e278632 100644
--- a/pkgs/applications/version-management/mercurial/4.9.nix
+++ b/pkgs/applications/version-management/mercurial/4.9.nix
@@ -21,8 +21,8 @@ in python2Packages.buildPythonApplication {
inherit python; # pass it so that the same version can be used in hg2git
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ docutils unzip ]
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
propagatedBuildInputs = [ hg-git dulwich ];
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 7c0a96583e70..26d263b060d4 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -19,8 +19,8 @@ in python3Packages.buildPythonApplication rec {
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ docutils unzip ]
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
index 8ecc5bf9ac8f..d7ec4a864639 100644
--- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
@@ -2,8 +2,6 @@
, yacc, libtool, fontconfig, pango, gd, libwebp
}:
-assert libpng != null && libjpeg != null && expat != null;
-
stdenv.mkDerivation rec {
name = "graphviz-2.0";
diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile
index beff147c374a..9e844a1e01f0 100644
--- a/pkgs/applications/version-management/redmine/Gemfile
+++ b/pkgs/applications/version-management/redmine/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'
gem "bundler", ">= 1.5.0"
-gem 'rails', '5.2.4.2'
+gem 'rails', '5.2.4.5'
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
gem "rouge", "~> 3.12.0"
gem "request_store", "~> 1.4.1"
@@ -12,8 +12,8 @@ gem "actionpack-xml_parser"
gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0")
gem "mimemagic"
gem "mail", "~> 2.7.1"
-gem "csv", "~> 3.1.1"
-gem "nokogiri", "~> 1.10.0"
+gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
+gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')
gem "i18n", "~> 1.6.0"
gem "rbpdf", "~> 1.20.0"
@@ -38,7 +38,7 @@ end
# Optional Markdown support, not for JRuby
group :markdown do
- gem "redcarpet", "~> 3.5.0"
+ gem 'redcarpet', '~> 3.5.1'
end
# Include database gems for the database adapters NixOS supports
diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index 60aed5e17922..c71a1b7bdde8 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (5.2.4.2)
- actionpack (= 5.2.4.2)
+ actioncable (5.2.4.5)
+ actionpack (= 5.2.4.5)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailer (5.2.4.2)
- actionpack (= 5.2.4.2)
- actionview (= 5.2.4.2)
- activejob (= 5.2.4.2)
+ actionmailer (5.2.4.5)
+ actionpack (= 5.2.4.5)
+ actionview (= 5.2.4.5)
+ activejob (= 5.2.4.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.2.4.2)
- actionview (= 5.2.4.2)
- activesupport (= 5.2.4.2)
+ actionpack (5.2.4.5)
+ actionview (= 5.2.4.5)
+ activesupport (= 5.2.4.5)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
@@ -21,26 +21,26 @@ GEM
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
- actionview (5.2.4.2)
- activesupport (= 5.2.4.2)
+ actionview (5.2.4.5)
+ activesupport (= 5.2.4.5)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.2.4.2)
- activesupport (= 5.2.4.2)
+ activejob (5.2.4.5)
+ activesupport (= 5.2.4.5)
globalid (>= 0.3.6)
- activemodel (5.2.4.2)
- activesupport (= 5.2.4.2)
- activerecord (5.2.4.2)
- activemodel (= 5.2.4.2)
- activesupport (= 5.2.4.2)
+ activemodel (5.2.4.5)
+ activesupport (= 5.2.4.5)
+ activerecord (5.2.4.5)
+ activemodel (= 5.2.4.5)
+ activesupport (= 5.2.4.5)
arel (>= 9.0)
- activestorage (5.2.4.2)
- actionpack (= 5.2.4.2)
- activerecord (= 5.2.4.2)
+ activestorage (5.2.4.5)
+ actionpack (= 5.2.4.5)
+ activerecord (= 5.2.4.5)
marcel (~> 0.3.1)
- activesupport (5.2.4.2)
+ activesupport (5.2.4.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -48,7 +48,7 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (9.0.0)
- ast (2.4.0)
+ ast (2.4.2)
builder (3.2.4)
capybara (3.25.0)
addressable
@@ -59,21 +59,21 @@ GEM
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (3.0.0)
- concurrent-ruby (1.1.6)
+ concurrent-ruby (1.1.8)
crass (1.0.6)
- css_parser (1.7.1)
+ css_parser (1.9.0)
addressable
- csv (3.1.2)
- docile (1.3.2)
- erubi (1.9.0)
+ csv (3.1.9)
+ docile (1.3.5)
+ erubi (1.10.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
htmlentities (4.3.4)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
- json (2.3.0)
- loofah (2.5.0)
+ json (2.5.1)
+ loofah (2.9.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@@ -81,61 +81,63 @@ GEM
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (1.0.0)
- mimemagic (0.3.4)
+ mimemagic (0.3.5)
mini_magick (4.9.5)
mini_mime (1.0.2)
- mini_portile2 (2.4.0)
- minitest (5.14.0)
- mocha (1.11.2)
+ mini_portile2 (2.5.0)
+ minitest (5.14.4)
+ mocha (1.12.0)
mysql2 (0.5.3)
- net-ldap (0.16.2)
- nio4r (2.5.2)
- nokogiri (1.10.9)
- mini_portile2 (~> 2.4.0)
- parallel (1.19.1)
- parser (2.7.1.0)
- ast (~> 2.4.0)
+ net-ldap (0.16.3)
+ nio4r (2.5.7)
+ nokogiri (1.11.2)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
+ parallel (1.20.1)
+ parser (3.0.0.0)
+ ast (~> 2.4.1)
pg (1.1.4)
- public_suffix (4.0.4)
- puma (3.12.4)
- rack (2.2.2)
+ public_suffix (4.0.6)
+ puma (3.12.6)
+ racc (1.5.2)
+ rack (2.2.3)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
- rails (5.2.4.2)
- actioncable (= 5.2.4.2)
- actionmailer (= 5.2.4.2)
- actionpack (= 5.2.4.2)
- actionview (= 5.2.4.2)
- activejob (= 5.2.4.2)
- activemodel (= 5.2.4.2)
- activerecord (= 5.2.4.2)
- activestorage (= 5.2.4.2)
- activesupport (= 5.2.4.2)
+ rails (5.2.4.5)
+ actioncable (= 5.2.4.5)
+ actionmailer (= 5.2.4.5)
+ actionpack (= 5.2.4.5)
+ actionview (= 5.2.4.5)
+ activejob (= 5.2.4.5)
+ activemodel (= 5.2.4.5)
+ activerecord (= 5.2.4.5)
+ activestorage (= 5.2.4.5)
+ activesupport (= 5.2.4.5)
bundler (>= 1.3.0)
- railties (= 5.2.4.2)
+ railties (= 5.2.4.5)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
- railties (5.2.4.2)
- actionpack (= 5.2.4.2)
- activesupport (= 5.2.4.2)
+ railties (5.2.4.5)
+ actionpack (= 5.2.4.5)
+ activesupport (= 5.2.4.5)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
- rake (13.0.1)
+ rake (13.0.3)
rbpdf (1.20.1)
htmlentities
rbpdf-font (~> 1.19.0)
rbpdf-font (1.19.1)
- redcarpet (3.5.0)
- regexp_parser (1.7.0)
+ redcarpet (3.5.1)
+ regexp_parser (1.8.2)
request_store (1.4.1)
rack (>= 1.4)
roadie (4.0.0)
@@ -158,7 +160,7 @@ GEM
rack (>= 1.1)
rubocop (>= 0.72.0)
ruby-openid (2.9.2)
- ruby-progressbar (1.10.1)
+ ruby-progressbar (1.11.0)
rubyzip (2.3.0)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
@@ -168,24 +170,24 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
- sprockets (4.0.0)
+ sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.2.1)
+ sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
- thor (1.0.1)
+ thor (1.1.0)
thread_safe (0.3.6)
- tzinfo (1.2.7)
+ tzinfo (1.2.9)
thread_safe (~> 0.1)
unicode-display_width (1.6.1)
- websocket-driver (0.7.1)
+ websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.4)
+ websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
- yard (0.9.24)
+ yard (0.9.26)
PLATFORMS
ruby
@@ -204,14 +206,14 @@ DEPENDENCIES
mocha (>= 1.4.0)
mysql2 (~> 0.5.0)
net-ldap (~> 0.16.0)
- nokogiri (~> 1.10.0)
+ nokogiri (~> 1.11.1)
pg (~> 1.1.4)
puma (~> 3.7)
rack-openid
- rails (= 5.2.4.2)
+ rails (= 5.2.4.5)
rails-dom-testing
rbpdf (~> 1.20.0)
- redcarpet (~> 3.5.0)
+ redcarpet (~> 3.5.1)
request_store (~> 1.4.1)
roadie-rails (~> 2.1.0)
rouge (~> 3.12.0)
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index ab5b4ffded58..37905e273da9 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
let
- version = "4.1.1";
+ version = "4.1.2";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -16,7 +16,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
- sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5";
+ sha256 = "13i2rlkpdwkdhidpdb5r2zxwxna00r71rh248kzfhgy5a5rkj8ky";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix
index a8fd6eba6f0c..e110c1bf5433 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/pkgs/applications/version-management/redmine/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0q4by8d41n972j8cdcddrwsh7qphcki50xvgm1syrawyck6w1f5v";
+ sha256 = "1rlx5597621jmdzpf8mhfm52d0fcz1izdj94k58l4sln4gw0x73j";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kg2nayy8wmxhfp52217h80yqr0mcg793xw3cjlfg9lkvdh0nb5z";
+ sha256 = "19y5y2dypqakk39smcmyslic8wnffzc0670d2zjadsrgsg850gyp";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w1l9i6q9xns4yl41l582pyc5i1xi40yyyq802drm58gwylv3wax";
+ sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
actionpack-xml_parser = {
dependencies = ["actionpack" "railties"];
@@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fp3my6216lb9gp800s46y0404jwfl6xb3j9rvx4zf087497q8lp";
+ sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qsvb89rwqrp779mvpn67qbzidg2q6d1fa8kwybvpc93nzb9zpvi";
+ sha256 = "1mb4s49vbrxyg3pba76z3llbzclm8d4zcjhalf4yrfq5y357kkya";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
activemodel = {
dependencies = ["activesupport"];
@@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jcfdv00kmifj86d0z347nw55q1f8vwzr1aa9jrfnwz47ndi22di";
+ sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
@@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yaqrh23c8krrjw6rvxv7pvnkpp46nk5aq9z2daby640si4xpmp5";
+ sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
activestorage = {
dependencies = ["actionpack" "activerecord" "marcel"];
@@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d51zp17c9k4brivm8y46rszcz07s5rb75gmkm0dpzg3rz3v38s9";
+ sha256 = "12i3an3vxg0fqjvr4mi0b3nnsb8jpcphkmz1717nb7lsy3wm4081";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
@@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y1397g5xxinjyxjsdmp8c92yn0y3bd2hl4wbmmrpd08bggy6flc";
+ sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
addressable = {
dependencies = ["public_suffix"];
@@ -135,10 +135,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+ sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
type = "gem";
};
- version = "2.4.0";
+ version = "2.4.2";
};
builder = {
groups = ["default"];
@@ -176,10 +176,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
+ sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem";
};
- version = "1.1.6";
+ version = "1.1.8";
};
crass = {
groups = ["default"];
@@ -197,40 +197,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw";
+ sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751";
type = "gem";
};
- version = "1.7.1";
+ version = "1.9.0";
};
csv = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5";
+ sha256 = "07mgyalwdxaxnff86j5p6n5szmhqz7nrlkb40826mzggrmva8v1m";
type = "gem";
};
- version = "3.1.2";
+ version = "3.1.9";
};
docile = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
+ sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z";
type = "gem";
};
- version = "1.3.2";
+ version = "1.3.5";
};
erubi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
+ sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
type = "gem";
};
- version = "1.9.0";
+ version = "1.10.0";
};
globalid = {
dependencies = ["activesupport"];
@@ -279,10 +279,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
+ sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
- version = "2.3.0";
+ version = "2.5.1";
};
loofah = {
dependencies = ["crass" "nokogiri"];
@@ -290,10 +290,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040";
+ sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
type = "gem";
};
- version = "2.5.0";
+ version = "2.9.0";
};
mail = {
dependencies = ["mini_mime"];
@@ -332,10 +332,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0frrfvz52fh4v1sb2xr9pyxhrxm5f7jppqxagpmd7c5ific66l9p";
+ sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf";
type = "gem";
};
- version = "0.3.4";
+ version = "0.3.5";
};
mini_magick = {
groups = ["minimagick"];
@@ -362,30 +362,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+ sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem";
};
- version = "2.4.0";
+ version = "2.5.0";
};
minitest = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
+ sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
type = "gem";
};
- version = "5.14.0";
+ version = "5.14.4";
};
mocha = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4";
+ sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a";
type = "gem";
};
- version = "1.11.2";
+ version = "1.12.0";
};
mysql2 = {
groups = ["default"];
@@ -410,41 +410,41 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg";
+ sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";
type = "gem";
};
- version = "0.16.2";
+ version = "0.16.3";
};
nio4r = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c";
+ sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5";
type = "gem";
};
- version = "2.5.2";
+ version = "2.5.7";
};
nokogiri = {
- dependencies = ["mini_portile2"];
+ dependencies = ["mini_portile2" "racc"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
+ sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p";
type = "gem";
};
- version = "1.10.9";
+ version = "1.11.2";
};
parallel = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
+ sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
type = "gem";
};
- version = "1.19.1";
+ version = "1.20.1";
};
parser = {
dependencies = ["ast"];
@@ -452,10 +452,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07awrcwm2xibglrh7qwpj24vwzn9p64m7bmfr9xbrlffaznr0ii7";
+ sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml";
type = "gem";
};
- version = "2.7.1.0";
+ version = "3.0.0.0";
};
pg = {
groups = ["default"];
@@ -480,30 +480,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz";
+ sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
type = "gem";
};
- version = "4.0.4";
+ version = "4.0.6";
};
puma = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mg8yh478mh55pg7pv8z7xyvk35ra98hy61z9lwkfr8fzyyz57zs";
+ sha256 = "1ypkyqhysb2vvdvkl4w923yvpmi228gld4kbargb1i2d4sa9s49a";
type = "gem";
};
- version = "3.12.4";
+ version = "3.12.6";
+ };
+ racc = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+ type = "gem";
+ };
+ version = "1.5.2";
};
rack = {
groups = ["default" "openid" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp";
+ sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
type = "gem";
};
- version = "2.2.2";
+ version = "2.2.3";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
@@ -533,10 +543,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x8k6n4yziwf386prhvr9d9plc9fwv0j8spw2bnmkwhf54v2ias4";
+ sha256 = "1nzsm1fqqnhlvgcfrrpsmcv2znldfkyq5c9z7k08p2p54jrd8kfd";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -566,10 +576,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p2rnd1xdqlk19k3m5gd058yzvwjj25k5hwn4km683b5dhylpd16";
+ sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd";
type = "gem";
};
- version = "5.2.4.2";
+ version = "5.2.4.5";
};
rainbow = {
groups = ["default" "test"];
@@ -586,10 +596,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
+ sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
type = "gem";
};
- version = "13.0.1";
+ version = "13.0.3";
};
rbpdf = {
dependencies = ["htmlentities" "rbpdf-font"];
@@ -617,20 +627,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
+ sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
type = "gem";
};
- version = "3.5.0";
+ version = "3.5.1";
};
regexp_parser = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l2vcj9qffj5b3v9jsyi4k994bdj3rjz7l9ql8x04lndqxfrrrv2";
+ sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm";
type = "gem";
};
- version = "1.7.0";
+ version = "1.8.2";
};
request_store = {
dependencies = ["rack"];
@@ -723,10 +733,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
+ sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
type = "gem";
};
- version = "1.10.1";
+ version = "1.11.0";
};
rubyzip = {
groups = ["default" "test"];
@@ -776,10 +786,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap";
+ sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38";
type = "gem";
};
- version = "4.0.0";
+ version = "4.0.2";
};
sprockets-rails = {
dependencies = ["actionpack" "activesupport" "sprockets"];
@@ -787,20 +797,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
+ sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2";
type = "gem";
};
- version = "3.2.1";
+ version = "3.2.2";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
+ sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
type = "gem";
};
- version = "1.0.1";
+ version = "1.1.0";
};
thread_safe = {
groups = ["default" "test"];
@@ -818,10 +828,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+ sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
type = "gem";
};
- version = "1.2.7";
+ version = "1.2.9";
};
unicode-display_width = {
groups = ["default" "test"];
@@ -839,20 +849,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
+ sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh";
type = "gem";
};
- version = "0.7.1";
+ version = "0.7.3";
};
websocket-extensions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
+ sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw";
type = "gem";
};
- version = "0.1.4";
+ version = "0.1.5";
};
xpath = {
dependencies = ["nokogiri"];
@@ -870,9 +880,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp";
+ sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h";
type = "gem";
};
- version = "0.9.24";
+ version = "0.9.26";
};
}
diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix
index e60acf87da6f..e4225963cb2b 100644
--- a/pkgs/applications/video/catt/default.nix
+++ b/pkgs/applications/video/catt/default.nix
@@ -4,11 +4,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "catt";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-6RUeinHhAvvSz38hHQP5/MXNiY00rCM8k2ONaFYbwPc=";
+ sha256 = "fef58bf7a8ebaba98399d1077cc4615f53d0196aab2a989df369a66f7111963b";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 6db2450d1365..b24ff43ac671 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.5";
+ version = "3.9.6";
src = fetchurl {
- sha256 = "1p8pqa5s70basdm2zpmahc54shsxrr0fr7chvv425n5a9sqba4dh";
+ sha256 = "sha256-1rQu2Gh9PKSbC0tuQxLwFhzy280z4obpa+eXvDBzDW0=";
# 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/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix
new file mode 100644
index 000000000000..d691882a2c6f
--- /dev/null
+++ b/pkgs/applications/video/corrscope/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, mkDerivationWith
+, python3Packages
+, wrapQtAppsHook
+, ffmpeg
+, qtbase
+}:
+
+mkDerivationWith python3Packages.buildPythonApplication rec {
+ pname = "corrscope";
+ version = "0.7.0";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0m62p3jlbx5dlp3j8wn1ka1sqpffsxbpsgv2h5cvj1n1lsgbss2s";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'attrs>=18.2.0,<19.0.0' 'attrs>=18.2.0' \
+ --replace 'numpy>=1.15,<2.0,!=1.19.4' 'numpy>=1.15,<2.0'
+ '';
+
+ nativeBuildInputs = [ wrapQtAppsHook ];
+
+ buildInputs = [ ffmpeg qtbase ];
+
+ propagatedBuildInputs = with python3Packages; [ appdirs attrs click matplotlib numpy pyqt5 ruamel_yaml ];
+
+ dontWrapQtApps = true;
+
+ preFixup = ''
+ makeWrapperArgs+=(
+ --prefix PATH : ${ffmpeg}/bin
+ "''${qtWrapperArgs[@]}"
+ )
+ '';
+
+ preCheck = "export HOME=$TEMP";
+
+ meta = with lib; {
+ description = "Render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm";
+ longDescription = ''
+ Corrscope renders oscilloscope views of WAV files recorded from chiptune (game music from
+ retro sound chips).
+
+ Corrscope uses "waveform correlation" to track complex waves (including SNES and Sega
+ Genesis/FM synthesis) which jump around on other oscilloscope programs.
+ '';
+ homepage = "https://github.com/corrscope/corrscope";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ OPNA2608 ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix
new file mode 100644
index 000000000000..a5de2142d777
--- /dev/null
+++ b/pkgs/applications/video/freetube/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron }:
+
+stdenv.mkDerivation rec {
+ pname = "freetube";
+ version = "0.12.0";
+
+ src = fetchurl {
+ url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
+ sha256 = "151fcm1swsasrwzm93fddx669q4xlfl3d58q1w58nyv7r6kh4fda";
+ };
+
+ appimageContents = appimageTools.extractType2 {
+ name = "${pname}-${version}";
+ inherit src;
+ };
+
+ dontUnpack = true;
+ dontConfigure = true;
+ dontBuild = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/share/${pname} $out/share/applications
+
+ cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
+ cp -a ${appimageContents}/freetube.desktop $out/share/applications/${pname}.desktop
+ cp -a ${appimageContents}/usr/share/icons $out/share
+
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+ --add-flags $out/share/${pname}/resources/app.asar
+ '';
+
+ meta = with lib; {
+ description = "An Open Source YouTube app for privacy";
+ homepage = "https://freetubeapp.io/";
+ license = licenses.agpl3Only;
+ maintainers = with maintainers; [ ryneeverett ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
index 6dc42a47685b..3d080c00555b 100644
--- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@@ -1,25 +1,68 @@
-{ lib, buildPythonApplication, fetchFromGitHub, callPackage
-, mpv, python-mpv-jsonipc, jellyfin-apiclient-python
-, pillow, tkinter, pystray, jinja2, pywebview }:
+{ lib
+, buildPythonApplication
+, copyDesktopItems
+, fetchPypi
+, makeDesktopItem
+, flask
+, jellyfin-apiclient-python
+, jinja2
+, mpv
+, pillow
+, pydantic
+, pyqtwebengine
+, pystray
+, python-mpv-jsonipc
+, pywebview
+, qt5
+, tkinter
+, werkzeug
+}:
-let
- shaderPack = callPackage ./shader-pack.nix {};
-in
buildPythonApplication rec {
pname = "jellyfin-mpv-shim";
- version = "1.7.1";
+ version = "1.10.2";
- src = fetchFromGitHub {
- owner = "iwalton3";
- repo = pname;
- rev = "v${version}";
- sha256 = "0alrh5h3f8pq9mrq09jmpqa0yslxsjqwij6kwn24ggbwc10zkq75";
- fetchSubmodules = true; # needed for display_mirror css file
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-ivNkVpC+uQfbcAyQZ0xIG1k1MLIgpkiqTMVnkoYlJyY=";
};
- patches = [
- ./disable-desktop-client.patch
- ./disable-update-check.patch
+ propagatedBuildInputs = [
+ jellyfin-apiclient-python
+ mpv
+ pillow
+ pydantic
+ python-mpv-jsonipc
+
+ # gui dependencies
+ pystray
+ tkinter
+
+ # display_mirror dependencies
+ jinja2
+ pywebview
+
+ # desktop dependencies
+ flask
+ pyqtwebengine
+ werkzeug
+ ];
+
+ nativeBuildInputs = [
+ copyDesktopItems
+ qt5.wrapQtAppsHook
+ ];
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "Jellyfin Desktop";
+ exec = "jellyfin-desktop";
+ icon = "jellyfin-desktop";
+ desktopName = "jellyfin-desktop";
+ comment = "MPV-based desktop and cast client for Jellyfin";
+ genericName = "MPV-based desktop and cast client for Jellyfin";
+ categories = "Video;AudioVideo;TV;Player";
+ })
];
# override $HOME directory:
@@ -34,31 +77,27 @@ buildPythonApplication rec {
'';
postPatch = ''
- # link the default shader pack
- ln -s ${shaderPack} jellyfin_mpv_shim/default_shader_pack
+ substituteInPlace jellyfin_mpv_shim/conf.py \
+ --replace "check_updates: bool = True" "check_updates: bool = False" \
+ --replace "notify_updates: bool = True" "notify_updates: bool = False"
'';
- propagatedBuildInputs = [
- jellyfin-apiclient-python
- mpv
- pillow
- python-mpv-jsonipc
+ postInstall = ''
+ mkdir -p $out/share/pixmaps
+ cp jellyfin_mpv_shim/integration/jellyfin-256.png $out/share/pixmaps/jellyfin-desktop.png
+ '';
- # gui dependencies
- pystray
- tkinter
-
- # display_mirror dependencies
- jinja2
- pywebview
- ];
+ postFixup = ''
+ wrapQtApp $out/bin/jellyfin-desktop
+ wrapQtApp $out/bin/jellyfin-mpv-desktop
+ '';
# no tests
doCheck = false;
pythonImportsCheck = [ "jellyfin_mpv_shim" ];
meta = with lib; {
- homepage = "https://github.com/iwalton3/jellyfin-mpv-shim";
+ homepage = "https://github.com/jellyfin/jellyfin-desktop";
description = "Allows casting of videos to MPV via the jellyfin mobile and web app";
license = licenses.gpl3;
maintainers = with maintainers; [ jojosch ];
diff --git a/pkgs/applications/video/jellyfin-mpv-shim/disable-desktop-client.patch b/pkgs/applications/video/jellyfin-mpv-shim/disable-desktop-client.patch
deleted file mode 100644
index 996225efb3a5..000000000000
--- a/pkgs/applications/video/jellyfin-mpv-shim/disable-desktop-client.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a831959..2206e6e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -25,7 +25,6 @@ setup(
- entry_points={
- 'console_scripts': [
- 'jellyfin-mpv-shim=jellyfin_mpv_shim.mpv_shim:main',
-- 'jellyfin-mpv-desktop=jellyfin_mpv_shim.mpv_shim:main_desktop',
- ]
- },
- classifiers=[
diff --git a/pkgs/applications/video/jellyfin-mpv-shim/disable-update-check.patch b/pkgs/applications/video/jellyfin-mpv-shim/disable-update-check.patch
deleted file mode 100644
index 6941b956e854..000000000000
--- a/pkgs/applications/video/jellyfin-mpv-shim/disable-update-check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/jellyfin_mpv_shim/conf.py b/jellyfin_mpv_shim/conf.py
-index 0ab9326..ccedc17 100644
---- a/jellyfin_mpv_shim/conf.py
-+++ b/jellyfin_mpv_shim/conf.py
-@@ -88,8 +88,8 @@ class Settings(object):
- "sync_revert_seek": True,
- "sync_osd_message": True,
- "screenshot_menu": True,
-- "check_updates": True,
-- "notify_updates": True,
-+ "check_updates": False,
-+ "notify_updates": False,
- "lang": None,
- "desktop_scale": 1.0,
- }
diff --git a/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix b/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix
deleted file mode 100644
index 89a601af4add..000000000000
--- a/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- pname = "jellyfin-mpv-shim-shader-pack";
- version = "1.0.0";
-
- src = fetchFromGitHub {
- owner = "iwalton3";
- repo = "default-shader-pack";
- rev = "v${version}";
- sha256 = "04y8gvjy4v3773b1kyan4dxqcf86b56x7v33m2k246jbn0rl2pgr";
- };
-
- installPhase = ''
- mkdir -p $out
- cp -a . $out
- '';
-
- meta = with lib; {
- homepage = "https://github.com/iwalton3/default-shader-pack";
- description = "Preconfigured set of MPV shaders and configurations for MPV Shim media clients";
- license = with licenses; [ mit lgpl3Plus unlicense ];
- maintainers = with maintainers; [ jojosch ];
- };
-}
diff --git a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
new file mode 100644
index 000000000000..5d714cf17993
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildKodiAddon, fetchFromGitHub, requests, vfs-libarchive }:
+
+buildKodiAddon rec {
+ pname = "a4ksubtitles";
+ namespace = "service.subtitles.a4ksubtitles";
+ version = "2.3.0";
+
+ src = fetchFromGitHub {
+ owner = "a4k-openproject";
+ repo = "a4kSubtitles";
+ rev = "${namespace}/${namespace}-${version}";
+ sha256 = "0hxvxkbihfyvixmlxf5n4ccn70w0244hhw3hr44rqvx00a0bg1lh";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ vfs-libarchive
+ ];
+
+ meta = with lib; {
+ homepage = "https://a4k-openproject.github.io/a4kSubtitles/";
+ description = "Multi-Source Subtitles Addon";
+ license = licenses.mit;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/addon-update-script/default.nix b/pkgs/applications/video/kodi-packages/addon-update-script/default.nix
new file mode 100644
index 000000000000..17c1d45783fa
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/addon-update-script/default.nix
@@ -0,0 +1,23 @@
+{ writeShellScript
+, nix
+, curl
+, gzip
+, xmlstarlet
+, common-updater-scripts
+}:
+
+{ attrPath }:
+
+let
+ url = "http://mirrors.kodi.tv/addons/matrix/addons.xml.gz";
+ updateScript = writeShellScript "update.sh" ''
+ set -ex
+
+ attrPath=$1
+ namespace=$(${nix}/bin/nix-instantiate $systemArg --eval -E "with import ./. {}; $attrPath.namespace" | tr -d '"')
+ version=$(${curl}/bin/curl -s -L ${url} | ${gzip}/bin/gunzip -c | ${xmlstarlet}/bin/xml select -T -t -m "//addons/addon[@id='$namespace']" -v @version)
+
+ ${common-updater-scripts}/bin/update-source-version "$attrPath" "$version"
+ '';
+in
+ [ updateScript attrPath ]
diff --git a/pkgs/applications/video/kodi-packages/certifi/default.nix b/pkgs/applications/video/kodi-packages/certifi/default.nix
new file mode 100644
index 000000000000..d122cacc878f
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/certifi/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "certifi";
+ namespace = "script.module.certifi";
+ version = "2019.11.28+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "0vsd68izv1ix0hb1gm74qq3zff0sxmhfhjyh7y9005zzp2gpi62v";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.certifi";
+ };
+
+ meta = with lib; {
+ homepage = "https://certifi.io";
+ description = "Python package for providing Mozilla's CA Bundle";
+ license = licenses.mpl20;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/chardet/default.nix b/pkgs/applications/video/kodi-packages/chardet/default.nix
new file mode 100644
index 000000000000..7c069592c673
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/chardet/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "chardet";
+ namespace = "script.module.chardet";
+ version = "3.0.4+matrix.3";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "05928dj4fsj2zg8ajdial3sdf8izddq64sr0al3zy1gqw91jp80f";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.chardet";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/Freso/script.module.chardet";
+ description = "Universal encoding detector";
+ license = licenses.lgpl2Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/controllers/default.nix b/pkgs/applications/video/kodi-packages/controllers/default.nix
new file mode 100644
index 000000000000..825ad5d53fc4
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/controllers/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiAddon, fetchFromGitHub, controller }:
+buildKodiAddon rec {
+ pname = "game-controller-${controller}";
+ namespace = "game.controller.${controller}";
+ version = "1.0.3";
+
+ sourceDir = "addons/" + namespace;
+
+ src = fetchFromGitHub {
+ owner = "kodi-game";
+ repo = "kodi-game-controllers";
+ rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18";
+ sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
+ };
+
+ meta = with lib; {
+ description = "Add support for different gaming controllers.";
+ platforms = platforms.all;
+ license = licenses.odbl;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/dateutil/default.nix b/pkgs/applications/video/kodi-packages/dateutil/default.nix
new file mode 100644
index 000000000000..665858d3d573
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/dateutil/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six }:
+
+buildKodiAddon rec {
+ pname = "dateutil";
+ namespace = "script.module.dateutil";
+ version = "2.8.1+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "1jr77017ihs7j3455i72af71wyvs792kbizq4539ccd98far8lm7";
+ };
+
+ propagatedBuildInputs = [
+ six
+ ];
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.dateutil";
+ };
+
+ meta = with lib; {
+ homepage = "https://dateutil.readthedocs.io/en/stable/";
+ description = "Extensions to the standard Python datetime module";
+ license = with licenses; [ asl20 bsd3 ];
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/idna/default.nix b/pkgs/applications/video/kodi-packages/idna/default.nix
new file mode 100644
index 000000000000..662a45188ecc
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/idna/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "idna";
+ namespace = "script.module.idna";
+ version = "2.8.1+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "02s75fhfmbs3a38wvxba51aj3lv5bidshjdkl6yjfji6waxpr9xh";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.idna";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/Freso/script.module.idna";
+ description = "Internationalized Domain Names for Python";
+ license = licenses.bsd3;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
new file mode 100644
index 000000000000..136efe8a2432
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss }:
+buildKodiBinaryAddon rec {
+ pname = "inputstream-adaptive";
+ namespace = "inputstream.adaptive";
+ version = "2.6.7";
+
+ src = fetchFromGitHub {
+ owner = "peak3d";
+ repo = "inputstream.adaptive";
+ rev = "${version}-${rel}";
+ sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s";
+ };
+
+ extraBuildInputs = [ expat ];
+
+ extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
+
+ extraInstallPhase = let n = namespace; in ''
+ ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/peak3d/inputstream.adaptive";
+ description = "Kodi inputstream addon for several manifest types";
+ platforms = platforms.all;
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
new file mode 100644
index 000000000000..b42c32fed109
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "inputstreamhelper";
+ namespace = "script.module.inputstreamhelper";
+ version = "0.5.2+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "18lkksljfa57w69yklbldf7dgyykrm84pd10mdjdqdm88fdiiijk";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.inputstreamhelper";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/emilsvennesson/script.module.inputstreamhelper";
+ description = "A simple Kodi module that makes life easier for add-on developers relying on InputStream based add-ons and DRM playback";
+ license = licenses.mit;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/jellyfin/default.nix b/pkgs/applications/video/kodi-packages/jellyfin/default.nix
new file mode 100644
index 000000000000..03a037ce5387
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/jellyfin/default.nix
@@ -0,0 +1,49 @@
+{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals }:
+let
+ python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]);
+in
+buildKodiAddon rec {
+ pname = "jellyfin";
+ namespace = "plugin.video.jellyfin";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "jellyfin";
+ repo = "jellyfin-kodi";
+ rev = "v${version}";
+ sha256 = "0fx20gmd5xlg59ks4433qh2b3jhbs5qrnc49zi4rkqqr4jr4nhnn";
+ };
+
+ nativeBuildInputs = [
+ python
+ ];
+
+ prePatch = ''
+ substituteInPlace .config/generate_xml.py \
+ --replace "'jellyfin-kodi/release.yaml'" "'release.yaml'" \
+ --replace "'jellyfin-kodi/addon.xml'" "'addon.xml'"
+ '';
+
+ buildPhase = ''
+ ${python}/bin/python3 .config/generate_xml.py py3
+ '';
+
+ postInstall = ''
+ mv /build/source/addon.xml $out${addonDir}/${namespace}/
+ '';
+
+ propagatedBuildInputs = [
+ requests
+ dateutil
+ six
+ kodi-six
+ signals
+ ];
+
+ meta = with lib; {
+ homepage = "https://jellyfin.org/";
+ description = "A whole new way to manage and view your media library";
+ license = licenses.gpl3Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/joystick/default.nix b/pkgs/applications/video/kodi-packages/joystick/default.nix
new file mode 100644
index 000000000000..a1b9c3eeeefd
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/joystick/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, tinyxml, udev }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "peripheral.joystick";
+ version = "1.7.1";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
+ };
+
+ extraBuildInputs = [ tinyxml udev ];
+
+ meta = with lib; {
+ description = "Binary addon for raw joystick input.";
+ platforms = platforms.all;
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/kodi-platform/default.nix b/pkgs/applications/video/kodi-packages/kodi-platform/default.nix
new file mode 100644
index 000000000000..6d458f7377d7
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/kodi-platform/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchFromGitHub, cmake, kodi, libcec_platform, tinyxml }:
+stdenv.mkDerivation rec {
+ pname = "kodi-platform";
+ version = "17.1";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = pname;
+ rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
+ sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ kodi libcec_platform tinyxml ];
+}
diff --git a/pkgs/applications/video/kodi-packages/kodi-six/default.nix b/pkgs/applications/video/kodi-packages/kodi-six/default.nix
new file mode 100644
index 000000000000..b4f1169b36db
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/kodi-six/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+
+buildKodiAddon rec {
+ pname = "kodi-six";
+ namespace = "script.module.kodi-six";
+ version = "0.1.3.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.kodi-six";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/romanvm/kodi.six";
+ description = "Wrappers around Kodi Python API for seamless Python 2/3 compatibility";
+ license = licenses.gpl3Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/pkgs/applications/video/kodi-packages/myconnpy/default.nix
new file mode 100644
index 000000000000..bd0c98137a5a
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/myconnpy/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "myconnpy";
+ namespace = "script.module.myconnpy";
+ version = "8.0.18+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.myconnpy";
+ };
+
+ meta = with lib; {
+ homepage = "http://dev.mysql.com/doc/connector-python/en/index.html";
+ description = "MySQL Connector/Python";
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix
new file mode 100644
index 000000000000..e187fad9737f
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/netflix/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildKodiAddon, fetchFromGitHub, signals, inputstream-adaptive, inputstreamhelper, requests, myconnpy }:
+
+buildKodiAddon rec {
+ pname = "netflix";
+ namespace = "plugin.video.netflix";
+ version = "1.14.1";
+
+ src = fetchFromGitHub {
+ owner = "CastagnaIT";
+ repo = namespace;
+ rev = "v${version}";
+ sha256 = "0vv3234gg4brp0gvrsl4vdskmpfbyk4z7cjmmj31zn4m8j33japn";
+ };
+
+ propagatedBuildInputs = [
+ signals
+ inputstream-adaptive
+ inputstreamhelper
+ requests
+ myconnpy
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/CastagnaIT/plugin.video.netflix";
+ description = "Netflix VOD Services Add-on";
+ license = licenses.mit;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/osmc-skin/default.nix b/pkgs/applications/video/kodi-packages/osmc-skin/default.nix
new file mode 100644
index 000000000000..c83fd66a4333
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/osmc-skin/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+buildKodiAddon rec {
+ pname = "osmc-skin";
+ namespace = "skin.osmc";
+ version = "18.0.0";
+
+ src = fetchFromGitHub {
+ owner = "osmc";
+ repo = namespace;
+ rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0";
+ sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/osmc/skin.osmc";
+ description = "The default skin for OSMC";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ worldofpeace ];
+ license = licenses.cc-by-nc-sa-30;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/pkgs/applications/video/kodi-packages/pdfreader/default.nix
new file mode 100644
index 000000000000..8896a94c9c39
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/pdfreader/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+buildKodiAddon rec {
+ pname = "pdfreader";
+ namespace = "plugin.image.pdf";
+ version = "2.0.2";
+
+ src = fetchFromGitHub {
+ owner = "i96751414";
+ repo = "plugin.image.pdfreader";
+ rev = "v${version}";
+ sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml";
+ };
+
+ meta = with lib; {
+ homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
+ description = "A comic book reader";
+ license = licenses.gpl2Plus;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
new file mode 100644
index 000000000000..ba1a0241ffe8
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
@@ -0,0 +1,23 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, jsoncpp, libhdhomerun }:
+buildKodiBinaryAddon rec {
+ pname = "pvr-hdhomerun";
+ namespace = "pvr.hdhomerun";
+ version = "7.1.0";
+
+ src = fetchFromGitHub {
+ owner = "kodi-pvr";
+ repo = "pvr.hdhomerun";
+ rev = "${version}-${rel}";
+ sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
+ };
+
+ extraBuildInputs = [ jsoncpp libhdhomerun ];
+
+ meta = with lib; {
+ homepage = "https://github.com/kodi-pvr/pvr.hdhomerun";
+ description = "Kodi's HDHomeRun PVR client addon";
+ platforms = platforms.all;
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
new file mode 100644
index 000000000000..32b4a035bfee
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
@@ -0,0 +1,21 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub }:
+buildKodiBinaryAddon rec {
+ pname = "pvr-hts";
+ namespace = "pvr.hts";
+ version = "8.2.4";
+
+ src = fetchFromGitHub {
+ owner = "kodi-pvr";
+ repo = "pvr.hts";
+ rev = "${version}-${rel}";
+ sha256 = "sha256-05RSB4ZwwZSzY2b1/MRw6zzl/HhMbeVhCVCOj3gSTWA=";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/kodi-pvr/pvr.hts";
+ description = "Kodi's Tvheadend HTSP client addon";
+ platforms = platforms.all;
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
new file mode 100644
index 000000000000..9f160b4fa611
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
@@ -0,0 +1,23 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, zlib, pugixml }:
+buildKodiBinaryAddon rec {
+ pname = "pvr-iptvsimple";
+ namespace = "pvr.iptvsimple";
+ version = "7.4.2";
+
+ src = fetchFromGitHub {
+ owner = "kodi-pvr";
+ repo = "pvr.iptvsimple";
+ rev = "${version}-${rel}";
+ sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
+ };
+
+ extraBuildInputs = [ zlib pugixml ];
+
+ meta = with lib; {
+ homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
+ description = "Kodi's IPTV Simple client addon";
+ platforms = platforms.all;
+ license = licenses.gpl2Plus;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/requests/default.nix b/pkgs/applications/video/kodi-packages/requests/default.nix
new file mode 100644
index 000000000000..7d79abd0872e
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/requests/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, certifi, chardet, idna, urllib3 }:
+buildKodiAddon rec {
+ pname = "requests";
+ namespace = "script.module.requests";
+ version = "2.22.0+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "09576galkyzhw8fhy2h4aablm5rm2v08g0mdmg9nn55dlxhkkljq";
+ };
+
+ propagatedBuildInputs = [
+ certifi
+ chardet
+ idna
+ urllib3
+ ];
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.requests";
+ };
+
+ meta = with lib; {
+ homepage = "http://python-requests.org";
+ description = "Python HTTP for Humans";
+ license = licenses.asl20;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/signals/default.nix b/pkgs/applications/video/kodi-packages/signals/default.nix
new file mode 100644
index 000000000000..bba7b112e9f0
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/signals/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "signals";
+ namespace = "script.module.addon.signals";
+ version = "0.0.6+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.signals";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/ruuk/script.module.addon.signals";
+ description = "Provides signal/slot mechanism for inter-addon communication";
+ license = licenses.lgpl21Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/six/default.nix b/pkgs/applications/video/kodi-packages/six/default.nix
new file mode 100644
index 000000000000..8d7b8f936f3a
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/six/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+
+buildKodiAddon rec {
+ pname = "six";
+ namespace = "script.module.six";
+ version = "1.14.0+matrix.2";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "1f9g43j4y5x7b1bgbwqqfj0p2bkqjpycj17dj7a9j271mcr5zhwb";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.six";
+ };
+
+ meta = with lib; {
+ homepage = "https://pypi.org/project/six/";
+ description = "Python 2 and 3 compatibility utilities";
+ license = licenses.mit;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/steam-controller/default.nix b/pkgs/applications/video/kodi-packages/steam-controller/default.nix
new file mode 100644
index 000000000000..d2b79029f7cc
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/steam-controller/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiBinaryAddon, fetchFromGitHub, libusb1 }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "peripheral.steamcontroller";
+ version = "0.11.0";
+
+ src = fetchFromGitHub {
+ owner = "kodi-game";
+ repo = namespace;
+ rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
+ sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
+ };
+
+ extraBuildInputs = [ libusb1 ];
+
+ meta = with lib; {
+ description = "Binary addon for steam controller.";
+ platforms = platforms.all;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/steam-launcher/default.nix b/pkgs/applications/video/kodi-packages/steam-launcher/default.nix
new file mode 100644
index 000000000000..c4a695b8f813
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/steam-launcher/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildKodiAddon, fetchFromGitHub, steam }:
+buildKodiAddon {
+ pname = "steam-launcher";
+ namespace = "script.steam.launcher";
+ version = "3.5.1";
+
+ src = fetchFromGitHub rec {
+ owner = "teeedubb";
+ repo = owner + "-xbmc-repo";
+ rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55";
+ sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k";
+ };
+
+ propagatedBuildInputs = [ steam ];
+
+ meta = with lib; {
+ homepage = "https://forum.kodi.tv/showthread.php?tid=157499";
+ description = "Launch Steam in Big Picture Mode from Kodi";
+ longDescription = ''
+ This add-on will close/minimise Kodi, launch Steam in Big
+ Picture Mode and when Steam BPM is exited (either by quitting
+ Steam or returning to the desktop) Kodi will
+ restart/maximise. Running pre/post Steam scripts can be
+ configured via the addon.
+ '';
+ license = licenses.gpl2Only;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/svtplay/default.nix b/pkgs/applications/video/kodi-packages/svtplay/default.nix
new file mode 100644
index 000000000000..db4fbb642c05
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/svtplay/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+buildKodiAddon rec {
+ pname = "svtplay";
+ namespace = "plugin.video.svtplay";
+ version = "5.1.12";
+
+ src = fetchFromGitHub {
+ owner = "nilzen";
+ repo = "xbmc-" + pname;
+ rev = "v${version}";
+ sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6";
+ };
+
+ meta = with lib; {
+ homepage = "https://forum.kodi.tv/showthread.php?tid=67110";
+ description = "Watch content from SVT Play";
+ longDescription = ''
+ With this addon you can stream content from SVT Play
+ (svtplay.se). The plugin fetches the video URL from the SVT
+ Play website and feeds it to the Kodi video player. HLS (m3u8)
+ is the preferred video format by the plugin.
+ '';
+ platforms = platforms.all;
+ license = licenses.gpl3Plus;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/urllib3/default.nix b/pkgs/applications/video/kodi-packages/urllib3/default.nix
new file mode 100644
index 000000000000..e3127a8d1188
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/urllib3/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "urllib3";
+ namespace = "script.module.urllib3";
+ version = "1.25.8+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "080yq8ns0sag6rmdag1hjwi0whcmp35wzqjp3by92m81cpszs75q";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.urllib3";
+ };
+
+ meta = with lib; {
+ homepage = "https://urllib3.readthedocs.io/en/latest/";
+ description = "HTTP library with thread-safe connection pooling, file post, and more";
+ license = licenses.mit;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix
new file mode 100644
index 000000000000..6819f7bfdcb0
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libarchive, lzma, bzip2, zlib, lz4, lzo, openssl }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "vfs.libarchive";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
+ };
+
+ extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
+
+ meta = with lib; {
+ description = "LibArchive Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix b/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix
new file mode 100644
index 000000000000..e41f008281ad
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, openssl, libssh, zlib }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "vfs.sftp";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
+ };
+
+ extraBuildInputs = [ openssl libssh zlib ];
+
+ meta = with lib; {
+ description = "SFTP Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/pkgs/applications/video/kodi/build-kodi-addon.nix b/pkgs/applications/video/kodi/build-kodi-addon.nix
new file mode 100644
index 000000000000..572d5dda8053
--- /dev/null
+++ b/pkgs/applications/video/kodi/build-kodi-addon.nix
@@ -0,0 +1,25 @@
+{ stdenv, toKodiAddon, addonDir }:
+{ name ? "${attrs.pname}-${attrs.version}"
+, namespace
+, sourceDir ? ""
+, ... } @ attrs:
+toKodiAddon (stdenv.mkDerivation ({
+ name = "kodi-" + name;
+
+ dontStrip = true;
+
+ extraRuntimeDependencies = [ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ cd $src/$sourceDir
+ d=$out${addonDir}/${namespace}
+ mkdir -p $d
+ sauce="."
+ [ -d ${namespace} ] && sauce=${namespace}
+ cp -R "$sauce/"* $d
+
+ runHook postInstall
+ '';
+} // attrs))
diff --git a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix
new file mode 100644
index 000000000000..e0ca5d1cf6eb
--- /dev/null
+++ b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix
@@ -0,0 +1,35 @@
+{ stdenv, toKodiAddon, addonDir, cmake, kodi, kodi-platform, libcec_platform }:
+{ name ? "${attrs.pname}-${attrs.version}"
+, namespace
+, version
+, extraBuildInputs ? []
+, extraRuntimeDependencies ? []
+, extraInstallPhase ? "", ... } @ attrs:
+toKodiAddon (stdenv.mkDerivation ({
+ name = "kodi-" + name;
+
+ dontStrip = true;
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
+
+ inherit extraRuntimeDependencies;
+
+ # disables check ensuring install prefix is that of kodi
+ cmakeFlags = [
+ "-DOVERRIDE_PATHS=1"
+ ];
+
+ # kodi checks for addon .so libs existance in the addon folder (share/...)
+ # and the non-wrapped kodi lib/... folder before even trying to dlopen
+ # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
+ installPhase = let n = namespace; in ''
+ runHook preInstall
+
+ make install
+ ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version}
+ ${extraInstallPhase}
+
+ runHook postInstall
+ '';
+} // attrs))
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 55ba84cc454c..3f382efff11b 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
let
unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]);
- kodiPackages = callPackage ./packages.nix { kodi = unwrapped; };
+ kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = unwrapped; };
in
unwrapped.overrideAttrs (oldAttrs: {
passthru = oldAttrs.passthru // {
diff --git a/pkgs/applications/video/kodi/packages.nix b/pkgs/applications/video/kodi/packages.nix
deleted file mode 100644
index 8e0ecbf9b9b7..000000000000
--- a/pkgs/applications/video/kodi/packages.nix
+++ /dev/null
@@ -1,560 +0,0 @@
-{ lib, stdenv, callPackage, fetchFromGitHub
-, cmake, kodi, libcec_platform, tinyxml, pugixml
-, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib
-, python3Packages, expat, glib, nspr, nss, openssl
-, libssh, libarchive, lzma, bzip2, lz4, lzo }:
-
-with lib;
-
-let self = rec {
-
- addonDir = "/share/kodi/addons";
- rel = "Matrix";
-
- inherit kodi;
-
- # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
- toKodiAddon = drv: drv.overrideAttrs(oldAttrs: {
- # Use passthru in order to prevent rebuilds when possible.
- passthru = (oldAttrs.passthru or {})// {
- kodiAddonFor = kodi;
- requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs;
- };
- });
-
- # Check whether a derivation provides a Kodi addon.
- hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi;
-
- # Get list of required Kodi addons given a list of derivations.
- requiredKodiAddons = drvs: let
- modules = filter hasKodiAddon drvs;
- in unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules));
-
- kodi-platform = stdenv.mkDerivation rec {
- project = "kodi-platform";
- version = "17.1";
- name = "${project}-${version}";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = project;
- rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
- sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
- };
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ kodi libcec_platform tinyxml ];
- };
-
- buildKodiAddon =
- { name ? "${attrs.pname}-${attrs.version}"
- , namespace
- , sourceDir ? ""
- , ... } @ attrs:
- toKodiAddon (stdenv.mkDerivation ({
- name = "kodi-" + name;
-
- dontStrip = true;
-
- extraRuntimeDependencies = [ ];
-
- installPhase = ''
- cd $src/$sourceDir
- d=$out${addonDir}/${namespace}
- mkdir -p $d
- sauce="."
- [ -d ${namespace} ] && sauce=${namespace}
- cp -R "$sauce/"* $d
- '';
- } // attrs));
-
- buildKodiBinaryAddon =
- { name ? "${attrs.pname}-${attrs.version}"
- , namespace
- , version
- , extraBuildInputs ? []
- , extraRuntimeDependencies ? []
- , extraInstallPhase ? "", ... } @ attrs:
- toKodiAddon (stdenv.mkDerivation ({
- name = "kodi-" + name;
-
- dontStrip = true;
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
-
- inherit extraRuntimeDependencies;
-
- # disables check ensuring install prefix is that of kodi
- cmakeFlags = [
- "-DOVERRIDE_PATHS=1"
- ];
-
- # kodi checks for addon .so libs existance in the addon folder (share/...)
- # and the non-wrapped kodi lib/... folder before even trying to dlopen
- # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
- installPhase = let n = namespace; in ''
- make install
- ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version}
- ${extraInstallPhase}
- '';
- } // attrs));
-
- advanced-launcher = buildKodiAddon rec {
-
- pname = "advanced-launcher";
- namespace = "plugin.program.advanced.launcher";
- version = "2.5.8";
-
- src = fetchFromGitHub {
- owner = "edwtjo";
- repo = pname;
- rev = version;
- sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=85724";
- description = "A program launcher for Kodi";
- longDescription = ''
- Advanced Launcher allows you to start any Linux, Windows and
- macOS external applications (with command line support or not)
- directly from the Kodi GUI. Advanced Launcher also give you
- the possibility to edit, download (from Internet resources)
- and manage all the meta-data (informations and images) related
- to these applications.
- '';
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
- };
-
- };
-
- advanced-emulator-launcher = buildKodiAddon rec {
-
- pname = "advanced-emulator-launcher";
- namespace = "plugin.program.advanced.emulator.launcher";
- version = "0.9.6";
-
- src = fetchFromGitHub {
- owner = "Wintermute0110";
- repo = namespace;
- rev = version;
- sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=287826";
- description = "A program launcher for Kodi";
- longDescription = ''
- Advanced Emulator Launcher is a multi-emulator front-end for Kodi
- scalable to collections of thousands of ROMs. Includes offline scrapers
- for MAME and No-Intro ROM sets and also supports scrapping ROM metadata
- and artwork online. ROM auditing for No-Intro ROMs using No-Intro XML
- DATs. Launching of games and standalone applications is also available.
- '';
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
- };
-
- };
-
- controllers = let
- pname = "game-controller";
- version = "1.0.3";
-
- src = fetchFromGitHub {
- owner = "kodi-game";
- repo = "kodi-game-controllers";
- rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18";
- sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
- };
-
- meta = {
- description = "Add support for different gaming controllers.";
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- mkController = controller: {
- ${controller} = buildKodiAddon rec {
- pname = pname + "-" + controller;
- namespace = "game.controller." + controller;
- sourceDir = "addons/" + namespace;
- inherit version src meta;
- };
- };
- in (mkController "default")
- // (mkController "dreamcast")
- // (mkController "gba")
- // (mkController "genesis")
- // (mkController "mouse")
- // (mkController "n64")
- // (mkController "nes")
- // (mkController "ps")
- // (mkController "snes");
-
- hyper-launcher = let
- pname = "hyper-launcher";
- version = "1.5.2";
- src = fetchFromGitHub rec {
- name = pname + "-" + version + ".tar.gz";
- owner = "teeedubb";
- repo = owner + "-xbmc-repo";
- rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6";
- sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
- };
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=258159";
- description = "A ROM launcher for Kodi that uses HyperSpin assets.";
- maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
- };
- in {
- service = buildKodiAddon {
- pname = pname + "-service";
- version = "1.2.1";
- namespace = "service.hyper.launcher";
- inherit src meta;
- };
- plugin = buildKodiAddon {
- namespace = "plugin.hyper.launcher";
- inherit pname version src meta;
- };
- };
-
- joystick = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "peripheral.joystick";
- version = "1.7.1";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = namespace;
- rev = "${version}-${rel}";
- sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
- };
-
- meta = {
- description = "Binary addon for raw joystick input.";
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- extraBuildInputs = [ tinyxml udev ];
- };
-
- simpleplugin = buildKodiAddon rec {
- pname = "simpleplugin";
- namespace = "script.module.simpleplugin";
- version = "2.3.2";
-
- src = fetchFromGitHub {
- owner = "romanvm";
- repo = namespace;
- rev = "v.${version}";
- sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j";
- };
-
- meta = {
- homepage = src.meta.homepage;
- description = "Simpleplugin API";
- license = licenses.gpl3;
- broken = true; # requires port to python3
- };
- };
-
- svtplay = buildKodiAddon rec {
-
- pname = "svtplay";
- namespace = "plugin.video.svtplay";
- version = "5.1.12";
-
- src = fetchFromGitHub {
- name = pname + "-" + version + ".tar.gz";
- owner = "nilzen";
- repo = "xbmc-" + pname;
- rev = "v${version}";
- sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=67110";
- description = "Watch content from SVT Play";
- longDescription = ''
- With this addon you can stream content from SVT Play
- (svtplay.se). The plugin fetches the video URL from the SVT
- Play website and feeds it to the Kodi video player. HLS (m3u8)
- is the preferred video format by the plugin.
- '';
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- };
-
- steam-controller = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "peripheral.steamcontroller";
- version = "0.11.0";
-
- src = fetchFromGitHub {
- owner = "kodi-game";
- repo = namespace;
- rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
- sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
- };
-
- extraBuildInputs = [ libusb1 ];
-
- meta = {
- description = "Binary addon for steam controller.";
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- };
-
- steam-launcher = buildKodiAddon {
-
- pname = "steam-launcher";
- namespace = "script.steam.launcher";
- version = "3.5.1";
-
- src = fetchFromGitHub rec {
- owner = "teeedubb";
- repo = owner + "-xbmc-repo";
- rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55";
- sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k";
- };
-
- propagatedBuildInputs = [ steam ];
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=157499";
- description = "Launch Steam in Big Picture Mode from Kodi";
- longDescription = ''
- This add-on will close/minimise Kodi, launch Steam in Big
- Picture Mode and when Steam BPM is exited (either by quitting
- Steam or returning to the desktop) Kodi will
- restart/maximise. Running pre/post Steam scripts can be
- configured via the addon.
- '';
- maintainers = with maintainers; [ edwtjo ];
- };
- };
-
- pdfreader = buildKodiAddon rec {
- pname = "pdfreader";
- namespace = "plugin.image.pdf";
- version = "2.0.2";
-
- src = fetchFromGitHub {
- owner = "i96751414";
- repo = "plugin.image.pdfreader";
- rev = "v${version}";
- sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
- description = "A comic book reader";
- maintainers = with maintainers; [ edwtjo ];
- };
- };
-
- pvr-hts = buildKodiBinaryAddon rec {
-
- pname = "pvr-hts";
- namespace = "pvr.hts";
- version = "8.2.2";
-
- src = fetchFromGitHub {
- owner = "kodi-pvr";
- repo = "pvr.hts";
- rev = "${version}-${rel}";
- sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q";
- };
-
- meta = {
- homepage = "https://github.com/kodi-pvr/pvr.hts";
- description = "Kodi's Tvheadend HTSP client addon";
- platforms = platforms.all;
- maintainers = with maintainers; [ cpages ];
- };
-
- };
-
- pvr-hdhomerun = buildKodiBinaryAddon rec {
-
- pname = "pvr-hdhomerun";
- namespace = "pvr.hdhomerun";
- version = "7.1.0";
-
- src = fetchFromGitHub {
- owner = "kodi-pvr";
- repo = "pvr.hdhomerun";
- rev = "${version}-${rel}";
- sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
- };
-
- meta = {
- homepage = "https://github.com/kodi-pvr/pvr.hdhomerun";
- description = "Kodi's HDHomeRun PVR client addon";
- platforms = platforms.all;
- maintainers = with maintainers; [ titanous ];
- };
-
- extraBuildInputs = [ jsoncpp libhdhomerun ];
-
- };
-
- pvr-iptvsimple = buildKodiBinaryAddon rec {
-
- pname = "pvr-iptvsimple";
- namespace = "pvr.iptvsimple";
- version = "7.4.2";
-
- src = fetchFromGitHub {
- owner = "kodi-pvr";
- repo = "pvr.iptvsimple";
- rev = "${version}-${rel}";
- sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
- };
-
- meta = {
- homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
- description = "Kodi's IPTV Simple client addon";
- platforms = platforms.all;
- maintainers = with maintainers; [ ];
- license = licenses.gpl2Plus;
- };
-
- extraBuildInputs = [ zlib pugixml ];
- };
-
- osmc-skin = buildKodiAddon rec {
-
- pname = "osmc-skin";
- namespace = "skin.osmc";
- version = "18.0.0";
-
- src = fetchFromGitHub {
- owner = "osmc";
- repo = namespace;
- rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0";
- sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s";
- };
-
- meta = {
- homepage = "https://github.com/osmc/skin.osmc";
- description = "The default skin for OSMC";
- platforms = platforms.all;
- maintainers = with maintainers; [ worldofpeace ];
- license = licenses.cc-by-nc-sa-30;
- };
- };
-
- yatp = python3Packages.toPythonModule (buildKodiAddon rec {
- pname = "yatp";
- namespace = "plugin.video.yatp";
- version = "3.3.2";
-
- src = fetchFromGitHub {
- owner = "romanvm";
- repo = "kodi.yatp";
- rev = "v.${version}";
- sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d";
- };
-
- patches = [ ./yatp/dont-monkey.patch ];
-
- propagatedBuildInputs = [
- simpleplugin
- python3Packages.requests
- python3Packages.libtorrent-rasterbar
- ];
-
- meta = {
- homepage = src.meta.homepage;
- description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi";
- license = licenses.gpl3;
- broken = true; # requires port to python3
- };
- });
-
- inputstream-adaptive = buildKodiBinaryAddon rec {
-
- pname = "inputstream-adaptive";
- namespace = "inputstream.adaptive";
- version = "2.6.7";
-
- src = fetchFromGitHub {
- owner = "peak3d";
- repo = "inputstream.adaptive";
- rev = "${version}-${rel}";
- sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s";
- };
-
- extraBuildInputs = [ expat ];
-
- extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
-
- extraInstallPhase = let n = namespace; in ''
- ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so
- '';
-
- meta = {
- homepage = "https://github.com/peak3d/inputstream.adaptive";
- description = "Kodi inputstream addon for several manifest types";
- platforms = platforms.all;
- maintainers = with maintainers; [ sephalon ];
- };
- };
-
- vfs-sftp = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "vfs.sftp";
- version = "2.0.0";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = namespace;
- rev = "${version}-${rel}";
- sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
- };
-
- meta = with lib; {
- description = "SFTP Virtual Filesystem add-on for Kodi";
- license = licenses.gpl2Plus;
- platforms = platforms.all;
- maintainers = with maintainers; [ minijackson ];
- };
-
- extraBuildInputs = [ openssl libssh zlib ];
- };
-
- vfs-libarchive = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "vfs.libarchive";
- version = "2.0.0";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = namespace;
- rev = "${version}-${rel}";
- sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
- };
-
- meta = with lib; {
- description = "LibArchive Virtual Filesystem add-on for Kodi";
- license = licenses.gpl2Plus;
- platforms = platforms.all;
- maintainers = with maintainers; [ minijackson ];
- };
-
- extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
- };
-}; in self
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 2a713324c3fb..1b665418f3f9 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -237,6 +237,6 @@ in stdenv.mkDerivation {
homepage = "https://kodi.tv/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ];
+ maintainers = teams.kodi.members;
};
}
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index 2b4abbb500af..86164682138d 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -1,5 +1,10 @@
{ lib, makeWrapper, buildEnv, kodi, addons }:
+let
+ # linux distros are supposed to provide pillow and pycryptodome
+ requiredPythonPackages = with kodi.pythonPackages; [ pillow pycryptodome] ++ addons;
+in
+
buildEnv {
name = "${kodi.name}-env";
@@ -13,7 +18,7 @@ buildEnv {
for exe in kodi{,-standalone}
do
makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
- --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath addons} \
+ --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath requiredPythonPackages} \
--prefix KODI_HOME : $out/share/kodi \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
(lib.concatMap
diff --git a/pkgs/applications/video/kodi/yatp/dont-monkey.patch b/pkgs/applications/video/kodi/yatp/dont-monkey.patch
deleted file mode 100644
index 62d5d0c0d4c0..000000000000
--- a/pkgs/applications/video/kodi/yatp/dont-monkey.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/plugin.video.yatp/server.py b/plugin.video.yatp/server.py
-index 1adcbb5..488b72c 100644
---- a/plugin.video.yatp/server.py
-+++ b/plugin.video.yatp/server.py
-@@ -20,24 +20,8 @@ addon = Addon()
- _ = addon.initialize_gettext()
- addon.log_notice('Starting Torrent Server...')
-
--# A monkey-patch to set the necessary librorrent version
--librorrent_addon = Addon('script.module.libtorrent')
--orig_custom_version = librorrent_addon.get_setting('custom_version', False)
--orig_set_version = librorrent_addon.get_setting('set_version', False)
--librorrent_addon.set_setting('custom_version', 'true')
--if addon.libtorrent_version == '1.0.9':
-- librorrent_addon.set_setting('set_version', '4')
--elif addon.libtorrent_version == '1.1.0':
-- librorrent_addon.set_setting('set_version', '5')
--elif addon.libtorrent_version == '1.1.1':
-- librorrent_addon.set_setting('set_version', '6')
--else:
-- librorrent_addon.set_setting('set_version', '0')
--
- from libs.server import wsgi_app
-
--librorrent_addon.set_setting('custom_version', orig_custom_version)
--librorrent_addon.set_setting('set_version', orig_set_version)
- # ======
-
- if addon.enable_limits:
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index cec6468c43be..817daf31d0aa 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -13,21 +13,21 @@
}:
let
- version = "1.15.4";
+ version = "1.16.3";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
- hash = "sha256-Reun5hp7Rnsf6N5yL6iQ1Vbhnz/AKnt/jYRqyOK625o=";
+ hash = "sha256-G2XceMwiFu4fWT4L3HJzDB/rD3eSX6ko6RdVw72QLzg=";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
- hash = "sha256-gtBi1IRNF5ASk/ZdzkDmOuEIT9gazNaRNCftqbLEP+M=";
+ hash = "sha256-YUGozP9B6vmWQ4WxctSbezzu+0yLJXNKQk9TwnQF8F0=";
};
in mkDerivation {
pname = "makemkv";
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 39d2f1e21cee..d26acfd7c0b5 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
- version = "53.0.0";
+ version = "55.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "04wjs3sgb3gn85gl8y1svx177d1213hswx37zdsj80giw1k5df79";
+ sha256 = "129azp4cpdd05f6072gkxdjj811aqs29nbw6v6qm8vv47gfvjcf7";
};
nativeBuildInputs = [
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
];
CXXFLAGS = optional stdenv.cc.isClang "-std=c++17";
+ LDFLAGS = optional stdenv.cc.isClang "-lc++fs";
dontWrapQtApps = true;
postFixup = optionalString withGUI ''
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Cross-platform tools for Matroska";
homepage = "http://www.bunkus.org/videotools/mkvtoolnix/";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
maintainers = with maintainers; [ codyopel rnhmjoj ];
platforms = platforms.linux
++ optionals (!withGUI) platforms.darwin;
diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix
new file mode 100644
index 000000000000..cda15b2674c0
--- /dev/null
+++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix
@@ -0,0 +1,36 @@
+{ fetchFromGitHub, lib, python3, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "mpv_thumbnail_script";
+ version = "unstable-2020-01-16";
+
+ src = fetchFromGitHub {
+ owner = "theamm";
+ repo = pname;
+ rev = "682becf5b5115c2a206b4f0bdee413d4be8b5bef";
+ sha256 = "0dgfrb8ypc5vlq35kzn423fm6l6348ivl85vb6j3ccc9a51xprw3";
+ };
+
+ nativeBuildInputs = [ python3 ];
+
+ postPatch = ''
+ patchShebangs concat_files.py
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/share/mpv/scripts
+ cp mpv_thumbnail_script_{client_osc,server}.lua $out/share/mpv/scripts
+ runHook postInstall
+ '';
+
+ passthru.scriptName = "mpv_thumbnail_script_{client_osc,server}.lua";
+
+ meta = with lib; {
+ description = "A lua script to show preview thumbnails in mpv's OSC seekbar";
+ homepage = "https://github.com/theamm/mpv_thumbnail_script";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 9fdb78c70382..caeffa56b178 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -17,6 +17,7 @@
, libv4l
, x264
, curl
+, wayland
, xorg
, makeWrapper
, pkg-config
@@ -67,6 +68,7 @@ in mkDerivation rec {
qtx11extras
qtsvg
speex
+ wayland
x264
libvlc
makeWrapper
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index 53b46ceeb071..9a5bb5eb4620 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -24,11 +24,11 @@
mkDerivation rec {
pname = "qstopmotion";
- version = "2.4.1";
+ version = "2.5.2";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz";
- sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
+ sha256 = "sha256-jyBUyadkSuQKXOrr5XZ1jy6of1Qw8S2HPxuOrPc7RnE=";
};
buildInputs = [
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index a8d2aaaff0ee..007ef4262ef2 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,26 +1,53 @@
-{ lib, mkDerivation, fetchurl, qmake, qtscript }:
+{ lib
+, stdenv
+, fetchurl
+, qmake
+, qtscript
+, wrapQtAppsHook
+}:
-mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "smplayer";
- version = "20.6.0";
+ version = "21.1.0";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "0c59gfgm2ya8yb2nx7gy1zc0nrr4206213xy86y7jw0bk9mmjxmy";
+ hash = "sha256-Y0uq32XoQ8fpIJDScRfA7p3RYd6x1PWZSsYyAYYKf/c=";
};
+ nativeBuildInputs = [ qmake wrapQtAppsHook ];
buildInputs = [ qtscript ];
- nativeBuildInputs = [ qmake ];
dontUseQmakeConfigure = true;
- makeFlags = [ "PREFIX=${placeholder "out"}" ];
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
- meta = {
- description = "A complete front-end for MPlayer";
- longDescription = "Either mplayer or mpv should also be installed for smplayer to play medias";
+ meta = with lib; {
homepage = "https://www.smplayer.info";
- license = lib.licenses.gpl3Plus;
- platforms = lib.platforms.linux;
+ description = "A complete front-end for MPlayer";
+ longDescription = ''
+ SMPlayer is a free media player for Windows and Linux with built-in codecs
+ that can play virtually all video and audio formats. It doesn't need any
+ external codecs. Just install SMPlayer and you'll be able to play all
+ formats without the hassle to find and install codec packs.
+
+ One of the most interesting features of SMPlayer: it remembers the
+ settings of all files you play. So you start to watch a movie but you have
+ to leave... don't worry, when you open that movie again it will be resumed
+ at the same point you left it, and with the same settings: audio track,
+ subtitles, volume...
+
+ SMPlayer is a graphical user interface (GUI) for the award-winning
+ MPlayer, which is capable of playing almost all known video and audio
+ formats. But apart from providing access for the most common and useful
+ options of MPlayer, SMPlayer adds other interesting features like the
+ possibility to play Youtube videos or download subtitles.
+ '';
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.linux;
};
}
+# TODO [ AndersonTorres ]: some form of wrapping mplayer/mpv around it
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index f79899259602..adb7ba970e29 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
- systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
+ systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
++ optional jackSupport libjack2
++ optionals chromecastSupport [ protobuf libmicrodns ];
- nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ]
+ nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo unzip ]
++ optionals withQt5 [ wrapQtAppsHook ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index ac3dd320d3a3..7660edcc7683 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -1,6 +1,6 @@
{
alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype,
- gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor,
+ gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor,
libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core
}:
@@ -19,7 +19,7 @@
freetype
gdk-pixbuf
glib
- gnome3.gtk
+ gtk3
pango
libuuid
libX11
diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/applications/virtualization/catatonit/default.nix
new file mode 100644
index 000000000000..c44db31f50cb
--- /dev/null
+++ b/pkgs/applications/virtualization/catatonit/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }:
+
+stdenv.mkDerivation rec {
+ pname = "catatonit";
+ version = "0.1.5";
+
+ src = fetchFromGitHub {
+ owner = "openSUSE";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "ciJ1MI7jr5P2PgxIykQ+BiwNUO8lQHGt0+U8CNbc5bI=";
+ };
+
+ patches = [
+ # Fix compilation with musl
+ (fetchpatch {
+ url = "https://github.com/openSUSE/catatonit/commit/75014b1c3099245b7d0f44f24d7f6dc4888a45fd.patch";
+ sha256 = "sha256-9VMNUT1U90ocjvE7EXYfLxuodDwTXXHYg89qqa5Jq0g=";
+ })
+ ];
+
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ readelf -d $out/bin/catatonit | grep 'There is no dynamic section in this file.'
+ '';
+
+ passthru.tests = { inherit (nixosTests) podman; };
+
+ meta = with lib; {
+ description = "A container init that is so simple it's effectively brain-dead";
+ homepage = "https://github.com/openSUSE/catatonit";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ erosennin ] ++ teams.podman.members;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index a9e332e2a4c8..c050057678d2 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -21,12 +21,12 @@ buildPythonApplication rec {
nativeBuildInputs = [ installShellFiles ];
checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [
- pyyaml backports_ssl_match_hostname colorama dockerpty docker
+ pyyaml colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client
docopt cached-property paramiko distro python-dotenv
- ] ++
- lib.optional (pythonOlder "3.4") enum34 ++
- lib.optional (pythonOlder "3.2") functools32;
+ ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
+ ++ lib.optional (pythonOlder "3.4") enum34
+ ++ lib.optional (pythonOlder "3.2") functools32;
postPatch = ''
# Remove upper bound on requires, see also
diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix
index f97f13dab2a4..42e1eaf56d4d 100644
--- a/pkgs/applications/virtualization/seabios/default.nix
+++ b/pkgs/applications/virtualization/seabios/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, iasl, python }:
+{ lib, stdenv, fetchurl, iasl, python3 }:
stdenv.mkDerivation rec {
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1zc1brgafbbf5hmdr1qc1p859cabpz73l8sklq83xa4sn9icqw7b";
};
- buildInputs = [ iasl python ];
+ nativeBuildInputs = [ python3 ];
+
+ buildInputs = [ iasl ];
+
+ strictDeps = true;
hardeningDisable = [ "pic" "stackprotector" "fortify" ];
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index a51a58d21eeb..28e28fa591a6 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -15,11 +15,11 @@ with lib;
buildGoPackage rec {
pname = "singularity";
- version = "3.7.1";
+ version = "3.7.2";
src = fetchurl {
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
- sha256 = "sha256-gtLGUGNWAZXsNFUZMb48MluV6OIAnpJ1X9farTRuCDw=";
+ sha256 = "sha256-NpFiIuJvuTRATwdm4P82jtrDbX/DHKVx9fYJRmYJBms=";
};
goPackagePath = "github.com/sylabs/singularity";
diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix
index 12dfc713fd2c..054918dabf12 100644
--- a/pkgs/applications/virtualization/spike/default.nix
+++ b/pkgs/applications/virtualization/spike/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, dtc, nixosTests }:
+{ lib, stdenv, fetchgit, dtc, nixosTests, fetchpatch }:
stdenv.mkDerivation rec {
pname = "spike";
@@ -13,7 +13,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ dtc ];
enableParallelBuilding = true;
- patchPhase = ''
+ patches = [
+ # Add missing headers to fix build.
+ (fetchpatch {
+ url = "https://github.com/riscv/riscv-isa-sim/commit/b3855682c2d744c613d2ffd6b53e3f021ecea4f3.patch";
+ sha256 = "1v1mpp4iddf5n4h3kmj65g075m7xc31bxww7gldnmgl607ma7cnl";
+ })
+ ];
+
+ postPatch = ''
patchShebangs scripts/*.sh
patchShebangs tests/ebreak.py
'';
diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix
index d6ac6aeb84e7..9d524019ad5f 100644
--- a/pkgs/applications/window-managers/wayfire/wcm.nix
+++ b/pkgs/applications/window-managers/wayfire/wcm.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook
-, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
+, gtk3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
buildInputs = [
- gnome3.gtk libevdev libxml2 wayfire wayland
+ gtk3 libevdev libxml2 wayfire wayland
wayland-protocols wf-config wf-shell
];
diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix
index 3948e9a32abc..cc99e79fca8d 100644
--- a/pkgs/applications/window-managers/wayfire/wf-shell.nix
+++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git
-, alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config
+, alsaLib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [
- alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config
+ alsaLib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config
];
mesonFlags = [ "--sysconfdir" "/etc" ];
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index b78b7c015703..0acad8edbe59 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
EOF
'';
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ unzip libixp_hg txt2tags dash python which
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ libixp_hg txt2tags dash python which
libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 2a13d107bd0f..7659c9f42a10 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -184,6 +184,7 @@ rec {
# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage
libtool.lib # for Synfigstudio
+ xorg.libxshmfence # for apple-music-electron
at-spi2-core
];
};
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 3243e883e4d5..dac1f3bd7c10 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -306,6 +306,10 @@ stdenv.mkDerivation {
done
''
+ + optionalString stdenv.targetPlatform.isDarwin ''
+ echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
+ ''
+
+ ''
for flags in "$out/nix-support"/*flags*; do
substituteInPlace "$flags" --replace $'\n' ' '
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 7f2427777f92..5fafc36273a0 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -36,8 +36,9 @@ lib.makeOverridable
, # Shell commands to run after building the symlink tree.
postBuild ? ""
-, # Additional inputs. Handy e.g. if using makeWrapper in `postBuild`.
- buildInputs ? []
+# Additional inputs
+, nativeBuildInputs ? [] # Handy e.g. if using makeWrapper in `postBuild`.
+, buildInputs ? []
, passthru ? {}
, meta ? {}
@@ -53,7 +54,8 @@ in
runCommand name
rec {
inherit manifest ignoreCollisions checkCollisionContents passthru
- meta pathsToLink extraPrefix postBuild buildInputs;
+ meta pathsToLink extraPrefix postBuild
+ nativeBuildInputs buildInputs;
pkgs = builtins.toJSON (map (drv: {
paths =
# First add the usual output(s): respect if user has chosen explicitly,
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 1450218aff27..d08fd24cd2d6 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -198,7 +198,15 @@ fi
PATH="$path_backup"
# Old bash workaround, see above.
-exec @prog@ \
- ${extraBefore+"${extraBefore[@]}"} \
- ${params+"${params[@]}"} \
- ${extraAfter+"${extraAfter[@]}"}
+
+if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then
+ exec @prog@ @<(printf "%q\n" \
+ ${extraBefore+"${extraBefore[@]}"} \
+ ${params+"${params[@]}"} \
+ ${extraAfter+"${extraAfter[@]}"})
+else
+ exec @prog@ \
+ ${extraBefore+"${extraBefore[@]}"} \
+ ${params+"${params[@]}"} \
+ ${extraAfter+"${extraAfter[@]}"}
+fi
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 65f9791597e8..31689022b326 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -160,6 +160,7 @@ stdenv.mkDerivation {
local dst="$1"
local wrapper="$2"
export prog="$3"
+ export use_response_file_by_default=${if isClang then "1" else "0"}
substituteAll "$wrapper" "$out/bin/$dst"
chmod +x "$out/bin/$dst"
}
@@ -484,6 +485,10 @@ stdenv.mkDerivation {
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
''
+ + optionalString stdenv.targetPlatform.isDarwin ''
+ echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
+ ''
+
##
## Extra custom steps
##
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index fec289f0ff1e..a73737cb1231 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -729,6 +729,8 @@ rec {
name,
# Image tag, the Nix's output hash will be used if null
tag ? null,
+ # Parent image, to append to.
+ fromImage ? null,
# Files to put on the image (a nix store path or list of paths).
contents ? [],
# Docker config; e.g. what command to run on the container.
@@ -791,7 +793,7 @@ rec {
unnecessaryDrvs = [ baseJson overallClosure ];
conf = runCommand "${baseName}-conf.json" {
- inherit maxLayers created;
+ inherit fromImage maxLayers created;
imageName = lib.toLower name;
passthru.imageTag =
if tag != null
@@ -821,6 +823,27 @@ rec {
unnecessaryDrvs}
}
+ # Compute the number of layers that are already used by a potential
+ # 'fromImage' as well as the customization layer. Ensure that there is
+ # still at least one layer available to store the image contents.
+ usedLayers=0
+
+ # subtract number of base image layers
+ if [[ -n "$fromImage" ]]; then
+ (( usedLayers += $(tar -xOf "$fromImage" manifest.json | jq '.[0].Layers | length') ))
+ fi
+
+ # one layer will be taken up by the customisation layer
+ (( usedLayers += 1 ))
+
+ if ! (( $usedLayers < $maxLayers )); then
+ echo >&2 "Error: usedLayers $usedLayers layers to store 'fromImage' and" \
+ "'extraCommands', but only maxLayers=$maxLayers were" \
+ "allowed. At least 1 layer is required to store contents."
+ exit 1
+ fi
+ availableLayers=$(( maxLayers - usedLayers ))
+
# Create $maxLayers worth of Docker Layers, one layer per store path
# unless there are more paths than $maxLayers. In that case, create
# $maxLayers-1 for the most popular layers, and smush the remainaing
@@ -838,18 +861,20 @@ rec {
| (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ]
| map(select(length > 0))
' \
- --argjson maxLayers "$(( maxLayers - 1 ))" # one layer will be taken up by the customisation layer
+ --argjson maxLayers "$availableLayers"
)"
cat ${baseJson} | jq '
. + {
"store_dir": $store_dir,
+ "from_image": $from_image,
"store_layers": $store_layers,
"customisation_layer", $customisation_layer,
"repo_tag": $repo_tag,
"created": $created
}
' --arg store_dir "${storeDir}" \
+ --argjson from_image ${if fromImage == null then "null" else "'\"${fromImage}\"'"} \
--argjson store_layers "$store_layers" \
--arg customisation_layer ${customisationLayer} \
--arg repo_tag "$imageName:$imageTag" \
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 9e33a42af23e..9c7d46812140 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -188,7 +188,25 @@ rec {
};
};
- # 12. example of running something as root on top of a parent image
+ # 12 Create a layered image on top of a layered image
+ layered-on-top-layered = pkgs.dockerTools.buildLayeredImage {
+ name = "layered-on-top-layered";
+ tag = "latest";
+ fromImage = layered-image;
+ extraCommands = ''
+ mkdir ./example-output
+ chmod 777 ./example-output
+ '';
+ config = {
+ Env = [ "PATH=${pkgs.coreutils}/bin/" ];
+ WorkingDir = "/example-output";
+ Cmd = [
+ "${pkgs.bash}/bin/bash" "-c" "echo hello > foo; cat foo"
+ ];
+ };
+ };
+
+ # 13. example of running something as root on top of a parent image
# Regression test related to PR #52109
runAsRootParentImage = buildImage {
name = "runAsRootParentImage";
@@ -197,7 +215,7 @@ rec {
fromImage = bash;
};
- # 13. example of 3 layers images This image is used to verify the
+ # 14. example of 3 layers images This image is used to verify the
# order of layers is correct.
# It allows to validate
# - the layer of parent are below
@@ -235,23 +253,23 @@ rec {
'';
};
- # 14. Environment variable inheritance.
+ # 15. Environment variable inheritance.
# Child image should inherit parents environment variables,
# optionally overriding them.
- environmentVariables = let
- parent = pkgs.dockerTools.buildImage {
- name = "parent";
- tag = "latest";
- config = {
- Env = [
- "FROM_PARENT=true"
- "LAST_LAYER=parent"
- ];
- };
+ environmentVariablesParent = pkgs.dockerTools.buildImage {
+ name = "parent";
+ tag = "latest";
+ config = {
+ Env = [
+ "FROM_PARENT=true"
+ "LAST_LAYER=parent"
+ ];
};
- in pkgs.dockerTools.buildImage {
+ };
+
+ environmentVariables = pkgs.dockerTools.buildImage {
name = "child";
- fromImage = parent;
+ fromImage = environmentVariablesParent;
tag = "latest";
contents = [ pkgs.coreutils ];
config = {
@@ -262,14 +280,27 @@ rec {
};
};
- # 15. Create another layered image, for comparing layers with image 10.
+ environmentVariablesLayered = pkgs.dockerTools.buildLayeredImage {
+ name = "child";
+ fromImage = environmentVariablesParent;
+ tag = "latest";
+ contents = [ pkgs.coreutils ];
+ config = {
+ Env = [
+ "FROM_CHILD=true"
+ "LAST_LAYER=child"
+ ];
+ };
+ };
+
+ # 16. Create another layered image, for comparing layers with image 10.
another-layered-image = pkgs.dockerTools.buildLayeredImage {
name = "another-layered-image";
tag = "latest";
config.Cmd = [ "${pkgs.hello}/bin/hello" ];
};
- # 16. Create a layered image with only 2 layers
+ # 17. Create a layered image with only 2 layers
two-layered-image = pkgs.dockerTools.buildLayeredImage {
name = "two-layered-image";
tag = "latest";
@@ -278,7 +309,7 @@ rec {
maxLayers = 2;
};
- # 17. Create a layered image with more packages than max layers.
+ # 18. Create a layered image with more packages than max layers.
# coreutils and hello are part of the same layer
bulk-layer = pkgs.dockerTools.buildLayeredImage {
name = "bulk-layer";
@@ -289,7 +320,19 @@ rec {
maxLayers = 2;
};
- # 18. Create a "layered" image without nix store layers. This is not
+ # 19. Create a layered image with a base image and more packages than max
+ # layers. coreutils and hello are part of the same layer
+ layered-bulk-layer = pkgs.dockerTools.buildLayeredImage {
+ name = "layered-bulk-layer";
+ tag = "latest";
+ fromImage = two-layered-image;
+ contents = with pkgs; [
+ coreutils hello
+ ];
+ maxLayers = 4;
+ };
+
+ # 20. Create a "layered" image without nix store layers. This is not
# recommended, but can be useful for base images in rare cases.
no-store-paths = pkgs.dockerTools.buildLayeredImage {
name = "no-store-paths";
@@ -321,7 +364,7 @@ rec {
};
};
- # 19. Support files in the store on buildLayeredImage
+ # 21. Support files in the store on buildLayeredImage
# See: https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-653496223
filesInStore = pkgs.dockerTools.buildLayeredImageWithNixDb {
name = "file-in-store";
@@ -341,7 +384,7 @@ rec {
};
};
- # 20. Ensure that setting created to now results in a date which
+ # 22. Ensure that setting created to now results in a date which
# isn't the epoch + 1 for layered images.
unstableDateLayered = pkgs.dockerTools.buildLayeredImage {
name = "unstable-date-layered";
diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py
index 60d67442c169..d7c63eb43a78 100644
--- a/pkgs/build-support/docker/stream_layered_image.py
+++ b/pkgs/build-support/docker/stream_layered_image.py
@@ -33,6 +33,7 @@ function does all this.
import io
import os
+import re
import sys
import json
import hashlib
@@ -126,10 +127,87 @@ class ExtractChecksum:
return (self._digest.hexdigest(), self._size)
+FromImage = namedtuple("FromImage", ["tar", "manifest_json", "image_json"])
# Some metadata for a layer
LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"])
+def load_from_image(from_image_str):
+ """
+ Loads the given base image, if any.
+
+ from_image_str: Path to the base image archive.
+
+ Returns: A 'FromImage' object with references to the loaded base image,
+ or 'None' if no base image was provided.
+ """
+ if from_image_str is None:
+ return None
+
+ base_tar = tarfile.open(from_image_str)
+
+ manifest_json_tarinfo = base_tar.getmember("manifest.json")
+ with base_tar.extractfile(manifest_json_tarinfo) as f:
+ manifest_json = json.load(f)
+
+ image_json_tarinfo = base_tar.getmember(manifest_json[0]["Config"])
+ with base_tar.extractfile(image_json_tarinfo) as f:
+ image_json = json.load(f)
+
+ return FromImage(base_tar, manifest_json, image_json)
+
+
+def add_base_layers(tar, from_image):
+ """
+ Adds the layers from the given base image to the final image.
+
+ tar: 'tarfile.TarFile' object for new layers to be added to.
+ from_image: 'FromImage' object with references to the loaded base image.
+ """
+ if from_image is None:
+ print("No 'fromImage' provided", file=sys.stderr)
+ return []
+
+ layers = from_image.manifest_json[0]["Layers"]
+ checksums = from_image.image_json["rootfs"]["diff_ids"]
+ layers_checksums = zip(layers, checksums)
+
+ for num, (layer, checksum) in enumerate(layers_checksums, start=1):
+ layer_tarinfo = from_image.tar.getmember(layer)
+ checksum = re.sub(r"^sha256:", "", checksum)
+
+ tar.addfile(layer_tarinfo, from_image.tar.extractfile(layer_tarinfo))
+ path = layer_tarinfo.path
+ size = layer_tarinfo.size
+
+ print("Adding base layer", num, "from", path, file=sys.stderr)
+ yield LayerInfo(size=size, checksum=checksum, path=path, paths=[path])
+
+ from_image.tar.close()
+
+
+def overlay_base_config(from_image, final_config):
+ """
+ Overlays the final image 'config' JSON on top of selected defaults from the
+ base image 'config' JSON.
+
+ from_image: 'FromImage' object with references to the loaded base image.
+ final_config: 'dict' object of the final image 'config' JSON.
+ """
+ if from_image is None:
+ return final_config
+
+ base_config = from_image.image_json["config"]
+
+ # Preserve environment from base image
+ final_env = base_config.get("Env", []) + final_config.get("Env", [])
+ if final_env:
+ # Resolve duplicates (last one wins) and format back as list
+ resolved_env = {entry.split("=", 1)[0]: entry for entry in final_env}
+ final_config["Env"] = list(resolved_env.values())
+ return final_config
+
+
def add_layer_dir(tar, paths, store_dir, mtime):
"""
Appends given store paths to a TarFile object as a new layer.
@@ -248,17 +326,21 @@ def main():
mtime = int(created.timestamp())
store_dir = conf["store_dir"]
+ from_image = load_from_image(conf["from_image"])
+
with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar:
layers = []
- for num, store_layer in enumerate(conf["store_layers"]):
- print(
- "Creating layer", num,
- "from paths:", store_layer,
- file=sys.stderr)
+ layers.extend(add_base_layers(tar, from_image))
+
+ start = len(layers) + 1
+ for num, store_layer in enumerate(conf["store_layers"], start=start):
+ print("Creating layer", num, "from paths:", store_layer,
+ file=sys.stderr)
info = add_layer_dir(tar, store_layer, store_dir, mtime=mtime)
layers.append(info)
- print("Creating the customisation layer...", file=sys.stderr)
+ print("Creating layer", len(layers) + 1, "with customisation...",
+ file=sys.stderr)
layers.append(
add_customisation_layer(
tar,
@@ -273,7 +355,7 @@ def main():
"created": datetime.isoformat(created),
"architecture": conf["architecture"],
"os": "linux",
- "config": conf["config"],
+ "config": overlay_base_config(from_image, conf["config"]),
"rootfs": {
"diff_ids": [f"sha256:{layer.checksum}" for layer in layers],
"type": "layers",
diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix
index 2a4bee74197b..402f0071a533 100644
--- a/pkgs/build-support/expand-response-params/default.nix
+++ b/pkgs/build-support/expand-response-params/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src=$PWD
'';
buildPhase = ''
- "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
+ NIX_CC_USE_RESPONSE_FILE=0 "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
'';
installPhase = ''
mkdir -p $prefix/bin
diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix
index 960bc3c1ffb2..ad61b9a51d2b 100644
--- a/pkgs/build-support/fetchnuget/default.nix
+++ b/pkgs/build-support/fetchnuget/default.nix
@@ -19,7 +19,7 @@ else
sourceRoot = ".";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
dontBuild = true;
diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
index 996f4f45d07b..6b59241e01ed 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@@ -108,7 +108,8 @@ stdenv.mkDerivation (
{
name = name + (if src ? version then "-" + src.version else "");
- buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ant jre zip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
postHook = ''
mkdir -p $out/nix-support
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 4c2d82ce630b..bd54401e2356 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -3,7 +3,7 @@
{ name ? "debian-build"
, diskImage
-, src, lib, stdenv, vmTools, checkinstall
+, src, stdenv, vmTools, checkinstall
, fsTranslation ? false
, # Features provided by this package.
debProvides ? []
@@ -21,7 +21,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
prePhases = "installExtraDebsPhase sysInfoPhase";
}
- // removeAttrs args ["vmTools"] //
+ // removeAttrs args ["vmTools" "lib"] //
{
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index bfa6c0d17cd6..ff9ca642daad 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -103,6 +103,8 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u
cargoBuildType = buildType;
+ cargoCheckType = checkType;
+
patchRegistryDeps = ./patch-registry-deps;
nativeBuildInputs = nativeBuildInputs ++ [
diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
index 54f4512d67ca..c10120c5aa19 100644
--- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
@@ -9,6 +9,10 @@ cargoBuildHook() {
pushd "${buildAndTestSubdir}"
fi
+ if [ "${cargoBuildType}" != "debug" ]; then
+ cargoBuildProfileFlag="--${cargoBuildType}"
+ fi
+
(
set -x
env \
@@ -19,7 +23,7 @@ cargoBuildHook() {
cargo build -j $NIX_BUILD_CORES \
--target @rustTargetPlatformSpec@ \
--frozen \
- --${cargoBuildType} \
+ ${cargoBuildProfileFlag} \
${cargoBuildFlags}
)
@@ -32,4 +36,6 @@ cargoBuildHook() {
echo "Finished cargoBuildHook"
}
-buildPhase=cargoBuildHook
+if [ -z "${dontCargoBuild-}" ] && [ -z "${buildPhase-}" ]; then
+ buildPhase=cargoBuildHook
+fi
diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
index 8c5b1a13219a..f0339afb38fa 100644
--- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
@@ -1,4 +1,5 @@
declare -a checkFlags
+declare -a cargoTestFlags
cargoCheckHook() {
echo "Executing cargoCheckHook"
@@ -15,7 +16,11 @@ cargoCheckHook() {
threads=1
fi
- argstr="--${cargoBuildType} --target @rustTargetPlatformSpec@ --frozen";
+ if [ "${cargoBuildType}" != "debug" ]; then
+ cargoBuildProfileFlag="--${cargoBuildType}"
+ fi
+
+ argstr="${cargoBuildProfileFlag} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}";
(
set -x
@@ -36,6 +41,6 @@ cargoCheckHook() {
runHook postCheck
}
-if [ -z "${checkPhase-}" ]; then
+if [ -z "${dontCargoCheck-}" ] && [ -z "${checkPhase-}" ]; then
checkPhase=cargoCheckHook
fi
diff --git a/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/pkgs/build-support/rust/hooks/cargo-install-hook.sh
index e6ffa3007063..69ce72669366 100644
--- a/pkgs/build-support/rust/hooks/cargo-install-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-install-hook.sh
@@ -43,7 +43,7 @@ cargoInstallHook() {
}
-if [ -z "${installPhase-}" ]; then
+if [ -z "${dontCargoInstall-}" ] && [ -z "${installPhase-}" ]; then
installPhase=cargoInstallHook
postBuildHooks+=(cargoInstallPostBuildHook)
fi
diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
index 0fddd30582a1..842e66b5170e 100644
--- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
@@ -77,7 +77,9 @@ cargoSetupPostPatchHook() {
echo "Finished cargoSetupPostPatchHook"
}
-postUnpackHooks+=(cargoSetupPostUnpackHook)
+if [ -z "${dontCargoSetupPostUnpack-}" ]; then
+ postUnpackHooks+=(cargoSetupPostUnpackHook)
+fi
if [ -z ${cargoVendorDir-} ]; then
postPatchHooks+=(cargoSetupPostPatchHook)
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
index ebd171c65455..6e2122091872 100644
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/pkgs/data/documentation/gnome-user-docs/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
homepage = "https://help.gnome.org/users/gnome-help/";
license = licenses.cc-by-30;
maintainers = teams.gnome.members;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index f54df8321916..d31272c2a5fb 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "man-pages";
- version = "5.10";
+ version = "5.11";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
- sha256 = "sha256-dRAlNboRny8iP2dNhOHc2uvwpf/WObPC5ssKDjR2h2I=";
+ sha256 = "sha256-PtpdzlGEWZ7Dfa40lM+WTFUDYumkH7ckeS2mEL2xPKo=";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix
index a2b67a22e2d5..e09ad70f1468 100644
--- a/pkgs/data/fonts/cascadia-code/default.nix
+++ b/pkgs/data/fonts/cascadia-code/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
- version = "2102.03";
+ version = "2102.25";
in
fetchzip {
name = "cascadia-code-${version}";
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
- sha256 = "076l44cyyp3cf15qyn2hzx34kzqm73d218fgwf8n69m8a1v34hs2";
+ sha256 = "14qhawcf1jmv68zdfbi2zfqdw4cf8fpk7plxzphmkqsp7hlw9pzx";
postFetch = ''
mkdir -p $out/share/fonts/
diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix
index d6929153bf45..88c80574e8fc 100644
--- a/pkgs/data/fonts/recursive/default.nix
+++ b/pkgs/data/fonts/recursive/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "1.071";
+ version = "1.077";
in
fetchzip {
name = "recursive-${version}";
@@ -14,7 +14,7 @@ fetchzip {
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
'';
- sha256 = "0db410vcvgawb89f11l2v7w3b7l70wzlwwv8df3vnangl3mdv13z";
+ sha256 = "sha256-deztulQ33TIMevEQOP5OS8tmf6UjXT8IiVpRjkdismY=";
meta = with lib; {
homepage = "https://recursive.design/";
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index 726f60938bb2..4dea9253c02d 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -2,7 +2,7 @@
let
pname = "spleen";
- version = "1.8.2";
+ version = "1.9.0";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@@ -19,7 +19,7 @@ in fetchurl {
# create fonts.dir so NixOS xorg module adds to fp
${mkfontscale}/bin/mkfontdir "$d"
'';
- sha256 = "0195d8ssmd8hc0q941z6zwnccffxajv4vylypsndxf28f3ikawby";
+ sha256 = "sha256-hNPbYiU+v7kCYKVyOn+uc5cSlu9bWsC4CwFvfH6StWM=";
meta = with lib; {
description = "Monospaced bitmap fonts";
diff --git a/pkgs/data/fonts/vollkorn/default.nix b/pkgs/data/fonts/vollkorn/default.nix
new file mode 100644
index 000000000000..571a88b89e0d
--- /dev/null
+++ b/pkgs/data/fonts/vollkorn/default.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchzip }:
+let
+ pname = "vollkorn";
+ version = "4.105";
+in
+fetchzip {
+ name = "${pname}-${version}";
+ url = "http://vollkorn-typeface.com/download/vollkorn-4-105.zip";
+ sha256 = "0srff2nqs7353mqcpmvaq156lamfh621py4h1771n0l9ix2c8mss";
+ stripRoot = false;
+
+ postFetch = ''
+ mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}}
+ unzip $downloadedFile
+ cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/
+ cp -v PS-OTF/*.otf $out/share/fonts/opentype
+ cp -v TTF/*.ttf $out/share/fonts/truetype
+ cp -v WOFF/*.woff $out/share/fonts/WOFF
+ cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2
+ '';
+
+ meta = with lib; {
+ homepage = "http://vollkorn-typeface.com/";
+ description = "The free and healthy typeface for bread and butter use";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.schmittlauch ];
+ };
+}
diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix
index 36aee979f0b1..bdc7b55d9c2b 100644
--- a/pkgs/data/icons/kora-icon-theme/default.nix
+++ b/pkgs/data/icons/kora-icon-theme/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }:
+{ lib, stdenv, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "kora-icon-theme";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "bikass";
repo = "kora";
rev = "v${version}";
- sha256 = "sha256-YGhusal8g/UXMqrQvj147OScg51uNABTMIXxVXvnpKY=";
+ sha256 = "1qnqz0h2c5kilch3308l8nfshgsrkllyysvqn0mxy70iziw895rv";
};
nativeBuildInputs = [
@@ -16,20 +16,24 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
+ adwaita-icon-theme
breeze-icons
- gnome-icon-theme
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/share/icons
mv kora* $out/share/icons/
for theme in $out/share/icons/*; do
- gtk-update-icon-cache $theme
+ gtk-update-icon-cache -f $theme
done
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix
index 5c44619e02dd..ff907e91bf94 100644
--- a/pkgs/data/icons/luna-icons/default.nix
+++ b/pkgs/data/icons/luna-icons/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "luna-icons";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
- sha256 = "1gggsd7scf15vrpgzvskx4p3jifnjdx0aqndqhvpc6ksdbh3nzqd";
+ sha256 = "11g740x1asy7jbfn52gp1zx7hzhklw6f97m469wgyi9yf954js15";
};
nativeBuildInputs = [
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix
index f7da9381e610..cabc28a89ce9 100644
--- a/pkgs/data/misc/conway_polynomials/default.nix
+++ b/pkgs/data/misc/conway_polynomials/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv
, fetchurl
-, python
+, python2
}:
stdenv.mkDerivation rec {
pname = "conway_polynomials";
version = "0.5";
- pythonEnv = python.withPackages (ps: with ps; [ six ]);
+ pythonEnv = python2.withPackages (ps: with ps; [ six ]);
src = fetchurl {
url = "mirror://sageupstream/conway_polynomials/conway_polynomials-${version}.tar.bz2";
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix
index 988716f5429e..982594000210 100644
--- a/pkgs/data/misc/elliptic_curves/default.nix
+++ b/pkgs/data/misc/elliptic_curves/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
-, python
+, python2
}:
stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
export SAGE_SHARE="$out/share"
export PYTHONPATH=$PWD
- ${python.interpreter} ${spkg-install}
+ ${python2.interpreter} ${spkg-install}
'';
meta = with lib; {
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index d1d8b91bdacb..597c6577cb0c 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c0fe8e827d5ec71141700f5d5a90a6f6616ecbc5.tar.gz";
- sha256 = "16is1cipkfiabbh01i247vqfviwzjpfhgf6pkli61wwlhnk0q95s";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fd3fefef13b49cbcd9a08b46c2aa4ceb204de5e0.tar.gz";
+ sha256 = "1dr4bqsisizw3qn9qxjpbk0rjri6s0gv9g9717cwfcixy940af2s";
}
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index 421054fa17f0..60735eb4782c 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,11 +1,11 @@
{ lib, fetchzip }:
let
- version = "20200729";
+ version = "20210225";
in fetchzip {
name = "iana-etc-${version}";
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
- sha256 = "05cymmisfvpyd7fwzc6axvm5fsi1v6hzs0pjr4xp1i95wvpz7qpm";
+ sha256 = "sha256-NVvZG3EJEYOXFDTBXD5m9sg/8msyMiBMkiZr+ZxWZ/g=";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix
index 96130b2de5e1..7fcd2fbf516f 100644
--- a/pkgs/data/misc/libkkc-data/default.nix
+++ b/pkgs/data/misc/libkkc-data/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, marisa, libkkc }:
+{ lib, stdenv, fetchurl, python2, libkkc }:
stdenv.mkDerivation rec {
pname = "libkkc-data";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
};
- nativeBuildInputs = [ marisa ];
+ nativeBuildInputs = [ python2.pkgs.marisa ];
+
+ strictDeps = true;
meta = with lib; {
description = "Language model data package for libkkc";
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 6092d3faeeba..ec0fa407d733 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
- version = "20210215";
+ version = "20210312";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
- sha256 = "sha256-HIM3sq47+0nImiaw+CjjjgYnBIorwmA6UxaNefjYNZg=";
+ sha256 = "sha256-dUjsCeRFynN4xc65njntyohX+Ck4MeCzy1WPQjCHDhA=";
};
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];
diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix
index 19f02a16f470..f4ab4c058512 100644
--- a/pkgs/data/misc/spdx-license-list-data/default.nix
+++ b/pkgs/data/misc/spdx-license-list-data/default.nix
@@ -2,25 +2,28 @@
stdenv.mkDerivation rec {
pname = "spdx-license-list-data";
- version = "3.11";
+ version = "3.12";
src = fetchFromGitHub {
owner = "spdx";
repo = "license-list-data";
rev = "v${version}";
- sha256 = "1iwyqhh6lh51a47mhfy98zvjan8yjsvlym8qz0isx2i1zzxlj47a";
+ sha256 = "09xci8dzblg3d30jf7s43zialbcxlxly03zrkiymcvnzixg8v48f";
};
- phases = [ "unpackPhase" "installPhase" ];
-
installPhase = ''
+ runHook preInstall
+
install -vDt $out/json json/licenses.json
+
+ runHook postInstall
'';
- meta = {
+ meta = with lib; {
description = "Various data formats for the SPDX License List";
homepage = "https://github.com/spdx/license-list-data";
- license = lib.licenses.cc0;
- platforms = lib.platforms.all;
+ license = licenses.cc0;
+ maintainers = with maintainers; [ oxzi ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/data/themes/juno/default.nix b/pkgs/data/themes/juno/default.nix
new file mode 100644
index 000000000000..9e1580a6a14d
--- /dev/null
+++ b/pkgs/data/themes/juno/default.nix
@@ -0,0 +1,45 @@
+{ lib, stdenv, fetchurl, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+ pname = "juno";
+ version = "0.0.1";
+
+ srcs = [
+ (fetchurl {
+ url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno.tar.xz";
+ sha256 = "1cghsn9qagcf1nlga5cal0aqch6hkjm5wk6ja791zxhdqy3crx1i";
+ })
+ (fetchurl {
+ url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-mirage.tar.xz";
+ sha256 = "0zh6bc85svmwh8qrhpn8mim0pj322x2x2i9sxnp7p1938p5z5m2b";
+ })
+ (fetchurl {
+ url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-ocean.tar.xz";
+ sha256 = "0m2wgmcn12dfq5badzlpzjc8792ba9hi32c79vfvqawdn1q3hrdx";
+ })
+ (fetchurl {
+ url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-palenight.tar.xz";
+ sha256 = "1hn2l0m76x61ixjd253hi7czm65asdjdhqvvlv7idbccc40pvrak";
+ })
+ ];
+
+ sourceRoot = ".";
+
+ propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/share/themes
+ cp -a Juno* $out/share/themes
+ rm $out/share/themes/*/{LICENSE,README.md}
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "GTK themes inspired by epic vscode themes";
+ homepage = "https://github.com/EliverLara/Juno";
+ license = licenses.gpl3Only;
+ platforms = platforms.all;
+ maintainers = [ maintainers.gvolpe ];
+ };
+}
diff --git a/pkgs/data/themes/orchis/default.nix b/pkgs/data/themes/orchis/default.nix
index ee315427e230..cf479021fb1d 100644
--- a/pkgs/data/themes/orchis/default.nix
+++ b/pkgs/data/themes/orchis/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "orchis";
- version = "2021-01-22";
+ version = "2021-02-28";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
- sha256 = "1m0wilvrscg2xnkp6a90j0iccxd8ywvfpza1345sc6xmml9gvjzc";
+ sha256 = "sha256-HmC2e34n1eThFGgw9OzSgp5VFJOylyozpXgk9SO84+I=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 4212fa68bd4a..50222b386c8e 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -58,7 +58,9 @@ lib.makeScope pkgs.newScope (self: with self; {
# Removed from recent GNOME releases, but still required
scrollkeeper = callPackage ./desktop/scrollkeeper { };
- gtksourceview = callPackage ./desktop/gtksourceview { };
+ gtksourceview = callPackage ./desktop/gtksourceview {
+ autoreconfHook = pkgs.autoreconfHook269;
+ };
vte = callPackage ./desktop/vte { };
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index f5dae739ea47..24709d0f2a20 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-appindicator";
- version = "34";
+ version = "35";
src = fetchFromGitHub {
owner = "Ubuntu";
repo = "gnome-shell-extension-appindicator";
rev = "v${version}";
- sha256 = "0p9sk8cv2z242d5783gx2m4l1x9vg5fy1a7yr1wcfshvajlrj23m";
+ sha256 = "sha256-xVoXVVEULZZnoYEXl1x96Tjs8hOvs9/sOAUVMj9kKCo=";
};
# This package has a Makefile, but it's used for building a zip for
diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
index c83ad7ef4c19..f663aa8977b1 100644
--- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0";
};
- buildInputs = [ glib gnome3.gnome-shell unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ glib gnome3.gnome-shell ];
uuid = "nightthemeswitcher@romainvigier.fr";
diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
index a6444025ebbc..e58d8ce6e42f 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
@@ -7,16 +7,17 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-sound-output-device-chooser";
- version = "32";
+ version = "35";
src = fetchFromGitHub {
owner = "kgshank";
repo = "gse-sound-output-device-chooser";
rev = version;
- sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l";
+ sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs=";
};
patches = [
+ # Fix paths to libpulse and python
(substituteAll {
src = ./fix-paths.patch;
libpulse = "${libpulseaudio}/lib/libpulse.so";
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GNOME Shell extension adding audio device chooser to panel";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar ];
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
};
diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
index 5957cb956f7a..1971bf1e5e74 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
@@ -2,20 +2,20 @@ diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-outp
index 54ad06f..0860531 100644
--- a/sound-output-device-chooser@kgshank.net/convenience.js
+++ b/sound-output-device-chooser@kgshank.net/convenience.js
-@@ -129,7 +129,7 @@ function refreshCards() {
- if(_settings.get_boolean(Prefs.NEW_PROFILE_ID)) {
+@@ -142,7 +142,7 @@ function refreshCards() {
+ if (newProfLogic) {
_log("New logic");
- let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path();
-- let pythonExec = 'python';
+ let pyLocation = Me.dir.get_child("utils/pa_helper.py").get_path();
+- let pythonExec = ["python", "python3", "python2"].find(cmd => isCmdFound(cmd));
+ let pythonExec = '@python@';
- let pyVer = 3;
- while(!isCmdFound(pythonExec) && pyVer >=2){
- _log(pythonExec + " is not found. Try next");
+ if (!pythonExec) {
+ _log("ERROR: Python not found. fallback to default mode");
+ _settings.set_boolean(Prefs.NEW_PROFILE_ID, false);
diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
index c4d2484..262608d 100644
--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
-@@ -86,7 +86,7 @@ else:
+@@ -82,7 +82,7 @@ else:
_libraries = {}
diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix
index 1949b97fafb0..b6fae261ea12 100644
--- a/pkgs/desktops/gnome-3/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix
@@ -1,13 +1,13 @@
-{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
+{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
- version = "45";
+ version = "47";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
- sha256 = "sha256-ghmCnzlPvxHEy2ro1AL+T2yiavJVrPhRfIKbMBwMjac=";
+ sha256 = "1ia8x5mqwsd5gv7sg981h2ngcr3jdr60947iqvnp6xqcw4rc72lr";
};
uuid = "unite@hardpixel.eu";
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index 0ea59c3fc425..2d66dabb5a08 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "gnome-autoar";
- version = "0.3.0";
+ version = "0.3.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0ssqckfkyldwld88zizy446y2359rg40lnrcm3sjpjhc2b015hgj";
+ sha256 = "1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f";
};
passthru = {
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
new file mode 100644
index 000000000000..e71a0bd0230c
--- /dev/null
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
@@ -0,0 +1,40 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, extra-cmake-modules
+, kwindowsystem
+, plasma-framework
+, qtx11extras
+}:
+
+mkDerivation rec {
+ pname = "plasma-applet-virtual-desktop-bar";
+ version = "unstable-2021-02-20";
+
+ src = fetchFromGitHub {
+ owner = "wsdfhjxc";
+ repo = "virtual-desktop-bar";
+ rev = "3e9bbddb8def8da65071a1c325eaa06598e8a473";
+ sha256 = "192ns6c2brzq46pg385n0v1ydbz52aaa8f5dgfw5251hrw9c7bxg";
+ };
+
+ buildInputs = [
+ kwindowsystem plasma-framework qtx11extras
+ ];
+
+ nativeBuildInputs = [
+ extra-cmake-modules
+ ];
+
+ cmakeFlags = [
+ "-Wno-dev"
+ ];
+
+ meta = with lib; {
+ description = "Manage virtual desktops dynamically in a convenient way";
+ homepage = "https://github.com/wsdfhjxc/virtual-desktop-bar";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index c4cbc44b3757..82985523c45d 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -131,6 +131,7 @@ let
plasma-integration = callPackage ./plasma-integration {};
plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
+ plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };
plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { };
plasma-vault = callPackage ./plasma-vault {};
plasma-workspace = callPackage ./plasma-workspace {};
@@ -143,6 +144,7 @@ let
thirdParty = let inherit (libsForQt5) callPackage; in {
plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { };
+ plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { };
kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { };
kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { };
krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { };
diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix
index 37632ab2f76d..cf815b808243 100644
--- a/pkgs/desktops/plasma-5/discover.nix
+++ b/pkgs/desktops/plasma-5/discover.nix
@@ -1,10 +1,34 @@
-{
- mkDerivation, lib,
- extra-cmake-modules, gettext, kdoctools, python,
- appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux,
- qtbase, qtquickcontrols2,
- karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels,
- knewstuff, kwindowsystem, kxmlgui, plasma-framework
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, gettext
+, kdoctools
+, python
+, appstream-qt
+, discount
+, flatpak
+, fwupd
+, ostree
+, packagekit-qt
+, pcre
+, util-linux
+, qtbase
+, qtquickcontrols2
+, qtx11extras
+, karchive
+, kcmutils
+, kconfig
+, kcrash
+, kdbusaddons
+, kdeclarative
+, kidletime
+, kio
+, kirigami2
+, kitemmodels
+, knewstuff
+, kwindowsystem
+, kxmlgui
+, plasma-framework
}:
mkDerivation {
@@ -13,9 +37,29 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
# discount is needed for libmarkdown
- appstream-qt discount flatpak fwupd ostree packagekit-qt pcre util-linux
+ appstream-qt
+ discount
+ flatpak
+ fwupd
+ ostree
+ packagekit-qt
+ pcre
+ util-linux
qtquickcontrols2
- karchive kconfig kcrash kdbusaddons kdeclarative kio kirigami2 kitemmodels knewstuff kwindowsystem kxmlgui
+ qtx11extras
+ karchive
+ kcmutils
+ kconfig
+ kcrash
+ kdbusaddons
+ kdeclarative
+ kidletime
+ kio
+ kirigami2
+ kitemmodels
+ knewstuff
+ kwindowsystem
+ kxmlgui
plasma-framework
];
}
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 43ea2d692818..1a739585efe0 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.5/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.1/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index 0581b8bde74a..27d0ab8a0fba 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -3,7 +3,8 @@
extra-cmake-modules, kdoctools,
libcap, libpcap, lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
- knewstuff, libksysguard, qtbase
+ knewstuff, libksysguard, qtbase,
+ networkmanager-qt, libnl
}:
mkDerivation {
@@ -12,6 +13,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
- kdelibs4support ki18n libcap libpcap lm_sensors
+ kdelibs4support ki18n libcap libpcap lm_sensors networkmanager-qt libnl
];
}
diff --git a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
new file mode 100644
index 000000000000..7216f54b6c87
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
@@ -0,0 +1,57 @@
+From 29ec6fada935ef966e5859082435ed57daa9522d Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel
+Date: Tue, 16 Mar 2021 15:03:59 -0400
+Subject: [PATCH] [NixOS] Unwrap executable name for .desktop search
+
+Why is this necessary even though -a "$0" is used in the wrapper?
+Because it's completely bypassing argv0! This looks at the executable
+file in-use according to the kernel!
+
+Wrappers cannot affect the `/proc/.../exe` symlink!
+---
+ service_utils.h | 28 +++++++++++++++++++++++++++-
+ 1 file changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/service_utils.h b/service_utils.h
+index 8a70c1fad..6674f553b 100644
+--- a/service_utils.h
++++ b/service_utils.h
+@@ -26,8 +26,34 @@ namespace KWin
+ const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
+ const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
+
+-static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName)
++static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName)
+ {
++ // !! Start NixOS fix
++ // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does
++ // miscellaneous trickeries and mischievous things to make the programs work.
++ // In turn, programs often employs different mischievous schemes and trickeries to do *other things.
++ // It often happens that they conflict.
++ // Here, `kwin` tries to detect the .desktop file for a given process.
++ // `kwin` followed the process `/proc/.../exe` up to the actual binary running.
++ // It normally would be fine, e.g. /usr/bin/foobar is what's in the desktop file.
++ // But it's not the truth here! It's extremely likely the resolved path is /nix/store/.../bin/.foobar-wrapped
++ // rather than what the desktop file points to, something like /nix/store/.../bin/foobar !!
++ // Since the wrappers for Nixpkgs *always* prepend a dot and append -wrapped, we assume here that we can keep
++ // `/^(.*)\/\.([^/]*)-wrapped/` until the (equivalent) regex does not match.
++ // This should canonicalize the wrapper name to the expected name to look for in the desktop file.
++
++ // Use a copy of the const string
++ QString executablePath(in_executablePath);
++
++ // While the parts needed are present, "unwrap" one layer of wrapper names.
++ while (executablePath.endsWith("-wrapped") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) {
++ // Approximately equivalent to s/-wrapped$//
++ executablePath.remove(executablePath.length() - 8, 8);
++ // Approximately equivalent to s;/\.;/;
++ executablePath.remove(executablePath.lastIndexOf("/")+1, 1);
++ }
++ // !! End NixOS fix
++
+ // needed to be able to use the logging category in a header static function
+ static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
+ const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
+--
+2.28.0
+
diff --git a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
index 4861df46ca63..06b3653acee4 100644
--- a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
+++ b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
@@ -1,17 +1,17 @@
-From 449896c45b23f50c168d8d2789832024c906ec36 Mon Sep 17 00:00:00 2001
+From af569c9ed8079169b524b31461e2789baa09ef7a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
Date: Mon, 27 Jan 2020 05:31:13 -0600
-Subject: [PATCH 1/2] follow symlinks
+Subject: [PATCH 1/3] follow symlinks
---
plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
-index fd723a8..fb95633 100644
+index 5242cb7..2e4ddae 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.cpp
+++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
-@@ -211,7 +211,7 @@ void Helper::init()
+@@ -201,7 +201,7 @@ void Helper::init()
// so let's try to locate our plugin:
QString pluginPath;
for (const QString &path : m_engine->importPathList()) {
@@ -21,5 +21,5 @@ index fd723a8..fb95633 100644
it.next();
QFileInfo fileInfo = it.fileInfo();
--
-2.23.1
+2.29.2
diff --git a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
index 0505810abe60..312daa093848 100644
--- a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
+++ b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
@@ -1,17 +1,17 @@
-From d584b075d71c4486710c0bbed6d44038f2ff5075 Mon Sep 17 00:00:00 2001
+From 5c90dd84f541bd4789525f12f12ad24411b99018 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
Date: Mon, 27 Jan 2020 05:31:23 -0600
-Subject: [PATCH 2/2] xwayland
+Subject: [PATCH 2/3] xwayland
---
xwl/xwayland.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp
-index 5f17d39..b4b69ba 100644
+index 57efdde..a211a58 100644
--- a/xwl/xwayland.cpp
+++ b/xwl/xwayland.cpp
-@@ -145,7 +145,7 @@ void Xwayland::init()
+@@ -124,7 +124,7 @@ void Xwayland::start()
m_xwaylandProcess = new Process(this);
m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
@@ -21,5 +21,5 @@ index 5f17d39..b4b69ba 100644
env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));
--
-2.23.1
+2.29.2
diff --git a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
new file mode 100644
index 000000000000..eaffaf591875
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
@@ -0,0 +1,26 @@
+From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001
+From: Yaroslav Bolyukin
+Date: Wed, 23 Dec 2020 18:02:14 +0300
+Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper
+
+Signed-off-by: Yaroslav Bolyukin
+---
+ plugins/qpa/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/qpa/main.cpp b/plugins/qpa/main.cpp
+index efd236b..a69c046 100644
+--- a/plugins/qpa/main.cpp
++++ b/plugins/qpa/main.cpp
+@@ -23,7 +23,7 @@ public:
+ QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList)
+ {
+ Q_UNUSED(paramList)
+- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
++ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
+ // Not KWin
+ return nullptr;
+ }
+--
+2.29.2
+
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index f0b07fba736e..2008529a38bc 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -12,7 +12,7 @@
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui,
- plasma-framework, libcap, libdrm, mesa
+ plasma-framework, libcap, libdrm, mesa, pipewire
}:
# TODO (ttuegel): investigate qmlplugindump failure
@@ -31,12 +31,14 @@ mkDerivation {
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework
- libcap libdrm mesa
+ libcap libdrm mesa pipewire
];
outputs = [ "dev" "out" ];
patches = [
./0001-follow-symlinks.patch
./0002-xwayland.patch
+ ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
+ ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
];
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
index 48be0d037df5..3d19f2d89fa1 100644
--- a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
+++ b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
@@ -2,7 +2,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
===================================================================
--- libkscreen-5.9.4.orig/src/backendmanager.cpp
+++ libkscreen-5.9.4/src/backendmanager.cpp
-@@ -178,17 +178,11 @@ QFileInfo BackendManager::preferredBacke
+@@ -172,14 +172,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend)
QFileInfoList BackendManager::listBackends()
{
// Compile a list of installed backends first
@@ -10,10 +10,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
- const QStringList paths = QCoreApplication::libraryPaths();
- QFileInfoList finfos;
- for (const QString &path : paths) {
-- const QDir dir(path + QLatin1String("/kf5/kscreen/"),
-- backendFilter,
-- QDir::SortFlags(QDir::QDir::Name),
-- QDir::NoDotAndDotDot | QDir::Files);
+- const QDir dir(path + QLatin1String("/kf5/kscreen/"), backendFilter, QDir::SortFlags(QDir::QDir::Name), QDir::NoDotAndDotDot | QDir::Files);
- finfos.append(dir.entryInfoList());
- }
- return finfos;
@@ -24,4 +21,4 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
+ return dir.entryInfoList();
}
- KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name,
+ KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, const QVariantMap &arguments)
diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix
index f6855cb34da1..e9ad3c28c101 100644
--- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix
@@ -3,7 +3,7 @@
extra-cmake-modules,
qtbase,
kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose,
- krunner, kwindowsystem, kactivities,
+ krunner, kwindowsystem, kactivities, plasma-workspace
}:
mkDerivation {
@@ -13,6 +13,6 @@ mkDerivation {
];
buildInputs = [
qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose
- krunner kwindowsystem kactivities
+ krunner kwindowsystem kactivities plasma-workspace
];
}
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
index 6c04081ae29a..c85d66ad0031 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
+++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
@@ -3,14 +3,14 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
@@ -48,10 +48,6 @@
- #include
+ #include
#endif
-
+
-// We cannot rely on the $PATH environment variable, because D-Bus activation
-// clears it. So we have to use a reasonable default.
-static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
-
- int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
+ int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled)
{
int ret = 0;
@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
new file mode 100644
index 000000000000..6b875745d270
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
@@ -0,0 +1,32 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, qtquickcontrols2
+, kconfig
+, kcoreaddons
+, ki18n
+, kiconthemes
+, kitemmodels
+, kitemviews
+, knewstuff
+, libksysguard
+, qtbase
+}:
+
+mkDerivation {
+ name = "plasma-systemmonitor";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ qtquickcontrols2
+ kconfig
+ kcoreaddons
+ ki18n
+ kitemmodels
+ kitemviews
+ knewstuff
+ kiconthemes
+ libksysguard
+ ];
+}
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
index ea8afedbe5ba..f9347de7d566 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
@@ -1,4 +1,4 @@
-From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001
+From 65ed69a38a9ffee21f0eb36de1f7a3f152111cad Mon Sep 17 00:00:00 2001
From: Tom Hall
Date: Mon, 7 Sep 2020 18:09:52 +0100
Subject: [PATCH] startkde
@@ -7,27 +7,27 @@ Subject: [PATCH] startkde
startkde/plasma-session/startup.cpp | 2 +-
startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +-
- startkde/startplasma.cpp | 22 +++++++++-------------
- 4 files changed, 12 insertions(+), 16 deletions(-)
+ startkde/startplasma.cpp | 16 ++++++++--------
+ 4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
-index 89cc144ba..8ca9e81d2 100644
+index c3e77d4..88cb0e9 100644
--- a/startkde/plasma-session/startup.cpp
+++ b/startkde/plasma-session/startup.cpp
-@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent):
+@@ -223,7 +223,7 @@ Startup::Startup(QObject *parent)
upAndRunning(QStringLiteral("ksmserver"));
const AutoStart autostart;
- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList());
+ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList());
- KJob* phase1;
+ KJob *phase1;
QProcessEnvironment kdedProcessEnv;
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
-index f59654d18..5e3a93db0 100644
+index 4fbfe18..6ba916c 100644
--- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp
-@@ -61,7 +61,7 @@ int main(int argc, char** argv)
+@@ -65,7 +65,7 @@ int main(int argc, char **argv)
waitForKonqi();
out << "startplasma-waylandsession: Shutting down...\n";
@@ -37,10 +37,10 @@ index f59654d18..5e3a93db0 100644
cleanupX11();
out << "startplasma-waylandsession: Done.\n";
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
-index ae1c4d101..0df24b5be 100644
+index 4ddf9f8..e0e59cd 100644
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
-@@ -110,7 +110,7 @@ int main(int argc, char** argv)
+@@ -110,7 +110,7 @@ int main(int argc, char **argv)
out << "startkde: Shutting down...\n";
@@ -50,10 +50,10 @@ index ae1c4d101..0df24b5be 100644
cleanupPlasmaEnvironment();
cleanupX11();
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index a055d5635..62afb1513 100644
+index 9809197..1250e3e 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
-@@ -41,7 +41,7 @@ QTextStream out(stderr);
+@@ -46,7 +46,7 @@ QTextStream out(stderr);
void messageBox(const QString &text)
{
out << text;
@@ -61,46 +61,56 @@ index a055d5635..62afb1513 100644
+ runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
}
- QStringList allServices(const QLatin1String& prefix)
-@@ -262,15 +262,15 @@ void setupX11()
- // If the user has overwritten fonts, the cursor font may be different now
- // so don't move this up.
+ QStringList allServices(const QLatin1String &prefix)
+@@ -267,8 +267,8 @@ void setupX11()
+ // If the user has overwritten fonts, the cursor font may be different now
+ // so don't move this up.
- runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
-- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
-- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
+- runSync(QStringLiteral("xprop"),
+ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
-+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
-+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
- }
++ runSync(QStringLiteral(NIXPKGS_XPROP),
+ {QStringLiteral("-root"),
+ QStringLiteral("-f"),
+ QStringLiteral("KDE_FULL_SESSION"),
+@@ -276,7 +276,7 @@ void setupX11()
+ QStringLiteral("-set"),
+ QStringLiteral("KDE_FULL_SESSION"),
+ QStringLiteral("true")});
+- runSync(QStringLiteral("xprop"),
++ runSync(QStringLiteral(NIXPKGS_XPROP),
+ {QStringLiteral("-root"),
+ QStringLiteral("-f"),
+ QStringLiteral("KDE_SESSION_VERSION"),
+@@ -288,8 +288,8 @@ void setupX11()
void cleanupX11()
{
-- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
-- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
-+ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
-+ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
+- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")});
+- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")});
++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")});
++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")});
}
// TODO: Check if Necessary
-@@ -306,7 +302,7 @@ void setupFontDpi()
- //TODO port to c++?
+@@ -321,7 +321,7 @@ void setupFontDpi()
+ // TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
QProcess p;
-- p.start(QStringLiteral("xrdb"), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
-+ p.start(QStringLiteral(NIXPKGS_XRDB), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
+- p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
++ p.start(QStringLiteral(NIXPKGS_XRDB), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input);
p.closeWriteChannel();
-@@ -328,7 +324,7 @@ QProcess* setupKSplash()
+@@ -343,7 +343,7 @@ QProcess *setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash");
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
-- p->start(QStringLiteral("ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
-+ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
+- p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
++ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
}
}
return p;
--
-2.28.0
+2.30.0
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
index 366707d27034..633551f6e3c2 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
@@ -1,23 +1,23 @@
-From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001
+From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
Date: Wed, 5 Feb 2020 05:03:11 -0600
-Subject: [PATCH 2/2] absolute-wallpaper-install-dir
+Subject: [PATCH] absolute-wallpaper-install-dir
---
sddm-theme/theme.conf.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
-index 8494a5c8a..f723c1e1b 100644
+index a560da3..f723c1e 100644
--- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake
@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
type=image
color=#1d99f3
fontSize=10
--background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg
-+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg
+-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png
++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
needsFullUserModel=false
--
-2.25.1
+2.30.0
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index e1becaab95b6..b65bc7df8ed8 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -16,6 +16,8 @@
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
qtwayland, qtx11extras, qqc2-desktop-style,
+
+ pipewire, libdrm
}:
let inherit (lib) getBin getLib; in
@@ -36,6 +38,8 @@ mkDerivation {
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland
qtx11extras qqc2-desktop-style
+
+ pipewire libdrm
];
propagatedUserEnvPkgs = [ qtgraphicaleffects ];
outputs = [ "out" "dev" ];
@@ -49,9 +53,10 @@ mkDerivation {
./0002-absolute-wallpaper-install-dir.patch
];
+ # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools
postPatch = ''
- substituteInPlace wallpapers/image/wallpaper.knsrc.cmake \
- --replace '@QtBinariesDir@/qdbus' ${getBin qttools}/bin/qdbus
+ substituteInPlace CMakeLists.txt \
+ --replace 'query_qmake(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")'
'';
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix
index a9f51e50a268..9e3776e8e291 100644
--- a/pkgs/desktops/plasma-5/sddm-kcm.nix
+++ b/pkgs/desktops/plasma-5/sddm-kcm.nix
@@ -1,8 +1,19 @@
-{
- mkDerivation, lib, extra-cmake-modules, shared-mime-info,
- libpthreadstubs, libXcursor, libXdmcp,
- qtbase, qtquickcontrols2, qtx11extras,
- karchive, ki18n, kio, knewstuff
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, shared-mime-info
+, libpthreadstubs
+, libXcursor
+, libXdmcp
+, qtbase
+, qtquickcontrols2
+, qtx11extras
+, karchive
+, kcmutils
+, kdeclarative
+, ki18n
+, kio
+, knewstuff
}:
mkDerivation {
@@ -10,8 +21,16 @@ mkDerivation {
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
- libpthreadstubs libXcursor libXdmcp
- qtquickcontrols2 qtx11extras
- karchive ki18n kio knewstuff
+ libpthreadstubs
+ libXcursor
+ libXdmcp
+ qtquickcontrols2
+ qtx11extras
+ karchive
+ kcmutils
+ kdeclarative
+ ki18n
+ kio
+ knewstuff
];
}
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index cfd7e5733993..96a60ac5e4b1 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,395 +4,419 @@
{
bluedevil = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/bluedevil-5.20.5.tar.xz";
- sha256 = "0bpbvfd6m3ddax484p33a1chvf9mf2mi61cli0vacsan7j84xpmk";
- name = "bluedevil-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/bluedevil-5.21.1.tar.xz";
+ sha256 = "0b69gacp5cbl32m92k2j36cqq38lpxlybx3wnzj1148j6wvfbajn";
+ name = "bluedevil-5.21.1.tar.xz";
};
};
breeze = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/breeze-5.20.5.tar.xz";
- sha256 = "01zm5hcal6flihd89wn70zi363cmcglfvnc2q6x97lq89silaf6l";
- name = "breeze-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/breeze-5.21.1.tar.xz";
+ sha256 = "1xdpsc4nf0556x9iimszi287jjks8qpqi45n81iccbcz91i5bnb5";
+ name = "breeze-5.21.1.tar.xz";
};
};
breeze-grub = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/breeze-grub-5.20.5.tar.xz";
- sha256 = "17g2jac96sj6pfacmyi6vvn74lfi9yhmigprcm2pwqg9z093n1m2";
- name = "breeze-grub-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/breeze-grub-5.21.1.tar.xz";
+ sha256 = "0w0kkdqliliy72f41xps0a2mr0rf4kn08immichcvrm47r9bjr37";
+ name = "breeze-grub-5.21.1.tar.xz";
};
};
breeze-gtk = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/breeze-gtk-5.20.5.tar.xz";
- sha256 = "1jknfswjcd4abbf249i3gclip4m4v8bp9b5x050zafyjkdcwxd5l";
- name = "breeze-gtk-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/breeze-gtk-5.21.1.tar.xz";
+ sha256 = "14xq2796n8927362851kffpvxxscw82sm5j9ghsb24hr860zcdk7";
+ name = "breeze-gtk-5.21.1.tar.xz";
};
};
breeze-plymouth = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/breeze-plymouth-5.20.5.tar.xz";
- sha256 = "0yiqqwms0qrnbxqb8nwmgssrp1f92jwjg8rfzapaq5jxdycl1d9m";
- name = "breeze-plymouth-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/breeze-plymouth-5.21.1.tar.xz";
+ sha256 = "0xgxmh5gnjz8r5h97arsb1ddvizfpajw6zfwrkrsiw0kxkb0ppn9";
+ name = "breeze-plymouth-5.21.1.tar.xz";
};
};
discover = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/discover-5.20.5.tar.xz";
- sha256 = "08dmc8rvbfi1zyk9if588h6948xqcqm9jxdp26q84mzq517x9fn5";
- name = "discover-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/discover-5.21.1.tar.xz";
+ sha256 = "1a1wmils7ijkvn1x5gqrdg3rv7mcnh0gaaig9ca555qqc2ab0ivl";
+ name = "discover-5.21.1.tar.xz";
};
};
drkonqi = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/drkonqi-5.20.5.tar.xz";
- sha256 = "1rl212qmmikbnkyryibpp6gxh4jpklynhgr45ym5gcn3903i3vh9";
- name = "drkonqi-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/drkonqi-5.21.1.tar.xz";
+ sha256 = "1iqk9mg5bi5yn9ccalwva8yshamrmsx4kfww8imxv8mhmq9p4mib";
+ name = "drkonqi-5.21.1.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kactivitymanagerd-5.20.5.tar.xz";
- sha256 = "1jzss3waq8jjzbs3rrxxk9dmr974pj5ryw4rdj8bpkc451wc4068";
- name = "kactivitymanagerd-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kactivitymanagerd-5.21.1.tar.xz";
+ sha256 = "1wzwkyylk4qsiab7jzlw62mfv5r3pxdk3vqyydca112836nhbdj3";
+ name = "kactivitymanagerd-5.21.1.tar.xz";
};
};
kde-cli-tools = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kde-cli-tools-5.20.5.tar.xz";
- sha256 = "0z32fwc9l8c3xfy1l7v0i26ay8icnxqwrnxz6h8qgjlv6p8b4h04";
- name = "kde-cli-tools-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kde-cli-tools-5.21.1.tar.xz";
+ sha256 = "0835323rbb3akhzdnjxb2myfbfz0wh3c5j1jih4l9zqr0ixx9lb3";
+ name = "kde-cli-tools-5.21.1.tar.xz";
};
};
kdecoration = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kdecoration-5.20.5.tar.xz";
- sha256 = "1kc166f2gqgspsnvxyk8k3k3mmd1ndhgr1dyjzknqdys32dkm5vf";
- name = "kdecoration-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kdecoration-5.21.1.tar.xz";
+ sha256 = "1qy848hvqiar3vj7cz0srszybqj9sf5lfip8ws0fwllqgsa5v505";
+ name = "kdecoration-5.21.1.tar.xz";
};
};
kde-gtk-config = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kde-gtk-config-5.20.5.tar.xz";
- sha256 = "1f3fvr201wr7jdh1hg8ff7yis7hnv7653hvx0531hx1x2hfdva1r";
- name = "kde-gtk-config-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kde-gtk-config-5.21.1.tar.xz";
+ sha256 = "0nq741x9flnyzhgj5h4r1774b11211ab0lcclhlji9ch7kqxs8dc";
+ name = "kde-gtk-config-5.21.1.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kdeplasma-addons-5.20.5.tar.xz";
- sha256 = "1sypmn72fp6l57px3pq9ivzj2r2l3k9vy5006idnfgblzahvpi2n";
- name = "kdeplasma-addons-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kdeplasma-addons-5.21.1.tar.xz";
+ sha256 = "0xpki1kabdm4fwifx0xsb0isig9dnzks4zfglrkg9g0nafahsbf8";
+ name = "kdeplasma-addons-5.21.1.tar.xz";
};
};
kgamma5 = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kgamma5-5.20.5.tar.xz";
- sha256 = "1gy0pgsk3xi129y8h78lcif60ajs3y5fxzj1pl7mn6g72f7mwxld";
- name = "kgamma5-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kgamma5-5.21.1.tar.xz";
+ sha256 = "1316l73jj4b41mrsk1vba3g4mdj0q6hxazqqkvzrcinzwr34p3l2";
+ name = "kgamma5-5.21.1.tar.xz";
};
};
khotkeys = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/khotkeys-5.20.5.tar.xz";
- sha256 = "1iw8rxdl9q45jqsnmqdm1lkymzkyxkrfgch51kxfj34vd4mi66h8";
- name = "khotkeys-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/khotkeys-5.21.1.tar.xz";
+ sha256 = "1kp6s1qgzz6j5z4widy5hqnwyh90vw3adf47jk54msdzlh2ak0q7";
+ name = "khotkeys-5.21.1.tar.xz";
};
};
kinfocenter = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kinfocenter-5.20.5.tar.xz";
- sha256 = "0k3vvfwrfwmmicw8p81fpqljvmj3n8342avavc49ajmnygls7ssm";
- name = "kinfocenter-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kinfocenter-5.21.1.tar.xz";
+ sha256 = "1fy5985f4zf9v656dfb30c95pkbasx2302qamdxpfhrl465nqn5d";
+ name = "kinfocenter-5.21.1.tar.xz";
};
};
kmenuedit = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kmenuedit-5.20.5.tar.xz";
- sha256 = "0apmhglw74ppps52fhspjdsiy19b219lf68aj8jlpiiqcn80mggf";
- name = "kmenuedit-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kmenuedit-5.21.1.tar.xz";
+ sha256 = "1cksy6fn9mx96jnlglzmg0n9817vmypl1lwxdyxncxzw275k0c05";
+ name = "kmenuedit-5.21.1.tar.xz";
};
};
kscreen = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kscreen-5.20.5.tar.xz";
- sha256 = "1njjkrdgdd6g8avf7ik9fd7j9g4zdbjghli7svcfz2z8h6na626y";
- name = "kscreen-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kscreen-5.21.1.tar.xz";
+ sha256 = "0w199x0ig7vv7ki17v5paipw1jkkiavj6296zmpbnxn88n6i8jw3";
+ name = "kscreen-5.21.1.tar.xz";
};
};
kscreenlocker = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kscreenlocker-5.20.5.tar.xz";
- sha256 = "07y0lhwh4pc5rsdfr5yqb645v37ya97vh3dmy2riw9908hiyybw0";
- name = "kscreenlocker-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kscreenlocker-5.21.1.tar.xz";
+ sha256 = "1qpmysv7cby0bir4qyr1if3zc1ky43fyzhhxfqc69mcx803iabyv";
+ name = "kscreenlocker-5.21.1.tar.xz";
};
};
ksshaskpass = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/ksshaskpass-5.20.5.tar.xz";
- sha256 = "1xk55ampbrz56pl739m6r150qcsjq0nw2sxxkpqykgwjh275y4ry";
- name = "ksshaskpass-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/ksshaskpass-5.21.1.tar.xz";
+ sha256 = "11avkc3qqskq8pkdsq1jikpdh9izghv3algbf67lwl236s8mmdzk";
+ name = "ksshaskpass-5.21.1.tar.xz";
};
};
ksysguard = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/ksysguard-5.20.5.tar.xz";
- sha256 = "0ddb3m6rygjisv31bc722vxzyb2q14940szfzijcv48z5ixj5x9j";
- name = "ksysguard-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/ksysguard-5.21.1.tar.xz";
+ sha256 = "1fnccjs04b3pvdb8wwmw03g8x4h7zw5q4pxh0gfy7w705w3wkxwm";
+ name = "ksysguard-5.21.1.tar.xz";
};
};
kwallet-pam = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwallet-pam-5.20.5.tar.xz";
- sha256 = "1wn1zm8bfxxsjvx4rbds60v9ckizj55znpq477vnzrh2xfx13rjk";
- name = "kwallet-pam-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwallet-pam-5.21.1.tar.xz";
+ sha256 = "0ybdyalppfypvq26j6lxjfz2zm41kw1nlsyh857z06f0s65257zb";
+ name = "kwallet-pam-5.21.1.tar.xz";
};
};
kwayland-integration = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwayland-integration-5.20.5.tar.xz";
- sha256 = "0rqzq851apw1p4c7salk7rcygjdw7ra0x95xw57vh68w19kn9wrk";
- name = "kwayland-integration-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwayland-integration-5.21.1.tar.xz";
+ sha256 = "0s0gljcfv3sjh63d8bcjmzqgvxrqzjbxj8dsyi68w187dxzca8b4";
+ name = "kwayland-integration-5.21.1.tar.xz";
};
};
kwayland-server = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwayland-server-5.20.5.tar.xz";
- sha256 = "0ajxjj2cbrg6rpry3r48q3zhxxkr09498j5in0v1jwijp83n9wz0";
- name = "kwayland-server-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwayland-server-5.21.1.tar.xz";
+ sha256 = "00d14d8q3jw1h2yyn49wpxndwl5v1clxnialrqgkyli6qkwkf29m";
+ name = "kwayland-server-5.21.1.tar.xz";
};
};
kwin = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwin-5.20.5.tar.xz";
- sha256 = "0kiq46gdvfv2811125kw1ncnk1pmpnqkvrz7p3lry72sjd1ja57c";
- name = "kwin-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwin-5.21.1.tar.xz";
+ sha256 = "035w7b9cfg3hv9kw3rab1y9xw4r51psz7csx7nki05nwzx84812s";
+ name = "kwin-5.21.1.tar.xz";
};
};
kwrited = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwrited-5.20.5.tar.xz";
- sha256 = "1h0vbb0bz4r26g4yf88jfzkbi8xbyf44c2y9nmlrmr5lws4bpcmz";
- name = "kwrited-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwrited-5.21.1.tar.xz";
+ sha256 = "15xsjkxqx48wpzjawv4qpbgh8a48sfrmldgcwhn1cscq8s0marh3";
+ name = "kwrited-5.21.1.tar.xz";
};
};
libkscreen = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/libkscreen-5.20.5.tar.xz";
- sha256 = "0641kk7s4xy5y94rn6xzjnrp4sbl7yn9w9qzlw4925858pgrr9qv";
- name = "libkscreen-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/libkscreen-5.21.1.tar.xz";
+ sha256 = "0hrgmnvyv5v5d15wj1gynyzk83jj8p9cjhz0q2l41n2rh81rw52z";
+ name = "libkscreen-5.21.1.tar.xz";
};
};
libksysguard = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/libksysguard-5.20.5.tar.xz";
- sha256 = "0v2x7sl5gg8a9i1cwx8prv03pcls4q3wfxxs5qs6g5ami1f679d8";
- name = "libksysguard-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/libksysguard-5.21.1.tar.xz";
+ sha256 = "14zafjp0ikqgkdr8a04idj08xami2xn8cw3scgwfcix3y7mv0ip8";
+ name = "libksysguard-5.21.1.tar.xz";
};
};
milou = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/milou-5.20.5.tar.xz";
- sha256 = "1hmpdj2zi6nidm6058a6kjgzij8qy9xihv20hi2dhk0f8ys42k3h";
- name = "milou-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/milou-5.21.1.tar.xz";
+ sha256 = "095mk7592r4fwkw5f3p8mgc0p2wg8wi347qx8s1yblwjcml86a5f";
+ name = "milou-5.21.1.tar.xz";
};
};
oxygen = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/oxygen-5.20.5.tar.xz";
- sha256 = "166jk8ix0dnv92svymaxjwbc08k6q8nag9xr2dc033x5lr2l59qr";
- name = "oxygen-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/oxygen-5.21.1.tar.xz";
+ sha256 = "1s5bzdj5l515g4biarrzmkc7vpi0hqbk75rjjkr11fsvkghhphwg";
+ name = "oxygen-5.21.1.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-browser-integration-5.20.5.tar.xz";
- sha256 = "03zzmzdlc5a3nrx6izb66s7l3cmangkfjda2mf17g2097rrnb9n2";
- name = "plasma-browser-integration-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-browser-integration-5.21.1.tar.xz";
+ sha256 = "0m99il47932ybsdp5z7apgb9l991wdhbrm3sninflcrg6ag9myp3";
+ name = "plasma-browser-integration-5.21.1.tar.xz";
};
};
plasma-desktop = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-desktop-5.20.5.tar.xz";
- sha256 = "1fc74zgxkp65pj8p58prd5rq7nqspjfcgr70say2imagyj9nwrdx";
- name = "plasma-desktop-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-desktop-5.21.1.tar.xz";
+ sha256 = "1ligy1ps3ajrsg6lvb9ailirgc52sswbknp0zn53n8gka176c555";
+ name = "plasma-desktop-5.21.1.tar.xz";
};
};
plasma-disks = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-disks-5.20.5.tar.xz";
- sha256 = "0bcwf3g2vy2gf0igg0dyl9x5qc0xx0d5z05n4mi7asg5acl596r1";
- name = "plasma-disks-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-disks-5.21.1.tar.xz";
+ sha256 = "0py662wlqbx5408rjbxnsa5ccnsaqx2wfy84fvjs4vl73wqmi2nl";
+ name = "plasma-disks-5.21.1.tar.xz";
+ };
+ };
+ plasma-firewall = {
+ version = "5.21.1";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.21.1/plasma-firewall-5.21.1.tar.xz";
+ sha256 = "19q7w9m1vj7gs5d3prraciw00iy0ywjfxlpjhxjiq0s0s0icf1hb";
+ name = "plasma-firewall-5.21.1.tar.xz";
};
};
plasma-integration = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-integration-5.20.5.tar.xz";
- sha256 = "1wydjnmryf2kvfgg6m9kafa5waimccqr531qrq3nisdjc5p1w9x8";
- name = "plasma-integration-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-integration-5.21.1.tar.xz";
+ sha256 = "0i51grmjkf9k6z1aq4j69wqdwdnn4rcryvi7b9lfpqaz1phsqhq7";
+ name = "plasma-integration-5.21.1.tar.xz";
};
};
plasma-nano = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-nano-5.20.5.tar.xz";
- sha256 = "0h276i1dxbiziw258wf6az9mnysp3xxfh7nlxv0g2w1vfnhm23v5";
- name = "plasma-nano-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-nano-5.21.1.tar.xz";
+ sha256 = "0qz14rmnlpk8mc1lgk854zlp032znc27j0wg6a7zsljikbx90dzm";
+ name = "plasma-nano-5.21.1.tar.xz";
};
};
plasma-nm = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-nm-5.20.5.tar.xz";
- sha256 = "060f32adr0wlv2bs9swjyxcil7n74cnk48j8b8984wwhk6zz53a6";
- name = "plasma-nm-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-nm-5.21.1.tar.xz";
+ sha256 = "0lg9fkk4lag5pi648jv66b8mzp645xx75y4zylj87yz3i8h9may4";
+ name = "plasma-nm-5.21.1.tar.xz";
};
};
plasma-pa = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-pa-5.20.5.tar.xz";
- sha256 = "0xvkbrz3290xxfvv1rqqv7w57j3gdng8m2jyjj1j6dmaackl512d";
- name = "plasma-pa-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-pa-5.21.1.tar.xz";
+ sha256 = "17vxvvrii3q46k22k3v94hicvxw7cdfl4rgaqbb8rvy94f2dhvir";
+ name = "plasma-pa-5.21.1.tar.xz";
};
};
plasma-phone-components = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-phone-components-5.20.5.tar.xz";
- sha256 = "14h790b2jfs2j2lvv3dwqm20v3nlvah2909g4mhm9kwfdsmgnjms";
- name = "plasma-phone-components-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-phone-components-5.21.1.tar.xz";
+ sha256 = "1fzjwc1x40n8wxq9fqm83j07yg9zniilmafcsv0rd80k6v99691i";
+ name = "plasma-phone-components-5.21.1.tar.xz";
};
};
plasma-sdk = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-sdk-5.20.5.tar.xz";
- sha256 = "13cqn700nadqgmn54sy8qbf7waqkgvhzndh73jvmhb0z699z4s6y";
- name = "plasma-sdk-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-sdk-5.21.1.tar.xz";
+ sha256 = "0s18lgp8baan9s9qr8wwaq3ah668255whz9xpl2xl1qv9qnr5v28";
+ name = "plasma-sdk-5.21.1.tar.xz";
+ };
+ };
+ plasma-systemmonitor = {
+ version = "5.21.1";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.21.1/plasma-systemmonitor-5.21.1.tar.xz";
+ sha256 = "1mfmlnsa2iy4wrdi2hghrapd7j02k3xkv4cfv44pw29i5iihvx6a";
+ name = "plasma-systemmonitor-5.21.1.tar.xz";
};
};
plasma-tests = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-tests-5.20.5.tar.xz";
- sha256 = "0h6wccqp46s3i8dqc6rrh68l8fk662yvz0fdscqv295g1zwhb45j";
- name = "plasma-tests-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-tests-5.21.1.tar.xz";
+ sha256 = "1qxlwvxwkqgxy6kvd9dqp7wg02gc4j37az20gxglm5s4jf9j47kr";
+ name = "plasma-tests-5.21.1.tar.xz";
};
};
plasma-thunderbolt = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-thunderbolt-5.20.5.tar.xz";
- sha256 = "06l5zpgn5zmid0rkp8lx228nw72nd991s2cg29yg2h51zyvff4v0";
- name = "plasma-thunderbolt-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-thunderbolt-5.21.1.tar.xz";
+ sha256 = "1v6yjxk30wpr86f1m7zn9sm5vvagcjmqz8b3s9sliv0z69n50fzx";
+ name = "plasma-thunderbolt-5.21.1.tar.xz";
};
};
plasma-vault = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-vault-5.20.5.tar.xz";
- sha256 = "0b9jnzx5040sgzqsnzjz61sxnlsmbqfsk8mvqclgqphgiqsbcnm2";
- name = "plasma-vault-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-vault-5.21.1.tar.xz";
+ sha256 = "0mfjmmn3s2piqg8idmndh1klrr3fllka0lx6ckx7bmj1g7z3kr0d";
+ name = "plasma-vault-5.21.1.tar.xz";
};
};
plasma-workspace = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-5.20.5.tar.xz";
- sha256 = "0966nqyqs7hb7fp3a3jxhm64iqwbafd29sbagigx9d7gj8qg8zim";
- name = "plasma-workspace-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-5.21.1.tar.xz";
+ sha256 = "0aq2158sijlgz3baslj57kzhmdx3m0zir80qz1svw94grfszjc2a";
+ name = "plasma-workspace-5.21.1.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-wallpapers-5.20.5.tar.xz";
- sha256 = "03z7pcba8kkmb70dn7gsqldxgb8lky6qw040p5ik1j07516xm6z3";
- name = "plasma-workspace-wallpapers-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-wallpapers-5.21.1.tar.xz";
+ sha256 = "1pfgzzfhwdgczhrgizwi7rvav1hawwv6zra8nlqnfia8rc4mjs3n";
+ name = "plasma-workspace-wallpapers-5.21.1.tar.xz";
};
};
plymouth-kcm = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plymouth-kcm-5.20.5.tar.xz";
- sha256 = "0lwir088h3mjdxc6zzbd74g7alfnsrhf7m0p7ma6prncdj25pcyz";
- name = "plymouth-kcm-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plymouth-kcm-5.21.1.tar.xz";
+ sha256 = "1il5a60db4brgs0ifmbxhq1ncqg80pkz5pnddbb3vwiwgwrsjziw";
+ name = "plymouth-kcm-5.21.1.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.20.5";
+ version = "1-5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/polkit-kde-agent-1-5.20.5.tar.xz";
- sha256 = "1rkvnci93xvxga6cvw99aaivkn8897kyqdw7p9hmk09qvg2qb92v";
- name = "polkit-kde-agent-1-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/polkit-kde-agent-1-5.21.1.tar.xz";
+ sha256 = "1lm6rl3lfimlfw7yaqk81jdrdi31qbz951vzcss4prwa1iqdi7b2";
+ name = "polkit-kde-agent-1-5.21.1.tar.xz";
};
};
powerdevil = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/powerdevil-5.20.5.tar.xz";
- sha256 = "1w3figagjxmrbc7hs81bllfkpq6f9mn4mwj7zjzxjf7d5fkmryrj";
- name = "powerdevil-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/powerdevil-5.21.1.tar.xz";
+ sha256 = "08a9wl97lpcm0qz438ha8avdc6ybsij5vvy3p0ijkdn1psq2974b";
+ name = "powerdevil-5.21.1.tar.xz";
+ };
+ };
+ qqc2-breeze-style = {
+ version = "5.21.1";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.21.1/qqc2-breeze-style-5.21.1.tar.xz";
+ sha256 = "1k4zl5hbbyk2v9gila8whkh7yniv3nwcgdc73ysc75ivqyzydsix";
+ name = "qqc2-breeze-style-5.21.1.tar.xz";
};
};
sddm-kcm = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/sddm-kcm-5.20.5.tar.xz";
- sha256 = "1zw9y6knrx848f529m45iszr0xplr9lnck242ddmzj3x7qz0x1az";
- name = "sddm-kcm-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/sddm-kcm-5.21.1.tar.xz";
+ sha256 = "0j76zwmn2r62hjzv1gni44a9admd38x2s8s30qfc1dzc7nkv61sh";
+ name = "sddm-kcm-5.21.1.tar.xz";
};
};
systemsettings = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/systemsettings-5.20.5.tar.xz";
- sha256 = "1b1j9hl9nzd4qqs255yd3svsb492w8i6l6ccihllwzqwkb1kpq5j";
- name = "systemsettings-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/systemsettings-5.21.1.tar.xz";
+ sha256 = "0kzg3raa2f3lwb5qs10g8kzmv6px8fk4z2sq5jnjl3n9zqgzykkr";
+ name = "systemsettings-5.21.1.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/xdg-desktop-portal-kde-5.20.5.tar.xz";
- sha256 = "07g70517p89araa305if2xgwpfd7sdbknl880hqn2mqaqd9m83gl";
- name = "xdg-desktop-portal-kde-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/xdg-desktop-portal-kde-5.21.1.tar.xz";
+ sha256 = "1xfnwycrq51sz1r57misrz8acq6yd1vrr5gjir4f1ynfclhf9aj6";
+ name = "xdg-desktop-portal-kde-5.21.1.tar.xz";
};
};
}
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index 2eff5e553ea7..529be6e2a56e 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -116,13 +116,12 @@ stdenv.mkDerivation rec {
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
# wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS
# so 'save as...' works:
- nativeBuildInputs = [ glib wrapGAppsHook ];
+ nativeBuildInputs = [ glib wrapGAppsHook unzip ];
buildInputs = [
jdk
ant
libusb-compat-0_1
libusb1
- unzip
zlib
ncurses5
readline
diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix
index 733e7e0b1462..17e87f2cb6c5 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/pkgs/development/arduino/platformio/core.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, buildPythonApplication, fetchpatch
-, bottle, click, colorama, semantic-version
+{ stdenv, lib, buildPythonApplication, bottle
+, click, click-completion, colorama, semantic-version
, lockfile, pyserial, requests
, tabulate, pyelftools, marshmallow
, pytest, tox, jsondiff
@@ -79,8 +79,8 @@ in buildPythonApplication rec {
inherit version src;
propagatedBuildInputs = [
- bottle click colorama git lockfile
- pyserial requests semantic-version
+ bottle click click-completion colorama git
+ lockfile pyserial requests semantic-version
tabulate pyelftools marshmallow
];
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index 63b807bd8005..d90953c71d9c 100755
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -6,7 +6,7 @@ import re
import requests
import sys
-releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15")
+releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16")
oses = ("mac", "linux")
types = ("jre", "jdk")
impls = ("hotspot", "openj9")
@@ -63,3 +63,4 @@ for release in releases:
with open("sources.json", "w") as f:
json.dump(out, f, indent=2, sort_keys=True)
+ f.write('\n')
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index 31a7346108e7..0bcfcafaae1b 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -1,4 +1,4 @@
-sourcePerArch:
+{ sourcePerArch, knownVulnerabilities ? [] }:
{ swingSupport ? true # not used for now
, lib, stdenv
@@ -48,6 +48,7 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ];
+ inherit knownVulnerabilities;
};
}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index ed8935b00421..95e72facaee2 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -1,4 +1,4 @@
-sourcePerArch:
+{ sourcePerArch, knownVulnerabilities ? [] }:
{ stdenv
, lib
@@ -107,6 +107,7 @@ let result = stdenv.mkDerivation rec {
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ];
+ inherit knownVulnerabilities;
};
}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
index d1db77215d16..7fec8fd3ff60 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
- jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
- jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
- jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
+ jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; };
+ jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.hotspot; };
+ jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.openj9; };
+ jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.openj9; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
index 755ffaab271e..e802e2eea528 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot;
- jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot;
- jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9;
- jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9;
+ jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; };
+ jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.hotspot; };
+ jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.openj9; };
+ jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.openj9; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
index 48806143c87c..2654c4f9e726 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.hotspot;
- jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.hotspot;
- jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.openj9;
- jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.openj9;
+ jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
+ jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
+ jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
+ jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
index 1bd7bb884481..c33d6afad102 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.hotspot;
- jre-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.hotspot;
- jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.openj9;
- jre-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.openj9;
+ jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
+ jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
+ jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
+ jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
index e440903ad526..6941a6dd0ddf 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.hotspot;
- jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.hotspot;
- jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.openj9;
- jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.openj9;
+ jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
+ jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
+ jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
+ jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
index 90ae65ba970c..756b419434df 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.hotspot;
- jre-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.hotspot;
- jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.openj9;
- jre-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.openj9;
+ jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
+ jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
+ jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
+ jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
index b9b67f271ac5..d627fd9311f8 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.hotspot;
- jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.hotspot;
- jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.openj9;
- jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.openj9;
+ jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; };
+ jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; };
+ jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; };
+ jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
index d48f9312dd6e..6663d9778bc2 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.hotspot;
- jre-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.hotspot;
- jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.openj9;
- jre-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.openj9;
+ jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; };
+ jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.hotspot; };
+ jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.openj9; };
+ jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.openj9; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
new file mode 100644
index 000000000000..b2bf2877c8a8
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
@@ -0,0 +1,9 @@
+let
+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+ jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; };
+ jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; };
+ jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; };
+ jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; };
+}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
new file mode 100644
index 000000000000..738b31fe1d12
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
@@ -0,0 +1,9 @@
+let
+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+ jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; };
+ jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.hotspot; };
+ jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.openj9; };
+ jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.openj9; };
+}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
index a170e0141cf0..5e2d42276ce7 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.hotspot;
- jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.hotspot;
- jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.openj9;
- jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.openj9;
+ jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; };
+ jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.hotspot; };
+ jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.openj9; };
+ jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.openj9; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
index 4937eace4903..c2a4085f730c 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
@@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
- jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.hotspot;
- jre-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.hotspot;
- jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.openj9;
- jre-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.openj9;
+ jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; };
+ jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.hotspot; };
+ jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.openj9; };
+ jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.openj9; };
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 14c887554f89..22a893c72427 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -4,92 +4,92 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "11",
- "sha256": "f90c6f941a95e20e305870700328804e5b48acb69d4928dc9c4627b3c755ae8a",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"armv6l": {
- "build": "11",
- "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"armv7l": {
- "build": "11",
- "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "a3c52b73a76bed0f113604165eb4f2020b767e188704d8cc0bfc8bc4eb596712",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
}
},
"openj9": {
"aarch64": {
- "build": "11",
- "sha256": "f0426b6d37085d471a7f577ce6f28af7cc8fe35b9b0b09a5111eccaed80a0447",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10-ea"
},
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "11",
- "sha256": "89b9b3108afda968a97961c5602a896bae31fea7c95195b54be5ad68b3af9e45",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"armv6l": {
- "build": "11",
- "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"armv7l": {
- "build": "11",
- "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "2ed263b662afb8b5d2964d1c9941d20031d07e5af68679ebefdca35d40bb91b1",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
}
},
"openj9": {
"aarch64": {
- "build": "11",
- "sha256": "b73f406dba1560dc194ac891452a1aacc2ba3b3e5e7b55e91a64559f8c2d9539",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10-ea"
},
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10"
}
}
}
@@ -100,20 +100,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "7b21961ffb2649e572721a0dfad64169b490e987937b661cb4e13a594c21e764",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "ee7c98c9d79689aca6e717965747b8bf4eec5413e89d5444cc2bd6dbd59e3811",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "382238443d4495d976f9e1a66b0f6e3bc250d3d009b64d2c29d44022afd7e418",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "58f931dc30160b04da2d94af32e0dfa384f4b2cf92b7217c0937fd057e668d54",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10"
}
}
},
@@ -122,20 +122,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "cd8965dc8dbd0b5b3b25b6a336857d9bb622965e039b77e3048bc825e5512e95",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_mac_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "215e94323d7c74fe31e5383261e3bfc8e9ca3dc03212738c48d29868b02fe875",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "33a868f12bbe9326f658e60abe48dac658df33578b3719f551355855a87d1911",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jre_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "6e353f0b38a7192ad3e0522009065c7c24356e0d9329899477b21e39d2a7a8da",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10"
}
}
}
@@ -146,19 +146,19 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "8",
+ "build": "8.1",
"sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
},
"armv6l": {
- "build": "8",
+ "build": "8.1",
"sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
},
"armv7l": {
- "build": "8",
+ "build": "8.1",
"sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -166,7 +166,7 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -176,7 +176,7 @@
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2"
@@ -186,7 +186,7 @@
"jre": {
"hotspot": {
"aarch64": {
- "build": "8",
+ "build": "8.1",
"sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -194,7 +194,7 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -204,7 +204,7 @@
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2"
@@ -218,7 +218,7 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -228,7 +228,7 @@
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2"
@@ -240,7 +240,7 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -250,7 +250,7 @@
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2"
@@ -394,92 +394,92 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "9",
- "sha256": "84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"armv6l": {
- "build": "9",
- "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"armv7l": {
- "build": "9",
- "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "9",
- "sha256": "61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
}
},
"openj9": {
"aarch64": {
- "build": "9",
- "sha256": "6206643ec4a57597f73880423b72fc06c1018d92cc6b02972ec3ea3fe4d853a2",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2-ea"
},
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "9",
- "sha256": "b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "9",
- "sha256": "9eecdd39239545b922878abf51015030ba9aed4dda5c4574ddbc669a71ddab31",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"armv6l": {
- "build": "9",
- "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"armv7l": {
- "build": "9",
- "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "9",
- "sha256": "e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
}
},
"openj9": {
"aarch64": {
- "build": "9",
- "sha256": "1db3c28e8c423d005fcf3b0c8a081061e56c51966273e32e3930d4c57c21bf49",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "37492012e75d75021dfb2b25fe5cc73664c03fee85532cec30ce4f5a4e5389c6",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2-ea"
},
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "9",
- "sha256": "e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2"
}
}
}
@@ -490,20 +490,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "9",
- "sha256": "d32f9429c4992cef7be559a15c542011503d6bc38c89379800cd209a9d7ec539",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_mac_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "d358a7ff03905282348c6c80562a4da2e04eb377b60ad2152be4c90f8d580b7f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_mac_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "9",
- "sha256": "c9b19fd1fda9c581aa0bcddbf5f821204c351a1de29da1c5aa51cb680ee99517",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "1336ae5529af3a0e35ae569e4188944831aeed7080a482f2490fc619380cbe53",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2"
}
}
},
@@ -512,20 +512,162 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "9",
- "sha256": "fde1713fc51e824a08f8eeb5e2b8a2acf21424d5f9a0e70cfd2e85a77c827bc4",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_mac_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "6a7150fa3ca8277394ff5bae6f56a70f61d2144a5dbbea4f008d86a3e5498795",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_mac_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "9",
- "sha256": "e7c3710d6cc23480ac66eba79b48d9e2bebec34ba688f3053bb5eba406a2c315",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jre_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "2c0ba5e66764d660037343db4bf32f1ed75ad27661e54e9a4df23d40cae448b0",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2"
+ }
+ }
+ }
+ }
+ },
+ "openjdk16": {
+ "linux": {
+ "jdk": {
+ "hotspot": {
+ "aarch64": {
+ "build": "36",
+ "sha256": "7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "armv6l": {
+ "build": "36",
+ "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "armv7l": {
+ "build": "36",
+ "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "packageType": "jdk",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "36",
+ "sha256": "2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ }
+ },
+ "openj9": {
+ "aarch64": {
+ "build": "36",
+ "sha256": "f4d4e0c0e9e0a4d0f14172878cee5e1a0ae73170058e1c183a452f8d97331ac0",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0-ea"
+ },
+ "packageType": "jdk",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "36",
+ "sha256": "9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0"
+ }
+ }
+ },
+ "jre": {
+ "hotspot": {
+ "aarch64": {
+ "build": "36",
+ "sha256": "947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "armv6l": {
+ "build": "36",
+ "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "armv7l": {
+ "build": "36",
+ "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "packageType": "jre",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "36",
+ "sha256": "4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ }
+ },
+ "openj9": {
+ "aarch64": {
+ "build": "36",
+ "sha256": "13ae42f5040d4e5d97b8809e27ebfdf8f7326604771963d85b2c1385abe13742",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0-ea"
+ },
+ "packageType": "jre",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "36",
+ "sha256": "302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0"
+ }
+ }
+ }
+ },
+ "mac": {
+ "jdk": {
+ "hotspot": {
+ "packageType": "jdk",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "36",
+ "sha256": "b66761b55fd493ed2a5f4df35a32b338ec34a9e0a1244439e3156561ab27c511",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_mac_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ }
+ },
+ "openj9": {
+ "packageType": "jdk",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "36",
+ "sha256": "e6075cbe939b4de165cc8b4b91352f8885d549873f5cd419e75eba737502542e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0"
+ }
+ }
+ },
+ "jre": {
+ "hotspot": {
+ "packageType": "jre",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "36",
+ "sha256": "92cb07e9e9d075996d1a9e0ccfc1d35e6f97f7e188e9bb78088ee1066062a428",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_mac_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ }
+ },
+ "openj9": {
+ "packageType": "jre",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "36",
+ "sha256": "9e5c31582778ca5c08fc221e185dc0f4dbce2091cbc69966a1e2617344b722f1",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0"
}
}
}
@@ -536,92 +678,92 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "10",
- "sha256": "cfbde5191027c6d25af44af8a3d64625c6e22422dea8c4af6fe9240e7e249baa",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz",
+ "version": "8.0.282"
},
"armv6l": {
- "build": "10",
- "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "1",
+ "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz",
+ "version": "8.0.275"
},
"armv7l": {
- "build": "10",
- "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "1",
+ "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz",
+ "version": "8.0.275"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "6f124b69d07d8d3edf39b9aa5c58473f63a380b686ddb73a5495e01d25c2939a",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz",
+ "version": "8.0.282"
}
},
"openj9": {
"aarch64": {
- "build": "10",
- "sha256": "bbc78dc8caf25372578a95287bcf672c4bf62af23939d4a988634b2a1356cd89",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "e107d3b8092f71ee042284b0fc0f0430ef214916812ce02aa6d549aa81b6dc70",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282-ea"
},
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "ca852f976e5b27ccd9b73a527a517496bda865b2ae2a85517ca74486fb8de7da",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "10",
- "sha256": "ed3a862d83dd1f19037fc6ccf73500f2ecf453eb245af8b70bec3fb80d084289",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz",
+ "version": "8.0.282"
},
"armv6l": {
- "build": "10",
- "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "1",
+ "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz",
+ "version": "8.0.275"
},
"armv7l": {
- "build": "10",
- "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "1",
+ "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz",
+ "version": "8.0.275"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "e6894601a559c5226c6dc337308df263444d356a6430f4aabb66e02607c82956",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz",
+ "version": "8.0.282"
}
},
"openj9": {
"aarch64": {
- "build": "10",
- "sha256": "b0891c3493a9fc6135700d065a826fc67223d54e9d0da3c41b57e6cb6897b726",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "1ffc7ac14546ee5e16e0efd616073baaf1b80f55abf61257095f132ded9da1e5",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282-ea"
},
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "a4e58f3c15ca3bc15cb3aaa9f116de972809ca52ae81e0726f84c059442174d5",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282"
}
}
}
@@ -632,20 +774,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "091f9ee39b0bdbc8af8ec19f51aaa0f73e416c2e93a8fb2c79b82f4caac83ab6",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "1766d756f6e4a5d41b539f2ecf83e5a33e9336bd75f1602e8f4b4afbb8f47aaa",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz",
+ "version": "8.0.282"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "bbd66ec27a4ea9b0b0952f501e1837e69c24262f64b316dab0408d1a8633a527",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jdk_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "265d4fb01b61ed7a3a9fae6a50bcf6322687b5f08de8598d8e42263cbd8b5772",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282"
}
}
},
@@ -654,20 +796,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "afb9c08cb8b93d8e7d4f1e48ced3d43cfb3082491595a2eaf1f00c48abd25428",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_mac_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "9e7a40d570d5151aae23a2fb017359248f5fb82c547c3ecd860c992770228afb",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_mac_hotspot_8u282b08.tar.gz",
+ "version": "8.0.282"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "4d90e85240113189d897a86731e672b37a6e345c056f35c7719cb27f3d08385b",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jre_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "884aa20b3aaed504b18ee21575c8da20838f80fb96036e78e70ff6ef613a5283",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282"
}
}
}
diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix
index 50274c9eca67..ea56b85dec9e 100644
--- a/pkgs/development/compilers/bs-platform/default.nix
+++ b/pkgs/development/compilers/bs-platform/default.nix
@@ -21,7 +21,7 @@ in
description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code";
homepage = "https://bucklescript.github.io";
license = licenses.lgpl3;
- maintainers = with maintainers; [ turbomack gamb anmonteiro ];
+ maintainers = with maintainers; [ turbomack gamb ];
platforms = platforms.all;
};
})
diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index f8121958e292..e360bb05f40d 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "clean-3.0";
+ pname = "clean";
+ version = "3.0";
src =
if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
@@ -45,8 +46,8 @@ stdenv.mkDerivation {
'';
homepage = "http://wiki.clean.cs.ru.nl/Clean";
- license = lib.licenses.lgpl21;
- maintainers = [ lib.maintainers.kkallio ];
+ license = lib.licenses.bsd2;
+ maintainers = [ lib.maintainers.erin ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index df674b67db85..c52ffa0bafdb 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, runtimeShell }:
+{ lib, stdenv, fetchurl, python3, runtimeShell }:
stdenv.mkDerivation {
name = "cmdstan-2.17.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
doCheck = true;
- checkInputs = [ python ];
+ checkInputs = [ python3 ];
checkPhase = "python ./runCmdStanTests.py src/test/interface"; # see #5368
installPhase = ''
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index b3be2bb220ca..f101f5967438 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -214,6 +214,8 @@ let
license = licenses.asl20;
maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
platforms = builtins.attrNames archs;
+ # Error running at_exit handler: Nil assertion failed
+ broken = lib.versions.minor version == "32" && stdenv.isDarwin;
};
})
);
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 074646f5f416..51f30dbabdaf 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -4,10 +4,10 @@
, targetPackages, fetchpatch, bash
, dmdBootstrap ? callPackage ./bootstrap.nix { }
, HOST_DMD ? "${dmdBootstrap}/bin/dmd"
-, version ? "2.091.1"
-, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr"
-, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl"
-, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs"
+, version ? "2.095.1"
+, dmdSha256 ? "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk"
+, druntimeSha256 ? "sha256:0ad4pa5llr9m9wqbvfv4yrcra4zz9qxlh5kx43mrv48f9bcxm2ha"
+, phobosSha256 ? "sha256:04w6jw4izix2vbw62j13wvz6q3pi7vivxnmxqj0g8904j5g0cxjl"
}:
let
@@ -53,18 +53,6 @@ stdenv.mkDerivation rec {
})
];
- patchFlags = [ "--directory=dmd" "-p1" "-F3" ];
- patches = [
- (fetchpatch {
- url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch";
- sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2";
- })
- (fetchpatch {
- url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch";
- sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs";
- })
- ];
-
sourceRoot = ".";
# https://issues.dlang.org/show_bug.cgi?id=19553
@@ -76,6 +64,16 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
+
+ rm dmd/test/runnable/gdb1.d
+ rm dmd/test/runnable/gdb10311.d
+ rm dmd/test/runnable/gdb14225.d
+ rm dmd/test/runnable/gdb14276.d
+ rm dmd/test/runnable/gdb14313.d
+ rm dmd/test/runnable/gdb14330.d
+ rm dmd/test/runnable/gdb15729.sh
+ rm dmd/test/runnable/gdb4149.d
+ rm dmd/test/runnable/gdb4181.d
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
@@ -171,5 +169,7 @@ stdenv.mkDerivation rec {
license = licenses.boost;
maintainers = with maintainers; [ ThomasMader lionello ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ # many tests are failing
+ broken = true;
};
}
diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix
index 00fb7c6d9b41..a38d44e37efa 100644
--- a/pkgs/development/compilers/dotnet/combine-packages.nix
+++ b/pkgs/development/compilers/dotnet/combine-packages.nix
@@ -4,9 +4,9 @@ let cli = builtins.head packages;
in
assert lib.assertMsg ((builtins.length packages) != 0)
''You must include at least one package, e.g
- `with dotnetCorePackages; combinePackages {
- packages = [ sdk_3_0 aspnetcore_2_1 ];
- };`'' ;
+ `with dotnetCorePackages; combinePackages [
+ sdk_3_0 aspnetcore_2_1
+ ];`'' ;
buildEnv {
name = "dotnet-core-combined";
paths = packages;
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index c5d33590daad..245e5bf2f540 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -1,7 +1,9 @@
{ stdenv, lib, fetchgit, flex, bison, pkg-config, which
-, pythonSupport ? false, python, swig
+, pythonSupport ? false, python ? null, swig
}:
+assert pythonSupport -> python != null;
+
stdenv.mkDerivation rec {
pname = "dtc";
version = "1.6.0";
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 333c8c202705..6981bcbd8fdf 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, pkgs
-, haskell, nodejs
+, haskell, haskellPackages, nodejs
, fetchurl, fetchpatch, makeWrapper, writeScriptBin
# Rust dependecies
, rustPlatform, openssl, pkg-config, Security
@@ -7,7 +7,7 @@
let
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
- hsPkgs = haskell.packages.ghc8103.override {
+ hsPkgs = haskellPackages.override {
overrides = self: super: with haskell.lib; with lib;
let elmPkgs = rec {
elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
@@ -80,8 +80,8 @@ let
# Needed for elm-format
indents = self.callPackage ./packages/indents.nix {};
bimap = self.callPackage ./packages/bimap.nix {};
- avh4-lib = self.callPackage ./packages/avh4-lib.nix {};
- elm-format-lib = self.callPackage ./packages/elm-format-lib.nix {};
+ avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {});
+ elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {});
elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {};
elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {};
};
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index 7698d5307327..3453d8d54bf1 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -31,13 +31,13 @@ let
sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==";
};
};
- "@babel/compat-data-7.12.13" = {
+ "@babel/compat-data-7.13.8" = {
name = "_at_babel_slash_compat-data";
packageName = "@babel/compat-data";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.13.tgz";
- sha512 = "U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg==";
+ url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz";
+ sha512 = "EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==";
};
};
"@babel/core-7.12.10" = {
@@ -49,13 +49,13 @@ let
sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==";
};
};
- "@babel/generator-7.12.15" = {
+ "@babel/generator-7.13.9" = {
name = "_at_babel_slash_generator";
packageName = "@babel/generator";
- version = "7.12.15";
+ version = "7.13.9";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz";
- sha512 = "6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==";
+ url = "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz";
+ sha512 = "mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==";
};
};
"@babel/helper-annotate-as-pure-7.12.13" = {
@@ -76,40 +76,40 @@ let
sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==";
};
};
- "@babel/helper-compilation-targets-7.12.13" = {
+ "@babel/helper-compilation-targets-7.13.10" = {
name = "_at_babel_slash_helper-compilation-targets";
packageName = "@babel/helper-compilation-targets";
- version = "7.12.13";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.13.tgz";
- sha512 = "dXof20y/6wB5HnLOGyLh/gobsMvDNoekcC+8MCV2iaTd5JemhFkPD73QB+tK3iFC9P0xJC73B6MvKkyUfS9cCw==";
+ url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz";
+ sha512 = "/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==";
};
};
- "@babel/helper-create-class-features-plugin-7.12.13" = {
+ "@babel/helper-create-class-features-plugin-7.13.10" = {
name = "_at_babel_slash_helper-create-class-features-plugin";
packageName = "@babel/helper-create-class-features-plugin";
- version = "7.12.13";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.13.tgz";
- sha512 = "Vs/e9wv7rakKYeywsmEBSRC9KtmE7Px+YBlESekLeJOF0zbGUicGfXSNi3o+tfXSNS48U/7K9mIOOCR79Cl3+Q==";
+ url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.10.tgz";
+ sha512 = "YV7r2YxdTUaw84EwNkyrRke/TJHR/UXGiyvACRqvdVJ2/syV2rQuJNnaRLSuYiop8cMRXOgseTGoJCWX0q2fFg==";
};
};
- "@babel/helper-create-regexp-features-plugin-7.12.13" = {
+ "@babel/helper-create-regexp-features-plugin-7.12.17" = {
name = "_at_babel_slash_helper-create-regexp-features-plugin";
packageName = "@babel/helper-create-regexp-features-plugin";
- version = "7.12.13";
+ version = "7.12.17";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.13.tgz";
- sha512 = "XC+kiA0J3at6E85dL5UnCYfVOcIZ834QcAY0TIpgUVnz0zDzg+0TtvZTnJ4g9L1dPRGe30Qi03XCIS4tYCLtqw==";
+ url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz";
+ sha512 = "p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==";
};
};
- "@babel/helper-explode-assignable-expression-7.12.13" = {
+ "@babel/helper-explode-assignable-expression-7.13.0" = {
name = "_at_babel_slash_helper-explode-assignable-expression";
packageName = "@babel/helper-explode-assignable-expression";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz";
- sha512 = "5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw==";
+ url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz";
+ sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==";
};
};
"@babel/helper-function-name-7.12.13" = {
@@ -130,22 +130,22 @@ let
sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==";
};
};
- "@babel/helper-hoist-variables-7.12.13" = {
+ "@babel/helper-hoist-variables-7.13.0" = {
name = "_at_babel_slash_helper-hoist-variables";
packageName = "@babel/helper-hoist-variables";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz";
- sha512 = "KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw==";
+ url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz";
+ sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==";
};
};
- "@babel/helper-member-expression-to-functions-7.12.13" = {
+ "@babel/helper-member-expression-to-functions-7.13.0" = {
name = "_at_babel_slash_helper-member-expression-to-functions";
packageName = "@babel/helper-member-expression-to-functions";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz";
- sha512 = "B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ==";
+ url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz";
+ sha512 = "yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==";
};
};
"@babel/helper-module-imports-7.12.13" = {
@@ -157,13 +157,13 @@ let
sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==";
};
};
- "@babel/helper-module-transforms-7.12.13" = {
+ "@babel/helper-module-transforms-7.13.0" = {
name = "_at_babel_slash_helper-module-transforms";
packageName = "@babel/helper-module-transforms";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz";
- sha512 = "acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA==";
+ url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz";
+ sha512 = "Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==";
};
};
"@babel/helper-optimise-call-expression-7.12.13" = {
@@ -175,31 +175,31 @@ let
sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==";
};
};
- "@babel/helper-plugin-utils-7.12.13" = {
+ "@babel/helper-plugin-utils-7.13.0" = {
name = "_at_babel_slash_helper-plugin-utils";
packageName = "@babel/helper-plugin-utils";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz";
- sha512 = "C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==";
+ url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz";
+ sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==";
};
};
- "@babel/helper-remap-async-to-generator-7.12.13" = {
+ "@babel/helper-remap-async-to-generator-7.13.0" = {
name = "_at_babel_slash_helper-remap-async-to-generator";
packageName = "@babel/helper-remap-async-to-generator";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz";
- sha512 = "Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA==";
+ url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz";
+ sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==";
};
};
- "@babel/helper-replace-supers-7.12.13" = {
+ "@babel/helper-replace-supers-7.13.0" = {
name = "_at_babel_slash_helper-replace-supers";
packageName = "@babel/helper-replace-supers";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz";
- sha512 = "pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg==";
+ url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz";
+ sha512 = "Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==";
};
};
"@babel/helper-simple-access-7.12.13" = {
@@ -238,76 +238,76 @@ let
sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
};
};
- "@babel/helper-validator-option-7.12.11" = {
+ "@babel/helper-validator-option-7.12.17" = {
name = "_at_babel_slash_helper-validator-option";
packageName = "@babel/helper-validator-option";
- version = "7.12.11";
+ version = "7.12.17";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz";
- sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==";
+ url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz";
+ sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==";
};
};
- "@babel/helper-wrap-function-7.12.13" = {
+ "@babel/helper-wrap-function-7.13.0" = {
name = "_at_babel_slash_helper-wrap-function";
packageName = "@babel/helper-wrap-function";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz";
- sha512 = "t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw==";
+ url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz";
+ sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==";
};
};
- "@babel/helpers-7.12.13" = {
+ "@babel/helpers-7.13.10" = {
name = "_at_babel_slash_helpers";
packageName = "@babel/helpers";
- version = "7.12.13";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.13.tgz";
- sha512 = "oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ==";
+ url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz";
+ sha512 = "4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==";
};
};
- "@babel/highlight-7.12.13" = {
+ "@babel/highlight-7.13.10" = {
name = "_at_babel_slash_highlight";
packageName = "@babel/highlight";
- version = "7.12.13";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz";
- sha512 = "kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==";
+ url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz";
+ sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==";
};
};
- "@babel/parser-7.12.15" = {
+ "@babel/parser-7.13.10" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
- version = "7.12.15";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz";
- sha512 = "AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==";
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.10.tgz";
+ sha512 = "0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ==";
};
};
- "@babel/plugin-proposal-async-generator-functions-7.12.13" = {
+ "@babel/plugin-proposal-async-generator-functions-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-async-generator-functions";
packageName = "@babel/plugin-proposal-async-generator-functions";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz";
- sha512 = "1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz";
+ sha512 = "rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==";
};
};
- "@babel/plugin-proposal-class-properties-7.12.13" = {
+ "@babel/plugin-proposal-class-properties-7.13.0" = {
name = "_at_babel_slash_plugin-proposal-class-properties";
packageName = "@babel/plugin-proposal-class-properties";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz";
- sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz";
+ sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==";
};
};
- "@babel/plugin-proposal-dynamic-import-7.12.1" = {
+ "@babel/plugin-proposal-dynamic-import-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-dynamic-import";
packageName = "@babel/plugin-proposal-dynamic-import";
- version = "7.12.1";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz";
- sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz";
+ sha512 = "ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==";
};
};
"@babel/plugin-proposal-export-namespace-from-7.12.13" = {
@@ -319,31 +319,31 @@ let
sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==";
};
};
- "@babel/plugin-proposal-json-strings-7.12.13" = {
+ "@babel/plugin-proposal-json-strings-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-json-strings";
packageName = "@babel/plugin-proposal-json-strings";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz";
- sha512 = "v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz";
+ sha512 = "w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==";
};
};
- "@babel/plugin-proposal-logical-assignment-operators-7.12.13" = {
+ "@babel/plugin-proposal-logical-assignment-operators-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-logical-assignment-operators";
packageName = "@babel/plugin-proposal-logical-assignment-operators";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz";
- sha512 = "fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz";
+ sha512 = "aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==";
};
};
- "@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" = {
+ "@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator";
packageName = "@babel/plugin-proposal-nullish-coalescing-operator";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz";
- sha512 = "Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz";
+ sha512 = "iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==";
};
};
"@babel/plugin-proposal-numeric-separator-7.12.13" = {
@@ -355,40 +355,40 @@ let
sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==";
};
};
- "@babel/plugin-proposal-object-rest-spread-7.12.13" = {
+ "@babel/plugin-proposal-object-rest-spread-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-object-rest-spread";
packageName = "@babel/plugin-proposal-object-rest-spread";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz";
- sha512 = "WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz";
+ sha512 = "DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==";
};
};
- "@babel/plugin-proposal-optional-catch-binding-7.12.13" = {
+ "@babel/plugin-proposal-optional-catch-binding-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-optional-catch-binding";
packageName = "@babel/plugin-proposal-optional-catch-binding";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz";
- sha512 = "9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz";
+ sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==";
};
};
- "@babel/plugin-proposal-optional-chaining-7.12.13" = {
+ "@babel/plugin-proposal-optional-chaining-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-optional-chaining";
packageName = "@babel/plugin-proposal-optional-chaining";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.13.tgz";
- sha512 = "0ZwjGfTcnZqyV3y9DSD1Yk3ebp+sIUpT2YDqP8hovzaNZnQq2Kd7PEqa6iOIUDBXBt7Jl3P7YAcEIL5Pz8u09Q==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz";
+ sha512 = "hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==";
};
};
- "@babel/plugin-proposal-private-methods-7.12.13" = {
+ "@babel/plugin-proposal-private-methods-7.13.0" = {
name = "_at_babel_slash_plugin-proposal-private-methods";
packageName = "@babel/plugin-proposal-private-methods";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz";
- sha512 = "sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz";
+ sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==";
};
};
"@babel/plugin-proposal-unicode-property-regex-7.12.13" = {
@@ -508,22 +508,22 @@ let
sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==";
};
};
- "@babel/plugin-transform-arrow-functions-7.12.13" = {
+ "@babel/plugin-transform-arrow-functions-7.13.0" = {
name = "_at_babel_slash_plugin-transform-arrow-functions";
packageName = "@babel/plugin-transform-arrow-functions";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz";
- sha512 = "tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz";
+ sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==";
};
};
- "@babel/plugin-transform-async-to-generator-7.12.13" = {
+ "@babel/plugin-transform-async-to-generator-7.13.0" = {
name = "_at_babel_slash_plugin-transform-async-to-generator";
packageName = "@babel/plugin-transform-async-to-generator";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz";
- sha512 = "psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz";
+ sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==";
};
};
"@babel/plugin-transform-block-scoped-functions-7.12.13" = {
@@ -544,31 +544,31 @@ let
sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==";
};
};
- "@babel/plugin-transform-classes-7.12.13" = {
+ "@babel/plugin-transform-classes-7.13.0" = {
name = "_at_babel_slash_plugin-transform-classes";
packageName = "@babel/plugin-transform-classes";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz";
- sha512 = "cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz";
+ sha512 = "9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==";
};
};
- "@babel/plugin-transform-computed-properties-7.12.13" = {
+ "@babel/plugin-transform-computed-properties-7.13.0" = {
name = "_at_babel_slash_plugin-transform-computed-properties";
packageName = "@babel/plugin-transform-computed-properties";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz";
- sha512 = "dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz";
+ sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==";
};
};
- "@babel/plugin-transform-destructuring-7.12.13" = {
+ "@babel/plugin-transform-destructuring-7.13.0" = {
name = "_at_babel_slash_plugin-transform-destructuring";
packageName = "@babel/plugin-transform-destructuring";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz";
- sha512 = "Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz";
+ sha512 = "zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==";
};
};
"@babel/plugin-transform-dotall-regex-7.12.13" = {
@@ -598,13 +598,13 @@ let
sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==";
};
};
- "@babel/plugin-transform-for-of-7.12.13" = {
+ "@babel/plugin-transform-for-of-7.13.0" = {
name = "_at_babel_slash_plugin-transform-for-of";
packageName = "@babel/plugin-transform-for-of";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz";
- sha512 = "xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz";
+ sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==";
};
};
"@babel/plugin-transform-function-name-7.12.13" = {
@@ -634,40 +634,40 @@ let
sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==";
};
};
- "@babel/plugin-transform-modules-amd-7.12.13" = {
+ "@babel/plugin-transform-modules-amd-7.13.0" = {
name = "_at_babel_slash_plugin-transform-modules-amd";
packageName = "@babel/plugin-transform-modules-amd";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz";
- sha512 = "JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz";
+ sha512 = "EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==";
};
};
- "@babel/plugin-transform-modules-commonjs-7.12.13" = {
+ "@babel/plugin-transform-modules-commonjs-7.13.8" = {
name = "_at_babel_slash_plugin-transform-modules-commonjs";
packageName = "@babel/plugin-transform-modules-commonjs";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz";
- sha512 = "OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz";
+ sha512 = "9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==";
};
};
- "@babel/plugin-transform-modules-systemjs-7.12.13" = {
+ "@babel/plugin-transform-modules-systemjs-7.13.8" = {
name = "_at_babel_slash_plugin-transform-modules-systemjs";
packageName = "@babel/plugin-transform-modules-systemjs";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz";
- sha512 = "aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz";
+ sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==";
};
};
- "@babel/plugin-transform-modules-umd-7.12.13" = {
+ "@babel/plugin-transform-modules-umd-7.13.0" = {
name = "_at_babel_slash_plugin-transform-modules-umd";
packageName = "@babel/plugin-transform-modules-umd";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz";
- sha512 = "BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz";
+ sha512 = "D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==";
};
};
"@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = {
@@ -697,13 +697,13 @@ let
sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==";
};
};
- "@babel/plugin-transform-parameters-7.12.13" = {
+ "@babel/plugin-transform-parameters-7.13.0" = {
name = "_at_babel_slash_plugin-transform-parameters";
packageName = "@babel/plugin-transform-parameters";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz";
- sha512 = "e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz";
+ sha512 = "Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==";
};
};
"@babel/plugin-transform-property-literals-7.12.13" = {
@@ -751,13 +751,13 @@ let
sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==";
};
};
- "@babel/plugin-transform-spread-7.12.13" = {
+ "@babel/plugin-transform-spread-7.13.0" = {
name = "_at_babel_slash_plugin-transform-spread";
packageName = "@babel/plugin-transform-spread";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz";
- sha512 = "dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz";
+ sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==";
};
};
"@babel/plugin-transform-sticky-regex-7.12.13" = {
@@ -769,13 +769,13 @@ let
sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==";
};
};
- "@babel/plugin-transform-template-literals-7.12.13" = {
+ "@babel/plugin-transform-template-literals-7.13.0" = {
name = "_at_babel_slash_plugin-transform-template-literals";
packageName = "@babel/plugin-transform-template-literals";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz";
- sha512 = "arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz";
+ sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==";
};
};
"@babel/plugin-transform-typeof-symbol-7.12.13" = {
@@ -841,22 +841,22 @@ let
sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==";
};
};
- "@babel/traverse-7.12.13" = {
+ "@babel/traverse-7.13.0" = {
name = "_at_babel_slash_traverse";
packageName = "@babel/traverse";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz";
- sha512 = "3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA==";
+ url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz";
+ sha512 = "xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==";
};
};
- "@babel/types-7.12.13" = {
+ "@babel/types-7.13.0" = {
name = "_at_babel_slash_types";
packageName = "@babel/types";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz";
- sha512 = "oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==";
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz";
+ sha512 = "hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==";
};
};
"@hapi/address-2.1.4" = {
@@ -1066,13 +1066,13 @@ let
sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
};
};
- "@types/node-14.14.25" = {
+ "@types/node-14.14.34" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "14.14.25";
+ version = "14.14.34";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz";
- sha512 = "EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ==";
+ url = "https://registry.npmjs.org/@types/node/-/node-14.14.34.tgz";
+ sha512 = "dBPaxocOK6UVyvhbnpFIj2W+S+1cBTkHQbFQfeeJhoKFbzYcVUGHvddeWPSucKATb3F0+pgDq0i6ghEaZjsugA==";
};
};
"@types/parse-json-4.0.0" = {
@@ -1120,13 +1120,13 @@ let
sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==";
};
};
- "@types/uglify-js-3.11.1" = {
+ "@types/uglify-js-3.13.0" = {
name = "_at_types_slash_uglify-js";
packageName = "@types/uglify-js";
- version = "3.11.1";
+ version = "3.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz";
- sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==";
+ url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz";
+ sha512 = "EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q==";
};
};
"@types/webpack-4.41.26" = {
@@ -2011,22 +2011,22 @@ let
sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
};
};
- "bn.js-4.11.9" = {
+ "bn.js-4.12.0" = {
name = "bn.js";
packageName = "bn.js";
- version = "4.11.9";
+ version = "4.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz";
- sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==";
+ url = "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz";
+ sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==";
};
};
- "bn.js-5.1.3" = {
+ "bn.js-5.2.0" = {
name = "bn.js";
packageName = "bn.js";
- version = "5.1.3";
+ version = "5.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz";
- sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==";
+ url = "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz";
+ sha512 = "D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==";
};
};
"body-parser-1.18.2" = {
@@ -2398,13 +2398,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001185" = {
+ "caniuse-lite-1.0.30001199" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001185";
+ version = "1.0.30001199";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz";
- sha512 = "Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001199.tgz";
+ sha512 = "ifbK2eChUCFUwGhlEzIoVwzFt1+iriSjyKKFYNfv6hN34483wyWpLLavYQXhnR036LhkdUYaSDpHg1El++VgHQ==";
};
};
"case-sensitive-paths-webpack-plugin-2.3.0" = {
@@ -2758,22 +2758,22 @@ let
sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
};
};
- "color-string-1.5.4" = {
+ "color-string-1.5.5" = {
name = "color-string";
packageName = "color-string";
- version = "1.5.4";
+ version = "1.5.5";
src = fetchurl {
- url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz";
- sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==";
+ url = "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz";
+ sha512 = "jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==";
};
};
- "colorette-1.2.1" = {
+ "colorette-1.2.2" = {
name = "colorette";
packageName = "colorette";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz";
- sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==";
+ url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz";
+ sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==";
};
};
"colors-1.0.3" = {
@@ -2857,13 +2857,13 @@ let
sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
};
};
- "commander-7.0.0" = {
+ "commander-7.1.0" = {
name = "commander";
packageName = "commander";
- version = "7.0.0";
+ version = "7.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz";
- sha512 = "ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==";
+ url = "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz";
+ sha512 = "pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==";
};
};
"common-tags-1.8.0" = {
@@ -3082,13 +3082,13 @@ let
sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
};
};
- "core-js-compat-3.8.3" = {
+ "core-js-compat-3.9.1" = {
name = "core-js-compat";
packageName = "core-js-compat";
- version = "3.8.3";
+ version = "3.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz";
- sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==";
+ url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.1.tgz";
+ sha512 = "jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA==";
};
};
"core-util-is-1.0.2" = {
@@ -3505,13 +3505,13 @@ let
sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
};
};
- "defer-to-connect-2.0.0" = {
+ "defer-to-connect-2.0.1" = {
name = "defer-to-connect";
packageName = "defer-to-connect";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz";
- sha512 = "bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==";
+ url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz";
+ sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==";
};
};
"define-properties-1.1.3" = {
@@ -3811,13 +3811,13 @@ let
sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
};
};
- "electron-to-chromium-1.3.657" = {
+ "electron-to-chromium-1.3.687" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.657";
+ version = "1.3.687";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.657.tgz";
- sha512 = "/9ROOyvEflEbaZFUeGofD+Tqs/WynbSTbNgNF+/TJJxH1ePD/e6VjZlDJpW3FFFd3nj5l3Hd8ki2vRwy+gyRFw==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.687.tgz";
+ sha512 = "IpzksdQNl3wdgkzf7dnA7/v10w0Utf1dF2L+B4+gKrloBrxCut+au+kky3PYvle3RMdSxZP+UiCZtLbcYRxSNQ==";
};
};
"elliptic-6.5.4" = {
@@ -3901,13 +3901,13 @@ let
sha512 = "4VbIyCRlCUm/py0E0AjMT3/mwd6DR4Y5Z5gEox6z5JII6ZdKIJmcQzjgWRI5qo5ERJiw9M/Nxhk7SGXFUbZsxQ==";
};
};
- "elm-tooling-1.1.0" = {
+ "elm-tooling-1.3.0" = {
name = "elm-tooling";
packageName = "elm-tooling";
- version = "1.1.0";
+ version = "1.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.1.0.tgz";
- sha512 = "wziiwTbqBkK/905a6stCpTWJhYEKNb4CCYt36VEd5XWmaLSelMOR+SxKcEPpxsiK/tFZ4o0PbW+h1QC5tWfYUQ==";
+ url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.3.0.tgz";
+ sha512 = "OLRg8D7QCbzMmi8QTaebIIsH2qaIj4NiltuJ8vZj4JFHOIVa3utyD5tlfySBGZNfDG7+vZ2K8iDk82TalFaAbw==";
};
};
"elm-webpack-loader-6.0.1" = {
@@ -4027,13 +4027,13 @@ let
sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
};
};
- "es-abstract-1.18.0-next.2" = {
+ "es-abstract-1.18.0" = {
name = "es-abstract";
packageName = "es-abstract";
- version = "1.18.0-next.2";
+ version = "1.18.0";
src = fetchurl {
- url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
- sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz";
+ sha512 = "LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==";
};
};
"es-to-primitive-1.2.1" = {
@@ -4180,13 +4180,13 @@ let
sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==";
};
};
- "events-3.2.0" = {
+ "events-3.3.0" = {
name = "events";
packageName = "events";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz";
- sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==";
+ url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz";
+ sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==";
};
};
"eventsource-0.1.6" = {
@@ -4396,13 +4396,31 @@ let
sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
};
};
- "fastq-1.10.1" = {
+ "fast-levenshtein-3.0.0" = {
+ name = "fast-levenshtein";
+ packageName = "fast-levenshtein";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz";
+ sha512 = "hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ==";
+ };
+ };
+ "fastest-levenshtein-1.0.12" = {
+ name = "fastest-levenshtein";
+ packageName = "fastest-levenshtein";
+ version = "1.0.12";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz";
+ sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==";
+ };
+ };
+ "fastq-1.11.0" = {
name = "fastq";
packageName = "fastq";
- version = "1.10.1";
+ version = "1.11.0";
src = fetchurl {
- url = "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz";
- sha512 = "AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA==";
+ url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz";
+ sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==";
};
};
"faye-websocket-0.10.0" = {
@@ -4657,13 +4675,13 @@ let
sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A==";
};
};
- "follow-redirects-1.13.2" = {
+ "follow-redirects-1.13.3" = {
name = "follow-redirects";
packageName = "follow-redirects";
- version = "1.13.2";
+ version = "1.13.3";
src = fetchurl {
- url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz";
- sha512 = "6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==";
+ url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz";
+ sha512 = "DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==";
};
};
"for-in-1.0.2" = {
@@ -5017,13 +5035,13 @@ let
sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
};
};
- "glob-parent-5.1.1" = {
+ "glob-parent-5.1.2" = {
name = "glob-parent";
packageName = "glob-parent";
- version = "5.1.1";
+ version = "5.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
- sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
+ url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz";
+ sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==";
};
};
"glob-to-regexp-0.3.0" = {
@@ -5116,13 +5134,13 @@ let
sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==";
};
};
- "graceful-fs-4.2.5" = {
+ "graceful-fs-4.2.6" = {
name = "graceful-fs";
packageName = "graceful-fs";
- version = "4.2.5";
+ version = "4.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.5.tgz";
- sha512 = "kBBSQbz2K0Nyn+31j/w36fUfxkBW9/gfwRWdUY1ULReH3iokVJgddZAFcD1D0xlgTmFxJCbUkUclAlc6/IDJkw==";
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz";
+ sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==";
};
};
"gzip-size-5.0.0" = {
@@ -5179,6 +5197,15 @@ let
sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
};
};
+ "has-bigints-1.0.1" = {
+ name = "has-bigints";
+ packageName = "has-bigints";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz";
+ sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==";
+ };
+ };
"has-flag-3.0.0" = {
name = "has-flag";
packageName = "has-flag";
@@ -5206,13 +5233,13 @@ let
sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==";
};
};
- "has-symbols-1.0.1" = {
+ "has-symbols-1.0.2" = {
name = "has-symbols";
packageName = "has-symbols";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
- sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
+ url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz";
+ sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==";
};
};
"has-to-string-tag-x-1.4.1" = {
@@ -5818,6 +5845,15 @@ let
sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==";
};
};
+ "is-bigint-1.0.1" = {
+ name = "is-bigint";
+ packageName = "is-bigint";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz";
+ sha512 = "J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==";
+ };
+ };
"is-binary-path-1.0.1" = {
name = "is-binary-path";
packageName = "is-binary-path";
@@ -5836,6 +5872,15 @@ let
sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
};
};
+ "is-boolean-object-1.1.0" = {
+ name = "is-boolean-object";
+ packageName = "is-boolean-object";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz";
+ sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==";
+ };
+ };
"is-buffer-1.1.6" = {
name = "is-buffer";
packageName = "is-buffer";
@@ -6043,6 +6088,15 @@ let
sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
};
};
+ "is-number-object-1.0.4" = {
+ name = "is-number-object";
+ packageName = "is-number-object";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz";
+ sha512 = "zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==";
+ };
+ };
"is-obj-1.0.1" = {
name = "is-obj";
packageName = "is-obj";
@@ -6169,6 +6223,15 @@ let
sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
};
};
+ "is-string-1.0.5" = {
+ name = "is-string";
+ packageName = "is-string";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz";
+ sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==";
+ };
+ };
"is-svg-3.0.0" = {
name = "is-svg";
packageName = "is-svg";
@@ -6691,13 +6754,13 @@ let
sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
};
};
- "lodash-4.17.20" = {
+ "lodash-4.17.21" = {
name = "lodash";
packageName = "lodash";
- version = "4.17.20";
+ version = "4.17.21";
src = fetchurl {
- url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
- sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
+ url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz";
+ sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
};
};
"lodash._reinterpolate-3.0.0" = {
@@ -7015,31 +7078,31 @@ let
sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==";
};
};
- "mime-2.5.0" = {
+ "mime-2.5.2" = {
name = "mime";
packageName = "mime";
- version = "2.5.0";
+ version = "2.5.2";
src = fetchurl {
- url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
- sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
+ url = "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz";
+ sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==";
};
};
- "mime-db-1.45.0" = {
+ "mime-db-1.46.0" = {
name = "mime-db";
packageName = "mime-db";
- version = "1.45.0";
+ version = "1.46.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
- sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz";
+ sha512 = "svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==";
};
};
- "mime-types-2.1.28" = {
+ "mime-types-2.1.29" = {
name = "mime-types";
packageName = "mime-types";
- version = "2.1.28";
+ version = "2.1.29";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
- sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz";
+ sha512 = "Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==";
};
};
"mimic-fn-1.2.0" = {
@@ -7330,13 +7393,13 @@ let
sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
};
};
- "nanoid-3.1.20" = {
+ "nanoid-3.1.21" = {
name = "nanoid";
packageName = "nanoid";
- version = "3.1.20";
+ version = "3.1.21";
src = fetchurl {
- url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz";
- sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==";
+ url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.21.tgz";
+ sha512 = "A6oZraK4DJkAOICstsGH98dvycPr/4GGDH7ZWKmMdd3vGcOurZ6JmWFUt0DA5bzrrn2FrUjmv6mFNWvv8jpppA==";
};
};
"nanomatch-1.2.13" = {
@@ -7429,13 +7492,13 @@ let
sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==";
};
};
- "node-releases-1.1.70" = {
+ "node-releases-1.1.71" = {
name = "node-releases";
packageName = "node-releases";
- version = "1.1.70";
+ version = "1.1.71";
src = fetchurl {
- url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz";
- sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==";
+ url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz";
+ sha512 = "zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==";
};
};
"node-watch-0.5.5" = {
@@ -7600,13 +7663,13 @@ let
sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
};
};
- "object-is-1.1.4" = {
+ "object-is-1.1.5" = {
name = "object-is";
packageName = "object-is";
- version = "1.1.4";
+ version = "1.1.5";
src = fetchurl {
- url = "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz";
- sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==";
+ url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz";
+ sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==";
};
};
"object-keys-1.1.1" = {
@@ -7645,13 +7708,13 @@ let
sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==";
};
};
- "object.getownpropertydescriptors-2.1.1" = {
+ "object.getownpropertydescriptors-2.1.2" = {
name = "object.getownpropertydescriptors";
packageName = "object.getownpropertydescriptors";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz";
- sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==";
+ url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz";
+ sha512 = "WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==";
};
};
"object.pick-1.3.0" = {
@@ -7663,13 +7726,13 @@ let
sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
};
};
- "object.values-1.1.2" = {
+ "object.values-1.1.3" = {
name = "object.values";
packageName = "object.values";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz";
- sha512 = "MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==";
+ url = "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz";
+ sha512 = "nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==";
};
};
"obuf-1.1.2" = {
@@ -7735,13 +7798,13 @@ let
sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==";
};
};
- "open-7.4.0" = {
+ "open-7.4.2" = {
name = "open";
packageName = "open";
- version = "7.4.0";
+ version = "7.4.2";
src = fetchurl {
- url = "https://registry.npmjs.org/open/-/open-7.4.0.tgz";
- sha512 = "PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==";
+ url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz";
+ sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==";
};
};
"opn-5.4.0" = {
@@ -7843,13 +7906,13 @@ let
sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
};
};
- "p-cancelable-2.0.0" = {
+ "p-cancelable-2.1.0" = {
name = "p-cancelable";
packageName = "p-cancelable";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz";
- sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==";
+ url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.0.tgz";
+ sha512 = "HAZyB3ZodPo+BDpb4/Iu7Jv4P6cSazBz9ZM0ChhEXp70scx834aWCEjQRwgt41UzzejUAPdbqqONfRWTPYrPAQ==";
};
};
"p-event-4.2.0" = {
@@ -8374,13 +8437,13 @@ let
sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
};
};
- "postcss-8.2.4" = {
+ "postcss-8.2.8" = {
name = "postcss";
packageName = "postcss";
- version = "8.2.4";
+ version = "8.2.8";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz";
- sha512 = "kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==";
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.2.8.tgz";
+ sha512 = "1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw==";
};
};
"postcss-calc-7.0.5" = {
@@ -8743,13 +8806,13 @@ let
sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
};
};
- "pretty-bytes-5.5.0" = {
+ "pretty-bytes-5.6.0" = {
name = "pretty-bytes";
packageName = "pretty-bytes";
- version = "5.5.0";
+ version = "5.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz";
- sha512 = "p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA==";
+ url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz";
+ sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==";
};
};
"pretty-error-2.1.2" = {
@@ -9004,6 +9067,15 @@ let
sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==";
};
};
+ "queue-microtask-1.2.2" = {
+ name = "queue-microtask";
+ packageName = "queue-microtask";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz";
+ sha512 = "dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==";
+ };
+ };
"randombytes-2.1.0" = {
name = "randombytes";
packageName = "randombytes";
@@ -9418,13 +9490,13 @@ let
sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
};
};
- "resolve-1.19.0" = {
+ "resolve-1.20.0" = {
name = "resolve";
packageName = "resolve";
- version = "1.19.0";
+ version = "1.20.0";
src = fetchurl {
- url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
- sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+ url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz";
+ sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==";
};
};
"resolve-cwd-2.0.0" = {
@@ -9607,13 +9679,13 @@ let
sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==";
};
};
- "run-parallel-1.1.10" = {
+ "run-parallel-1.2.0" = {
name = "run-parallel";
packageName = "run-parallel";
- version = "1.1.10";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz";
- sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==";
+ url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz";
+ sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==";
};
};
"run-queue-1.0.3" = {
@@ -9625,13 +9697,13 @@ let
sha1 = "e848396f057d223f24386924618e25694161ec47";
};
};
- "rxjs-6.6.3" = {
+ "rxjs-6.6.6" = {
name = "rxjs";
packageName = "rxjs";
- version = "6.6.3";
+ version = "6.6.6";
src = fetchurl {
- url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz";
- sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
+ url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz";
+ sha512 = "/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==";
};
};
"safe-buffer-5.1.1" = {
@@ -10408,31 +10480,31 @@ let
sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
};
};
- "string-width-4.2.0" = {
+ "string-width-4.2.2" = {
name = "string-width";
packageName = "string-width";
- version = "4.2.0";
+ version = "4.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz";
- sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==";
+ url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz";
+ sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==";
};
};
- "string.prototype.trimend-1.0.3" = {
+ "string.prototype.trimend-1.0.4" = {
name = "string.prototype.trimend";
packageName = "string.prototype.trimend";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
- sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
+ url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz";
+ sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==";
};
};
- "string.prototype.trimstart-1.0.3" = {
+ "string.prototype.trimstart-1.0.4" = {
name = "string.prototype.trimstart";
packageName = "string.prototype.trimstart";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
- sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
+ url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz";
+ sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==";
};
};
"string_decoder-0.10.31" = {
@@ -11038,13 +11110,13 @@ let
sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
};
};
- "typescript-3.9.7" = {
+ "typescript-3.9.9" = {
name = "typescript";
packageName = "typescript";
- version = "3.9.7";
+ version = "3.9.9";
src = fetchurl {
- url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz";
- sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==";
+ url = "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz";
+ sha512 = "kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==";
};
};
"uglify-es-3.3.10" = {
@@ -11083,6 +11155,15 @@ let
sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==";
};
};
+ "unbox-primitive-1.0.0" = {
+ name = "unbox-primitive";
+ packageName = "unbox-primitive";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.0.tgz";
+ sha512 = "P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==";
+ };
+ };
"unicode-canonical-property-names-ecmascript-1.0.4" = {
name = "unicode-canonical-property-names-ecmascript";
packageName = "unicode-canonical-property-names-ecmascript";
@@ -11272,13 +11353,13 @@ let
sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==";
};
};
- "url-parse-1.4.7" = {
+ "url-parse-1.5.1" = {
name = "url-parse";
packageName = "url-parse";
- version = "1.4.7";
+ version = "1.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz";
- sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==";
+ url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz";
+ sha512 = "HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==";
};
};
"url-parse-lax-3.0.0" = {
@@ -11641,6 +11722,15 @@ let
sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==";
};
};
+ "which-boxed-primitive-1.0.2" = {
+ name = "which-boxed-primitive";
+ packageName = "which-boxed-primitive";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz";
+ sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==";
+ };
+ };
"which-module-1.0.0" = {
name = "which-module";
packageName = "which-module";
@@ -11902,13 +11992,13 @@ let
sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==";
};
};
- "ws-7.4.3" = {
+ "ws-7.4.4" = {
name = "ws";
packageName = "ws";
- version = "7.4.3";
+ version = "7.4.4";
src = fetchurl {
- url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz";
- sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==";
+ url = "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz";
+ sha512 = "Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==";
};
};
"xmlbuilder-13.0.2" = {
@@ -11983,13 +12073,13 @@ let
sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
};
};
- "yaml-1.10.0" = {
+ "yaml-1.10.1" = {
name = "yaml";
packageName = "yaml";
- version = "1.10.0";
+ version = "1.10.1";
src = fetchurl {
- url = "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz";
- sha512 = "yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==";
+ url = "https://registry.npmjs.org/yaml/-/yaml-1.10.1.tgz";
+ sha512 = "z/asvd+V08l1ywhaemZVirCwjdzLo6O1/0j2JbYCsGjiezupNQqjs5IIPyNtctbHjPEckqzVGd4jvpU5Lr25vQ==";
};
};
"yargs-13.3.2" = {
@@ -12138,7 +12228,7 @@ in
sources."fresh-0.5.2"
sources."fs-extra-2.0.0"
sources."getpass-0.1.7"
- sources."graceful-fs-4.2.5"
+ sources."graceful-fs-4.2.6"
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."http-errors-1.7.2"
@@ -12157,13 +12247,13 @@ in
sources."json-stringify-safe-5.0.1"
sources."jsonfile-2.4.0"
sources."jsprim-1.4.1"
- sources."lodash-4.17.20"
+ sources."lodash-4.17.21"
sources."media-typer-0.3.0"
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.4.1"
- sources."mime-db-1.45.0"
- sources."mime-types-2.1.28"
+ sources."mime-db-1.46.0"
+ sources."mime-types-2.1.29"
sources."minimist-1.2.0"
sources."ms-2.0.0"
sources."negotiator-0.6.2"
@@ -12288,7 +12378,7 @@ in
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -12353,8 +12443,8 @@ in
sources."get-caller-file-2.0.5"
sources."getpass-0.1.7"
sources."glob-7.1.4"
- sources."glob-parent-5.1.1"
- sources."graceful-fs-4.2.5"
+ sources."glob-parent-5.1.2"
+ sources."graceful-fs-4.2.6"
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."has-flag-3.0.0"
@@ -12377,14 +12467,14 @@ in
sources."jsonfile-4.0.0"
sources."jsprim-1.4.1"
sources."locate-path-5.0.0"
- sources."lodash-4.17.20"
+ sources."lodash-4.17.21"
(sources."lru-cache-4.1.5" // {
dependencies = [
sources."yallist-2.1.2"
];
})
- sources."mime-db-1.45.0"
- sources."mime-types-2.1.28"
+ sources."mime-db-1.46.0"
+ sources."mime-types-2.1.29"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."minipass-3.1.3"
@@ -12475,7 +12565,7 @@ in
sources."color-name-1.1.4"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -12488,7 +12578,7 @@ in
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -12571,7 +12661,7 @@ in
sources."fsevents-2.3.2"
sources."get-stream-4.1.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."got-9.6.0"
sources."has-flag-4.0.0"
sources."http-cache-semantics-4.1.0"
@@ -12596,8 +12686,8 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.45.0"
- sources."mime-types-2.1.28"
+ sources."mime-db-1.46.0"
+ sources."mime-types-2.1.29"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -12607,7 +12697,7 @@ in
sources."normalize-url-4.5.0"
sources."on-finished-2.3.0"
sources."once-1.4.0"
- sources."open-7.4.0"
+ sources."open-7.4.2"
sources."p-cancelable-1.1.0"
sources."package-json-6.5.0"
sources."parseurl-1.3.3"
@@ -12659,7 +12749,7 @@ in
sources."vary-1.1.2"
sources."which-2.0.2"
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
];
buildInputs = globalBuildInputs;
meta = {
@@ -12674,10 +12764,10 @@ in
"@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
name = "_at_elm-tooling_slash_elm-language-server";
packageName = "@elm-tooling/elm-language-server";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.0.2.tgz";
- sha512 = "9G+n4pGWv/dpV6y7Wvf+J1FbJxQW6jtbtiF/20LYJVYP8LxjlrdMG5uzfZqBCFPNfn8aaIJL/ndkSvtSuFe/JA==";
+ url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.0.3.tgz";
+ sha512 = "pOcQNSFEoxsvXQlsRap2ahloqscf5jGYQ8ZqtM4TjdwvavSmObDejTyM5lNO81pFyrEUavTG6Q7G68HyP8TxBA==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.4"
@@ -12694,12 +12784,12 @@ in
sources."execa-5.0.0"
sources."fast-diff-1.2.0"
sources."fast-glob-3.2.5"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."fill-range-7.0.1"
sources."fromentries-1.3.2"
sources."fsevents-2.3.2"
sources."get-stream-6.0.0"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globby-11.0.2"
sources."human-signals-2.1.0"
sources."ignore-5.1.8"
@@ -12720,10 +12810,11 @@ in
sources."path-type-4.0.0"
sources."picomatch-2.2.2"
sources."pjson-1.0.9"
+ sources."queue-microtask-1.2.2"
sources."readdirp-3.5.0"
sources."reflect-metadata-0.1.13"
sources."reusify-1.0.4"
- sources."run-parallel-1.1.10"
+ sources."run-parallel-1.2.0"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.3"
@@ -12794,11 +12885,11 @@ in
})
sources."fill-range-7.0.1"
sources."finalhandler-1.1.2"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."fresh-0.5.2"
sources."fsevents-2.3.2"
sources."get-stream-4.1.0"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."has-ansi-2.0.0"
sources."http-errors-1.7.3"
sources."http-proxy-1.17.0"
@@ -12888,16 +12979,16 @@ in
sources."chokidar-3.5.1"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."commander-7.0.0"
+ sources."commander-7.1.0"
sources."concat-map-0.0.1"
sources."cross-spawn-7.0.3"
- sources."elm-tooling-1.1.0"
+ sources."elm-tooling-1.3.0"
sources."fill-range-7.0.1"
sources."fs.realpath-1.0.0"
sources."fsevents-2.3.2"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
- sources."graceful-fs-4.2.5"
+ sources."glob-parent-5.1.2"
+ sources."graceful-fs-4.2.6"
sources."has-flag-4.0.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -12948,7 +13039,7 @@ in
sources."@types/cacheable-request-6.0.1"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
- sources."@types/node-14.14.25"
+ sources."@types/node-14.14.34"
sources."@types/responselike-1.0.0"
sources."cacheable-lookup-2.0.1"
sources."cacheable-request-7.0.1"
@@ -12960,14 +13051,14 @@ in
})
sources."config-chain-1.1.12"
sources."decompress-response-5.0.0"
- sources."defer-to-connect-2.0.0"
+ sources."defer-to-connect-2.0.1"
sources."duplexer3-0.1.4"
sources."end-of-stream-1.4.4"
sources."fs-extra-8.1.0"
sources."get-proxy-2.1.0"
sources."get-stream-5.2.0"
sources."got-10.7.0"
- sources."graceful-fs-4.2.5"
+ sources."graceful-fs-4.2.6"
sources."has-symbol-support-x-1.4.2"
sources."has-to-string-tag-x-1.4.1"
sources."http-cache-semantics-4.1.0"
@@ -12984,7 +13075,7 @@ in
sources."normalize-url-4.5.0"
sources."npm-conf-1.1.3"
sources."once-1.4.0"
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."p-event-4.2.0"
sources."p-finally-1.0.0"
sources."p-timeout-3.2.0"
@@ -13095,8 +13186,8 @@ in
sources."get-caller-file-2.0.5"
sources."getpass-0.1.7"
sources."glob-7.1.4"
- sources."glob-parent-5.1.1"
- sources."graceful-fs-4.2.5"
+ sources."glob-parent-5.1.2"
+ sources."graceful-fs-4.2.6"
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."has-flag-3.0.0"
@@ -13119,8 +13210,8 @@ in
sources."jsprim-1.4.1"
sources."locate-path-3.0.0"
sources."lodash-4.17.15"
- sources."mime-db-1.45.0"
- sources."mime-types-2.1.28"
+ sources."mime-db-1.46.0"
+ sources."mime-types-2.1.29"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."minipass-2.9.0"
@@ -13155,7 +13246,7 @@ in
sources."request-promise-4.2.6"
(sources."request-promise-core-1.1.4" // {
dependencies = [
- sources."lodash-4.17.20"
+ sources."lodash-4.17.21"
];
})
sources."require-directory-2.1.1"
@@ -13222,7 +13313,7 @@ in
sources."compare-versions-3.6.0"
sources."core-util-is-1.0.2"
sources."fs-extra-6.0.1"
- sources."graceful-fs-4.2.5"
+ sources."graceful-fs-4.2.6"
sources."inherits-2.0.4"
sources."isarray-1.0.0"
sources."jsonfile-4.0.0"
@@ -13265,46 +13356,50 @@ in
dependencies = [
sources."@babel/cli-7.12.10"
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.12.13"
+ sources."@babel/compat-data-7.13.8"
sources."@babel/core-7.12.10"
- sources."@babel/generator-7.12.15"
+ sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
- sources."@babel/helper-compilation-targets-7.12.13"
- sources."@babel/helper-create-class-features-plugin-7.12.13"
- sources."@babel/helper-create-regexp-features-plugin-7.12.13"
- sources."@babel/helper-explode-assignable-expression-7.12.13"
+ (sources."@babel/helper-compilation-targets-7.13.10" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."@babel/helper-create-class-features-plugin-7.13.10"
+ sources."@babel/helper-create-regexp-features-plugin-7.12.17"
+ sources."@babel/helper-explode-assignable-expression-7.13.0"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-hoist-variables-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.12.13"
+ sources."@babel/helper-hoist-variables-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.0"
sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.12.13"
+ sources."@babel/helper-module-transforms-7.13.0"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-plugin-utils-7.12.13"
- sources."@babel/helper-remap-async-to-generator-7.12.13"
- sources."@babel/helper-replace-supers-7.12.13"
+ sources."@babel/helper-plugin-utils-7.13.0"
+ sources."@babel/helper-remap-async-to-generator-7.13.0"
+ sources."@babel/helper-replace-supers-7.13.0"
sources."@babel/helper-simple-access-7.12.13"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/helper-validator-option-7.12.11"
- sources."@babel/helper-wrap-function-7.12.13"
- sources."@babel/helpers-7.12.13"
- sources."@babel/highlight-7.12.13"
- sources."@babel/parser-7.12.15"
- sources."@babel/plugin-proposal-async-generator-functions-7.12.13"
- sources."@babel/plugin-proposal-class-properties-7.12.13"
- sources."@babel/plugin-proposal-dynamic-import-7.12.1"
+ sources."@babel/helper-validator-option-7.12.17"
+ sources."@babel/helper-wrap-function-7.13.0"
+ sources."@babel/helpers-7.13.10"
+ sources."@babel/highlight-7.13.10"
+ sources."@babel/parser-7.13.10"
+ sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
+ sources."@babel/plugin-proposal-class-properties-7.13.0"
+ sources."@babel/plugin-proposal-dynamic-import-7.13.8"
sources."@babel/plugin-proposal-export-namespace-from-7.12.13"
- sources."@babel/plugin-proposal-json-strings-7.12.13"
- sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13"
- sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13"
+ sources."@babel/plugin-proposal-json-strings-7.13.8"
+ sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8"
+ sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8"
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
- sources."@babel/plugin-proposal-object-rest-spread-7.12.13"
- sources."@babel/plugin-proposal-optional-catch-binding-7.12.13"
- sources."@babel/plugin-proposal-optional-chaining-7.12.13"
- sources."@babel/plugin-proposal-private-methods-7.12.13"
+ sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
+ sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
sources."@babel/plugin-syntax-class-properties-7.12.13"
@@ -13318,36 +13413,36 @@ in
sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
sources."@babel/plugin-syntax-optional-chaining-7.8.3"
sources."@babel/plugin-syntax-top-level-await-7.12.13"
- sources."@babel/plugin-transform-arrow-functions-7.12.13"
- sources."@babel/plugin-transform-async-to-generator-7.12.13"
+ sources."@babel/plugin-transform-arrow-functions-7.13.0"
+ sources."@babel/plugin-transform-async-to-generator-7.13.0"
sources."@babel/plugin-transform-block-scoped-functions-7.12.13"
sources."@babel/plugin-transform-block-scoping-7.12.13"
- sources."@babel/plugin-transform-classes-7.12.13"
- sources."@babel/plugin-transform-computed-properties-7.12.13"
- sources."@babel/plugin-transform-destructuring-7.12.13"
+ sources."@babel/plugin-transform-classes-7.13.0"
+ sources."@babel/plugin-transform-computed-properties-7.13.0"
+ sources."@babel/plugin-transform-destructuring-7.13.0"
sources."@babel/plugin-transform-dotall-regex-7.12.13"
sources."@babel/plugin-transform-duplicate-keys-7.12.13"
sources."@babel/plugin-transform-exponentiation-operator-7.12.13"
- sources."@babel/plugin-transform-for-of-7.12.13"
+ sources."@babel/plugin-transform-for-of-7.13.0"
sources."@babel/plugin-transform-function-name-7.12.13"
sources."@babel/plugin-transform-literals-7.12.13"
sources."@babel/plugin-transform-member-expression-literals-7.12.13"
- sources."@babel/plugin-transform-modules-amd-7.12.13"
- sources."@babel/plugin-transform-modules-commonjs-7.12.13"
- sources."@babel/plugin-transform-modules-systemjs-7.12.13"
- sources."@babel/plugin-transform-modules-umd-7.12.13"
+ sources."@babel/plugin-transform-modules-amd-7.13.0"
+ sources."@babel/plugin-transform-modules-commonjs-7.13.8"
+ sources."@babel/plugin-transform-modules-systemjs-7.13.8"
+ sources."@babel/plugin-transform-modules-umd-7.13.0"
sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13"
sources."@babel/plugin-transform-new-target-7.12.13"
sources."@babel/plugin-transform-object-super-7.12.13"
- sources."@babel/plugin-transform-parameters-7.12.13"
+ sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
sources."@babel/plugin-transform-runtime-7.12.10"
sources."@babel/plugin-transform-shorthand-properties-7.12.13"
- sources."@babel/plugin-transform-spread-7.12.13"
+ sources."@babel/plugin-transform-spread-7.13.0"
sources."@babel/plugin-transform-sticky-regex-7.12.13"
- sources."@babel/plugin-transform-template-literals-7.12.13"
+ sources."@babel/plugin-transform-template-literals-7.13.0"
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
@@ -13355,8 +13450,8 @@ in
sources."@babel/preset-modules-0.1.4"
sources."@babel/runtime-7.12.5"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.13"
- sources."@babel/types-7.12.13"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."@hapi/address-2.1.4"
sources."@hapi/bourne-1.3.2"
sources."@hapi/hoek-8.5.1"
@@ -13370,12 +13465,12 @@ in
sources."@types/http-proxy-1.17.5"
sources."@types/json-schema-7.0.7"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.25"
+ sources."@types/node-14.14.34"
sources."@types/parse-json-4.0.0"
sources."@types/q-1.5.4"
sources."@types/source-list-map-0.1.2"
sources."@types/tapable-1.0.6"
- (sources."@types/uglify-js-3.11.1" // {
+ (sources."@types/uglify-js-3.13.0" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -13439,7 +13534,7 @@ in
sources."asn1-0.2.4"
(sources."asn1.js-5.4.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."assert-1.5.0" // {
@@ -13492,7 +13587,7 @@ in
sources."binary-extensions-2.2.0"
sources."bindings-1.5.0"
sources."bluebird-3.7.2"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
(sources."body-parser-1.19.0" // {
dependencies = [
sources."bytes-3.1.0"
@@ -13538,7 +13633,7 @@ in
sources."camel-case-4.1.2"
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001185"
+ sources."caniuse-lite-1.0.30001199"
sources."case-sensitive-paths-webpack-plugin-2.3.0"
sources."caseless-0.12.0"
(sources."chalk-2.4.2" // {
@@ -13549,7 +13644,7 @@ in
sources."chardet-0.7.0"
(sources."chokidar-3.5.1" // {
dependencies = [
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
];
})
sources."chownr-1.1.4"
@@ -13597,8 +13692,8 @@ in
sources."color-3.1.3"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."color-string-1.5.4"
- sources."colorette-1.2.1"
+ sources."color-string-1.5.5"
+ sources."colorette-1.2.2"
sources."colors-1.4.0"
sources."combined-stream-1.0.8"
sources."commander-4.1.1"
@@ -13636,7 +13731,7 @@ in
];
})
sources."core-js-2.6.12"
- (sources."core-js-compat-3.8.3" // {
+ (sources."core-js-compat-3.9.1" // {
dependencies = [
sources."semver-7.0.0"
];
@@ -13645,7 +13740,7 @@ in
sources."cosmiconfig-5.2.1"
(sources."create-ecdh-4.0.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."create-hash-1.2.0"
@@ -13717,7 +13812,7 @@ in
})
(sources."diffie-hellman-5.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."dir-glob-2.2.2"
@@ -13741,10 +13836,10 @@ in
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.657"
+ sources."electron-to-chromium-1.3.687"
(sources."elliptic-6.5.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."elm-0.19.1-5"
@@ -13757,13 +13852,13 @@ in
sources."chalk-4.1.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."commander-7.0.0"
+ sources."commander-7.1.0"
sources."has-flag-4.0.0"
sources."rimraf-3.0.2"
sources."supports-color-7.2.0"
];
})
- sources."elm-tooling-1.1.0"
+ sources."elm-tooling-1.3.0"
sources."elm-webpack-loader-6.0.1"
sources."emoji-regex-8.0.0"
sources."emojis-list-3.0.0"
@@ -13777,7 +13872,7 @@ in
sources."entities-2.2.0"
sources."errno-0.1.8"
sources."error-ex-1.3.2"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-to-primitive-1.2.1"
sources."escalade-3.1.1"
sources."escape-html-1.0.3"
@@ -13793,7 +13888,7 @@ in
sources."esutils-2.0.3"
sources."etag-1.8.1"
sources."eventemitter3-4.0.7"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."eventsource-0.1.6"
sources."evp_bytestokey-1.0.3"
(sources."execa-1.0.0" // {
@@ -13904,7 +13999,7 @@ in
sources."find-up-4.1.0"
sources."firstline-1.3.1"
sources."flush-write-stream-1.1.1"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
@@ -13946,7 +14041,7 @@ in
sources."slash-1.0.0"
];
})
- sources."graceful-fs-4.2.5"
+ sources."graceful-fs-4.2.6"
(sources."gzip-size-5.0.0" // {
dependencies = [
sources."pify-3.0.0"
@@ -13956,8 +14051,9 @@ in
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."has-1.0.3"
+ sources."has-bigints-1.0.1"
sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -14046,7 +14142,9 @@ in
sources."is-accessor-descriptor-1.0.0"
sources."is-arguments-1.1.0"
sources."is-arrayish-0.2.1"
+ sources."is-bigint-1.0.1"
sources."is-binary-path-2.1.0"
+ sources."is-boolean-object-1.1.0"
sources."is-buffer-1.1.6"
sources."is-callable-1.2.3"
sources."is-color-stop-1.1.0"
@@ -14061,6 +14159,7 @@ in
sources."is-glob-4.0.1"
sources."is-negative-zero-2.0.1"
sources."is-number-7.0.0"
+ sources."is-number-object-1.0.4"
sources."is-obj-2.0.0"
sources."is-path-cwd-2.2.0"
sources."is-path-in-cwd-2.1.0"
@@ -14072,6 +14171,7 @@ in
sources."is-resolvable-1.1.0"
sources."is-root-2.0.0"
sources."is-stream-1.1.0"
+ sources."is-string-1.0.5"
sources."is-svg-3.0.0"
sources."is-symbol-1.0.3"
sources."is-typedarray-1.0.0"
@@ -14116,7 +14216,7 @@ in
];
})
sources."locate-path-5.0.0"
- sources."lodash-4.17.20"
+ sources."lodash-4.17.21"
sources."lodash._reinterpolate-3.0.0"
sources."lodash.memoize-4.1.2"
sources."lodash.template-4.5.0"
@@ -14138,12 +14238,12 @@ in
sources."micromatch-4.0.2"
(sources."miller-rabin-4.0.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."mime-1.6.0"
- sources."mime-db-1.45.0"
- sources."mime-types-2.1.28"
+ sources."mime-db-1.46.0"
+ sources."mime-types-2.1.29"
sources."mimic-fn-1.2.0"
(sources."mini-css-extract-plugin-0.12.0" // {
dependencies = [
@@ -14167,7 +14267,7 @@ in
sources."multicast-dns-service-types-1.1.0"
sources."mute-stream-0.0.8"
sources."nan-2.14.2"
- sources."nanoid-3.1.20"
+ sources."nanoid-3.1.21"
sources."nanomatch-1.2.13"
sources."ncp-1.0.1"
sources."negotiator-0.6.2"
@@ -14189,7 +14289,7 @@ in
sources."punycode-1.4.1"
];
})
- sources."node-releases-1.1.70"
+ sources."node-releases-1.1.71"
sources."normalize-package-data-2.5.0"
sources."normalize-path-3.0.0"
sources."normalize-range-0.1.2"
@@ -14217,14 +14317,14 @@ in
];
})
sources."object-inspect-1.9.0"
- sources."object-is-1.1.4"
+ sources."object-is-1.1.5"
sources."object-keys-1.1.1"
sources."object-visit-1.0.1"
sources."object.assign-4.1.2"
sources."object.entries-1.1.3"
- sources."object.getownpropertydescriptors-2.1.1"
+ sources."object.getownpropertydescriptors-2.1.2"
sources."object.pick-1.3.0"
- sources."object.values-1.1.2"
+ sources."object.values-1.1.3"
sources."obuf-1.1.2"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
@@ -14420,7 +14520,7 @@ in
})
(sources."postcss-safe-parser-5.0.2" // {
dependencies = [
- sources."postcss-8.2.4"
+ sources."postcss-8.2.8"
sources."source-map-0.6.1"
];
})
@@ -14433,7 +14533,7 @@ in
sources."postcss-unique-selectors-4.0.1"
sources."postcss-value-parser-4.1.0"
sources."prepend-http-1.0.4"
- sources."pretty-bytes-5.5.0"
+ sources."pretty-bytes-5.6.0"
sources."pretty-error-2.1.2"
sources."process-0.11.10"
sources."process-nextick-args-2.0.1"
@@ -14446,7 +14546,7 @@ in
sources."psl-1.8.0"
(sources."public-encrypt-4.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."pump-3.0.0"
@@ -14543,7 +14643,7 @@ in
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
sources."requires-port-1.0.0"
- sources."resolve-1.19.0"
+ sources."resolve-1.20.0"
sources."resolve-cwd-2.0.0"
sources."resolve-dir-1.0.1"
sources."resolve-from-3.0.0"
@@ -14558,7 +14658,7 @@ in
sources."ripemd160-2.0.2"
sources."run-async-2.4.1"
sources."run-queue-1.0.3"
- (sources."rxjs-6.6.3" // {
+ (sources."rxjs-6.6.6" // {
dependencies = [
sources."tslib-1.14.1"
];
@@ -14704,9 +14804,9 @@ in
sources."stream-shift-1.0.1"
sources."strict-uri-encode-1.1.0"
sources."string-replace-loader-2.3.0"
- sources."string-width-4.2.0"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string-width-4.2.2"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.1.1"
(sources."stringify-object-3.3.0" // {
dependencies = [
@@ -14810,6 +14910,7 @@ in
sources."yallist-2.1.2"
];
})
+ sources."unbox-primitive-1.0.0"
sources."unicode-canonical-property-names-ecmascript-1.0.4"
sources."unicode-match-property-ecmascript-1.0.4"
sources."unicode-match-property-value-ecmascript-1.2.0"
@@ -14846,7 +14947,7 @@ in
sources."schema-utils-3.0.0"
];
})
- sources."url-parse-1.4.7"
+ sources."url-parse-1.5.1"
sources."use-3.1.1"
(sources."util-0.11.1" // {
dependencies = [
@@ -14898,7 +14999,7 @@ in
})
(sources."webpack-dev-middleware-3.7.3" // {
dependencies = [
- sources."mime-2.5.0"
+ sources."mime-2.5.2"
];
})
(sources."webpack-dev-server-3.11.0" // {
@@ -14968,6 +15069,7 @@ in
sources."websocket-extensions-0.1.4"
sources."whatwg-fetch-3.5.0"
sources."which-2.0.2"
+ sources."which-boxed-primitive-1.0.2"
sources."which-module-1.0.0"
(sources."winston-2.1.1" // {
dependencies = [
@@ -15010,7 +15112,7 @@ in
sources."xtend-4.0.2"
sources."y18n-4.0.1"
sources."yallist-3.1.1"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.1"
(sources."yargs-6.6.0" // {
dependencies = [
sources."camelcase-3.0.0"
@@ -15062,7 +15164,7 @@ in
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."isexe-2.0.0"
- sources."lodash-4.17.20"
+ sources."lodash-4.17.21"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
@@ -15078,7 +15180,7 @@ in
sources."supports-color-7.2.0"
sources."temp-0.9.4"
sources."ts-union-2.3.0"
- sources."typescript-3.9.7"
+ sources."typescript-3.9.9"
sources."which-1.3.1"
sources."wrappy-1.0.2"
];
@@ -15095,10 +15197,10 @@ in
elm-review = nodeEnv.buildNodePackage {
name = "elm-review";
packageName = "elm-review";
- version = "2.4.1";
+ version = "2.4.6";
src = fetchurl {
- url = "https://registry.npmjs.org/elm-review/-/elm-review-2.4.1.tgz";
- sha512 = "2nirbEpOvOCgVylf5l6mtu+IqM//8kBeuj6zELPHmzWtn7heZTC0AS7fUtLVtnkgw9Cws8oh4tFLmHgVALE+dw==";
+ url = "https://registry.npmjs.org/elm-review/-/elm-review-2.4.6.tgz";
+ sha512 = "O94tBcesK/JytSGrLXh/NEU9jTQ2jGWpDrN6y/vgGu/gmL/i2Z6tdYw1+Jw0DKzigH3I3JtpoQAp2K/Y27y8Gw==";
};
dependencies = [
sources."@sindresorhus/is-2.1.1"
@@ -15106,7 +15208,7 @@ in
sources."@types/cacheable-request-6.0.1"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
- sources."@types/node-14.14.25"
+ sources."@types/node-14.14.34"
sources."@types/responselike-1.0.0"
(sources."ansi-escapes-4.3.1" // {
dependencies = [
@@ -15140,12 +15242,14 @@ in
sources."debug-4.3.2"
sources."decompress-response-5.0.0"
sources."defaults-1.0.3"
- sources."defer-to-connect-2.0.0"
+ sources."defer-to-connect-2.0.1"
sources."duplexer3-0.1.4"
- sources."elm-tooling-1.1.0"
+ sources."elm-tooling-1.3.0"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."escape-string-regexp-1.0.5"
+ sources."fast-levenshtein-3.0.0"
+ sources."fastest-levenshtein-1.0.12"
sources."fill-range-7.0.1"
sources."find-up-4.1.0"
sources."folder-hash-3.3.3"
@@ -15154,9 +15258,9 @@ in
sources."fsevents-2.3.2"
sources."get-stream-5.2.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."got-10.7.0"
- sources."graceful-fs-4.2.5"
+ sources."graceful-fs-4.2.6"
sources."has-flag-4.0.0"
sources."http-cache-semantics-4.1.0"
sources."inflight-1.0.6"
@@ -15200,7 +15304,7 @@ in
sources."chalk-3.0.0"
];
})
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."p-event-4.2.0"
sources."p-finally-1.0.0"
sources."p-limit-2.3.0"
@@ -15221,7 +15325,7 @@ in
sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.3"
sources."sisteransi-1.0.5"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."supports-color-7.2.0"
sources."supports-hyperlinks-2.1.0"
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index 2c9999ccdb49..4ce55b5ca25c 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
./fuel-dir.patch
];
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = with xorg; [ git rlwrap curl pkg-config perl
libX11 pango cairo gtk2 gdk-pixbuf gtkglext
- mesa libXmu libXt libICE libSM openssl unzip ];
+ mesa libXmu libXt libICE libSM openssl ];
buildPhase = ''
sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index f7ec7b6ee2d9..fc4fbb34c502 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -86,7 +86,6 @@ let
else if targetPlatform.isWindows then "mcf"
else "single"}"
"--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
] ++ lib.optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
# libsanitizer requires netrom/netrom.h which is not
# available in uclibc.
diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
deleted file mode 100644
index 83604630545e..000000000000
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ /dev/null
@@ -1,268 +0,0 @@
-{ lib, stdenv, pkgsBuildTarget, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
-, bash
-
-, libiconv ? null, ncurses
-
-, # GHC can be built with system libffi or a bundled one.
- libffi ? null
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
- # aarch64 outputs otherwise exceed 2GB limit
-, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whether to build terminfo.
- enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
- (if useLLVM then "perf-cross" else "perf-cross-ncg")
-
-, # Whether to disable the large address space allocator
- # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- buildMK = dontStrip: ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
- ''
- # We only need to build stage1 on most cross-compilation because
- # we will be running the compiler on the native system. In some
- # situations, like native Musl compilation, we need the compiler
- # to actually link to our new Libc. The iOS simulator is a special
- # exception because we can’t actually run simulators binaries
- # ourselves.
- + lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
- CrossCompilePrefix = ${targetPrefix}
- HADDOCK_DOCS = NO
- BUILD_SPHINX_HTML = NO
- BUILD_SPHINX_PDF = NO
- '' + lib.optionalString dontStrip ''
- STRIP_CMD = :
- '' + lib.optionalString (!enableProfiledLibs) ''
- GhcLibWays = "v dyn"
- '' + lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- EXTRA_CC_OPTS += -std=gnu99
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: lib.optional enableTerminfo ncurses
- ++ [libffi]
- ++ lib.optional (!enableIntegerSimple) gmp
- ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
- toolsForTarget = [
- pkgsBuildTarget.targetPackages.stdenv.cc
- ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
- # see #84670 and #49071 for more background.
- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
-
-in
-stdenv.mkDerivation (rec {
- version = "8.10.1";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "1xgdl6ig5jzli3bg054vfryfkg0y6wggf68g66c32sr67bw0ffsf";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "doc" ];
-
- patches = [
- # See upstream patch at
- # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
- # from source distributions, the auto-generated configure script needs to be
- # patched as well, therefore we use an in-tree patch instead of pulling the
- # upstream patch. Don't forget to check backport status of the upstream patch
- # when adding new GHC releases in nixpkgs.
- ./respect-ar-path.patch
- ];
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK dontStrip}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
- '' + lib.optionalString targetPlatform.isMusl ''
- echo "patching llvm-targets for musl targets..."
- echo "Cloning these existing '*-linux-gnu*' targets:"
- grep linux-gnu llvm-targets | sed 's/^/ /'
- echo "(go go gadget sed)"
- sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
- echo "llvm-targets now contains these '*-linux-musl*' targets:"
- grep linux-musl llvm-targets | sed 's/^/ /'
-
- echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
- # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
- for x in configure aclocal.m4; do
- substituteInPlace $x \
- --replace '*-android*|*-gnueabi*)' \
- '*-android*|*-gnueabi*|*-musleabi*)'
- done
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ lib.optional (targetPlatform != hostPlatform) "target";
-
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ lib.optionals (libffi != null) [
- "--with-system-libffi"
- "--with-ffi-includes=${targetPackages.libffi.dev}/include"
- "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include"
- "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
- "--with-iconv-includes=${libiconv}/include"
- "--with-iconv-libraries=${libiconv}/lib"
- ] ++ lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ lib.optionals useLdGold [
- "CFLAGS=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
- ] ++ lib.optionals (disableLargeAddressSpace) [
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatibility.
- strictDeps = true;
-
- # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
- dontAddExtraLibs = true;
-
- nativeBuildInputs = [
- perl autoconf automake m4 python3 sphinx
- ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- checkTarget = "test";
-
- hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
-
- postInstall = ''
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-${version}";
- };
-
- meta = {
- homepage = "http://haskell.org/ghc";
- description = "The Glasgow Haskell Compiler";
- maintainers = with lib.maintainers; [ marcweber andres peti ];
- timeout = 24 * 3600;
- inherit (ghc.meta) license platforms;
- };
-
- dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
-
-} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
- dontPatchELF = true;
- noAuditTmpdir = true;
-})
diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix
deleted file mode 100644
index a42dfce6468a..000000000000
--- a/pkgs/development/compilers/ghc/8.10.2.nix
+++ /dev/null
@@ -1,267 +0,0 @@
-{ lib, stdenv, pkgsBuildTarget, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
-, bash
-
-, libiconv ? null, ncurses
-
-, # GHC can be built with system libffi or a bundled one.
- libffi ? null
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
- # aarch64 outputs otherwise exceed 2GB limit
-, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whether to build terminfo.
- enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
- (if useLLVM then "perf-cross" else "perf-cross-ncg")
-
-, # Whether to disable the large address space allocator
- # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- buildMK = ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
- '' + lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
- CrossCompilePrefix = ${targetPrefix}
- HADDOCK_DOCS = NO
- BUILD_SPHINX_HTML = NO
- BUILD_SPHINX_PDF = NO
- '' + lib.optionalString (!enableProfiledLibs) ''
- GhcLibWays = "v dyn"
- '' + lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- EXTRA_CC_OPTS += -std=gnu99
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: lib.optional enableTerminfo ncurses
- ++ [libffi]
- ++ lib.optional (!enableIntegerSimple) gmp
- ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
- toolsForTarget = [
- pkgsBuildTarget.targetPackages.stdenv.cc
- ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
- # see #84670 and #49071 for more background.
- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
-
-in
-stdenv.mkDerivation (rec {
- version = "8.10.2";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "02w8n085bw38vyp694j0lfk5wcnwkdaj7hhp0saj71x74533lmww";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "doc" ];
-
- patches = [
- # See upstream patch at
- # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
- # from source distributions, the auto-generated configure script needs to be
- # patched as well, therefore we use an in-tree patch instead of pulling the
- # upstream patch. Don't forget to check backport status of the upstream patch
- # when adding new GHC releases in nixpkgs.
- ./respect-ar-path.patch
-
- # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
- ./issue-18549.patch
- ] ++ lib.optionals stdenv.isDarwin [
- # Make Block.h compile with c++ compilers. Remove with the next release
- (fetchpatch {
- url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
- sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5";
- })
- ];
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
- '' + lib.optionalString targetPlatform.isMusl ''
- echo "patching llvm-targets for musl targets..."
- echo "Cloning these existing '*-linux-gnu*' targets:"
- grep linux-gnu llvm-targets | sed 's/^/ /'
- echo "(go go gadget sed)"
- sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
- echo "llvm-targets now contains these '*-linux-musl*' targets:"
- grep linux-musl llvm-targets | sed 's/^/ /'
-
- echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
- # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
- for x in configure aclocal.m4; do
- substituteInPlace $x \
- --replace '*-android*|*-gnueabi*)' \
- '*-android*|*-gnueabi*|*-musleabi*)'
- done
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ lib.optional (targetPlatform != hostPlatform) "target";
-
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ lib.optionals (libffi != null) [
- "--with-system-libffi"
- "--with-ffi-includes=${targetPackages.libffi.dev}/include"
- "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include"
- "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
- "--with-iconv-includes=${libiconv}/include"
- "--with-iconv-libraries=${libiconv}/lib"
- ] ++ lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ lib.optionals useLdGold [
- "CFLAGS=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
- ] ++ lib.optionals (disableLargeAddressSpace) [
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatibility.
- strictDeps = true;
-
- # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
- dontAddExtraLibs = true;
-
- nativeBuildInputs = [
- perl autoconf automake m4 python3 sphinx
- ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- checkTarget = "test";
-
- hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
-
- postInstall = ''
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-${version}";
- };
-
- meta = {
- homepage = "http://haskell.org/ghc";
- description = "The Glasgow Haskell Compiler";
- maintainers = with lib.maintainers; [ marcweber andres peti ];
- timeout = 24 * 3600;
- inherit (ghc.meta) license platforms;
- };
-
-} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
- dontStrip = true;
- dontPatchELF = true;
- noAuditTmpdir = true;
-})
diff --git a/pkgs/development/compilers/ghc/8.10.3.nix b/pkgs/development/compilers/ghc/8.10.3.nix
deleted file mode 100644
index fe160259f2b3..000000000000
--- a/pkgs/development/compilers/ghc/8.10.3.nix
+++ /dev/null
@@ -1,264 +0,0 @@
-{ lib, stdenv, pkgsBuildTarget, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
-, bash
-
-, libiconv ? null, ncurses
-
-, # GHC can be built with system libffi or a bundled one.
- libffi ? null
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
- # aarch64 outputs otherwise exceed 2GB limit
-, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whether to build terminfo.
- enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
- (if useLLVM then "perf-cross" else "perf-cross-ncg")
-
-, # Whether to disable the large address space allocator
- # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- buildMK = ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
- '' + lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
- CrossCompilePrefix = ${targetPrefix}
- HADDOCK_DOCS = NO
- BUILD_SPHINX_HTML = NO
- BUILD_SPHINX_PDF = NO
- '' + lib.optionalString (!enableProfiledLibs) ''
- GhcLibWays = "v dyn"
- '' + lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- EXTRA_CC_OPTS += -std=gnu99
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: lib.optional enableTerminfo ncurses
- ++ [libffi]
- ++ lib.optional (!enableIntegerSimple) gmp
- ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
- toolsForTarget = [
- pkgsBuildTarget.targetPackages.stdenv.cc
- ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
- # see #84670 and #49071 for more background.
- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
-
-in
-stdenv.mkDerivation (rec {
- version = "8.10.3";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "0cdrdvs5qnqr93cr9zvrlfjv2xr671kjjghnsw4afa4hahcq7p6c";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "doc" ];
-
- patches = [
- # See upstream patch at
- # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
- # from source distributions, the auto-generated configure script needs to be
- # patched as well, therefore we use an in-tree patch instead of pulling the
- # upstream patch. Don't forget to check backport status of the upstream patch
- # when adding new GHC releases in nixpkgs.
- ./respect-ar-path.patch
- ] ++ lib.optionals stdenv.isDarwin [
- # Make Block.h compile with c++ compilers. Remove with the next release
- (fetchpatch {
- url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
- sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5";
- })
- ];
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
- '' + lib.optionalString targetPlatform.isMusl ''
- echo "patching llvm-targets for musl targets..."
- echo "Cloning these existing '*-linux-gnu*' targets:"
- grep linux-gnu llvm-targets | sed 's/^/ /'
- echo "(go go gadget sed)"
- sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
- echo "llvm-targets now contains these '*-linux-musl*' targets:"
- grep linux-musl llvm-targets | sed 's/^/ /'
-
- echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
- # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
- for x in configure aclocal.m4; do
- substituteInPlace $x \
- --replace '*-android*|*-gnueabi*)' \
- '*-android*|*-gnueabi*|*-musleabi*)'
- done
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ lib.optional (targetPlatform != hostPlatform) "target";
-
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ lib.optionals (libffi != null) [
- "--with-system-libffi"
- "--with-ffi-includes=${targetPackages.libffi.dev}/include"
- "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include"
- "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
- "--with-iconv-includes=${libiconv}/include"
- "--with-iconv-libraries=${libiconv}/lib"
- ] ++ lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ lib.optionals useLdGold [
- "CFLAGS=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
- ] ++ lib.optionals (disableLargeAddressSpace) [
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatibility.
- strictDeps = true;
-
- # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
- dontAddExtraLibs = true;
-
- nativeBuildInputs = [
- perl autoconf automake m4 python3 sphinx
- ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- checkTarget = "test";
-
- hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
-
- postInstall = ''
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-${version}";
- };
-
- meta = {
- homepage = "http://haskell.org/ghc";
- description = "The Glasgow Haskell Compiler";
- maintainers = with lib.maintainers; [ marcweber andres peti ];
- timeout = 24 * 3600;
- inherit (ghc.meta) license platforms;
- };
-
-} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
- dontStrip = true;
- dontPatchELF = true;
- noAuditTmpdir = true;
-})
diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix
deleted file mode 100644
index 5f83c2b2afc2..000000000000
--- a/pkgs/development/compilers/ghc/8.2.2-binary.nix
+++ /dev/null
@@ -1,191 +0,0 @@
-{ lib, stdenv, substituteAll
-, fetchurl, perl, gcc, llvm
-, ncurses5, gmp, glibc, libiconv
-, llvmPackages
-}:
-
-# Prebuilt only does native
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-let
- useLLVM = !stdenv.targetPlatform.isx86;
-
- libPath = lib.makeLibraryPath ([
- ncurses5 gmp
- ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
-
- libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY"
- + "LD_LIBRARY_PATH";
-
- glibcDynLinker = assert stdenv.isLinux;
- if stdenv.hostPlatform.libc == "glibc" then
- # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
- ''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
- else
- "${lib.getLib glibc}/lib/ld-linux*";
-
-in
-
-stdenv.mkDerivation rec {
- version = "8.2.2";
-
- name = "ghc-${version}-binary";
-
- src = fetchurl ({
- i686-linux = {
- url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
- sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy";
- };
- x86_64-linux = {
- url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
- sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8";
- };
- armv7l-linux = {
- url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz";
- sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46";
- };
- aarch64-linux = {
- url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz";
- sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7";
- };
- x86_64-darwin = {
- url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
- sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr";
- };
- }.${stdenv.hostPlatform.system}
- or (throw "cannot bootstrap GHC on this platform"));
-
- nativeBuildInputs = [ perl ];
- propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ];
-
- # Cannot patchelf beforehand due to relative RPATHs that anticipate
- # the final install location/
- ${libEnvVar} = libPath;
-
- postUnpack =
- # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
- # during linking
- lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- # not enough room in the object files for the full path to libiconv :(
- for exe in $(find . -type f -executable); do
- isScript $exe && continue
- ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
- install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
- done
- '' +
-
- # Some scripts used during the build need to have their shebangs patched
- ''
- patchShebangs ghc-${version}/utils/
- patchShebangs ghc-${version}/configure
- '' +
-
- # Strip is harmful, see also below. It's important that this happens
- # first. The GHC Cabal build system makes use of strip by default and
- # has hardcoded paths to /usr/bin/strip in many places. We replace
- # those below, making them point to our dummy script.
- ''
- mkdir "$TMP/bin"
- for i in strip; do
- echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
- chmod +x "$TMP/bin/$i"
- done
- PATH="$TMP/bin:$PATH"
- '' +
- # We have to patch the GMP paths for the integer-gmp package.
- ''
- find . -name integer-gmp.buildinfo \
- -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
- '' + lib.optionalString stdenv.isDarwin ''
- find . -name base.buildinfo \
- -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
- '' +
- # Rename needed libraries and binaries, fix interpreter
- lib.optionalString stdenv.isLinux ''
- find . -type f -perm -0100 -exec patchelf \
- --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
- --replace-needed libtinfo.so libtinfo.so.5 \
- --interpreter ${glibcDynLinker} {} \;
-
- sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
- sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
- '' +
- # We're kludging a glibc bindist into working with non-glibc...
- # Here we patch up the use of `__strdup` (part of glibc binary ABI)
- # to instead use `strdup` since musl doesn't provide __strdup
- # (`__strdup` is defined to be an alias of `strdup` anyway[1]).
- # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html
- # Use objcopy magic to make the change:
- lib.optionalString stdenv.hostPlatform.isMusl ''
- find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \;
- '';
-
- configurePlatforms = [ ];
- configureFlags =
- let
- gcc-clang-wrapper = substituteAll {
- inherit (stdenv) shell;
- isExecutable = true;
- src = ./gcc-clang-wrapper.sh;
- };
- in
- [ "--with-gmp-libraries=${lib.getLib gmp}/lib"
- "--with-gmp-includes=${lib.getDev gmp}/include"
- ] ++ lib.optional stdenv.isDarwin "--with-gcc=${gcc-clang-wrapper}"
- ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
-
- # Stripping combined with patchelf breaks the executables (they die
- # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
- dontStrip = true;
-
- # No building is necessary, but calling make without flags ironically
- # calls install-strip ...
- dontBuild = true;
-
- # On Linux, use patchelf to modify the executables so that they can
- # find editline/gmp.
- preFixup = lib.optionalString stdenv.isLinux ''
- for p in $(find "$out" -type f -executable); do
- if isELF "$p"; then
- echo "Patchelfing $p"
- patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
- fi
- done
- '' + lib.optionalString stdenv.isDarwin ''
- # not enough room in the object files for the full path to libiconv :(
- for exe in $(find "$out" -type f -executable); do
- isScript $exe && continue
- ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
- install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
- done
-
- for file in $(find "$out" -name setup-config); do
- substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
- done
- '';
-
- doInstallCheck = true;
- installCheckPhase = ''
- unset ${libEnvVar}
- # Sanity check, can ghc create executables?
- cd $TMP
- mkdir test-ghc; cd test-ghc
- cat > main.hs << EOF
- {-# LANGUAGE TemplateHaskell #-}
- module Main where
- main = putStrLn \$([|"yes"|])
- EOF
- $out/bin/ghc --make main.hs || exit 1
- echo compilation ok
- [ $(./main) == "yes" ]
- '';
-
- passthru = {
- targetPrefix = "";
- enableShared = true;
- };
-
- meta.license = lib.licenses.bsd3;
- meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
-}
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
deleted file mode 100644
index 8237f27241e7..000000000000
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ /dev/null
@@ -1,275 +0,0 @@
-{ lib, stdenv, pkgsBuildTarget, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
-, bash
-
-, libiconv ? null, ncurses
-
-, # GHC can be built with system libffi or a bundled one.
- libffi ? null
-
-, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whether to build terminfo.
- enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
- (if useLLVM then "perf-cross" else "perf-cross-ncg")
-
-, # Whether to disable the large address space allocator
- # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- buildMK = ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
- ''
- # We only need to build stage1 on most cross-compilation because
- # we will be running the compiler on the native system. In some
- # situations, like native Musl compilation, we need the compiler
- # to actually link to our new Libc. The iOS simulator is a special
- # exception because we can’t actually run simulators binaries
- # ourselves.
- + lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
- CrossCompilePrefix = ${targetPrefix}
- HADDOCK_DOCS = NO
- BUILD_SPHINX_HTML = NO
- BUILD_SPHINX_PDF = NO
- '' + lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- EXTRA_CC_OPTS += -std=gnu99
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: lib.optional enableTerminfo ncurses
- ++ [libffi]
- ++ lib.optional (!enableIntegerSimple) gmp
- ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
- toolsForTarget = [
- pkgsBuildTarget.targetPackages.stdenv.cc
- ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
- # see #84670 and #49071 for more background.
- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
-
-in
-stdenv.mkDerivation (rec {
- version = "8.6.5";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "doc" ];
-
- patches = [
- # See upstream patch at
- # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
- # from source distributions, the auto-generated configure script needs to be
- # patched as well, therefore we use an in-tree patch instead of pulling the
- # upstream patch. Don't forget to check backport status of the upstream patch
- # when adding new GHC releases in nixpkgs.
- ./respect-ar-path.patch
-
- (fetchpatch { # https://phabricator.haskell.org/D5123
- url = "https://gitlab.haskell.org/ghc/ghc/-/commit/13ff0b7ced097286e0d7b054f050871effe07f86.diff";
- name = "D5123.diff";
- sha256 = "140lmnqxra7xkwy370c5pyf8dgdwgmbpcrs1dapnwr2dh8bavn8c";
- })
- (fetchpatch { # https://github.com/haskell/haddock/issues/900
- url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
- name = "loadpluginsinmodules.diff";
- sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
- extraPrefix = "utils/haddock/";
- stripLen = 1;
- })
- ];
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
- '' + lib.optionalString targetPlatform.isMusl ''
- echo "patching llvm-targets for musl targets..."
- echo "Cloning these existing '*-linux-gnu*' targets:"
- grep linux-gnu llvm-targets | sed 's/^/ /'
- echo "(go go gadget sed)"
- sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
- echo "llvm-targets now contains these '*-linux-musl*' targets:"
- grep linux-musl llvm-targets | sed 's/^/ /'
-
- echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
- # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
- for x in configure aclocal.m4; do
- substituteInPlace $x \
- --replace '*-android*|*-gnueabi*)' \
- '*-android*|*-gnueabi*|*-musleabi*)'
- done
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ lib.optional (targetPlatform != hostPlatform) "target";
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
- "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
- ] ++ lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ lib.optionals useLdGold [
- "CFLAGS=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
- ] ++ lib.optionals (disableLargeAddressSpace) [
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatibility.
- strictDeps = true;
-
- # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
- dontAddExtraLibs = true;
-
- nativeBuildInputs = [
- perl autoconf automake m4 python3 sphinx
- ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- # See #63511 - the only unstripped file is the debug rts which isn't meant to
- # be stripped.
- dontStrip = true;
-
- checkTarget = "test";
-
- hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
-
- postInstall = ''
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- ''
- # Temporary work-around for https://github.com/NixOS/nixpkgs/issues/66277
- + lib.optionalString hostPlatform.isAarch64 ''
- rm -rf "$doc/share/doc/ghc/html/libraries"
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-${version}";
- };
-
- meta = {
- homepage = "http://haskell.org/ghc";
- description = "The Glasgow Haskell Compiler";
- maintainers = with lib.maintainers; [ marcweber andres peti ];
- timeout = 24 * 3600;
- inherit (ghc.meta) license platforms;
- };
-
-} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
- dontStrip = true;
- dontPatchELF = true;
- noAuditTmpdir = true;
-})
diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix
deleted file mode 100644
index 144e46459759..000000000000
--- a/pkgs/development/compilers/ghc/8.8.2.nix
+++ /dev/null
@@ -1,263 +0,0 @@
-{ lib, stdenv, pkgsBuildTarget, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
-, bash
-
-, libiconv ? null, ncurses
-
-, # GHC can be built with system libffi or a bundled one.
- libffi ? null
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whether to build terminfo.
- enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
- (if useLLVM then "perf-cross" else "perf-cross-ncg")
-
-, # Whether to disable the large address space allocator
- # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- buildMK = dontStrip: ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
- ''
- # We only need to build stage1 on most cross-compilation because
- # we will be running the compiler on the native system. In some
- # situations, like native Musl compilation, we need the compiler
- # to actually link to our new Libc. The iOS simulator is a special
- # exception because we can’t actually run simulators binaries
- # ourselves.
- + lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
- CrossCompilePrefix = ${targetPrefix}
- HADDOCK_DOCS = NO
- BUILD_SPHINX_HTML = NO
- BUILD_SPHINX_PDF = NO
- '' + lib.optionalString dontStrip ''
- STRIP_CMD = :
- '' + lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- EXTRA_CC_OPTS += -std=gnu99
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: lib.optional enableTerminfo ncurses
- ++ [libffi]
- ++ lib.optional (!enableIntegerSimple) gmp
- ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
- toolsForTarget = [
- pkgsBuildTarget.targetPackages.stdenv.cc
- ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
- # see #84670 and #49071 for more background.
- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
-
-in
-stdenv.mkDerivation (rec {
- version = "8.8.2";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "02qa6wgjpxgakg7hv4zfdlrx9k7zxa5i02wnr6y9fsv8j16sbkh1";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "doc" ];
-
- patches = [
- # See upstream patch at
- # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
- # from source distributions, the auto-generated configure script needs to be
- # patched as well, therefore we use an in-tree patch instead of pulling the
- # upstream patch. Don't forget to check backport status of the upstream patch
- # when adding new GHC releases in nixpkgs.
- ./respect-ar-path.patch
- ];
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK dontStrip}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
- '' + lib.optionalString targetPlatform.isMusl ''
- echo "patching llvm-targets for musl targets..."
- echo "Cloning these existing '*-linux-gnu*' targets:"
- grep linux-gnu llvm-targets | sed 's/^/ /'
- echo "(go go gadget sed)"
- sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
- echo "llvm-targets now contains these '*-linux-musl*' targets:"
- grep linux-musl llvm-targets | sed 's/^/ /'
-
- echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
- # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
- for x in configure aclocal.m4; do
- substituteInPlace $x \
- --replace '*-android*|*-gnueabi*)' \
- '*-android*|*-gnueabi*|*-musleabi*)'
- done
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ lib.optional (targetPlatform != hostPlatform) "target";
-
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ lib.optionals (libffi != null) [
- "--with-system-libffi"
- "--with-ffi-includes=${targetPackages.libffi.dev}/include"
- "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include"
- "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
- "--with-iconv-includes=${libiconv}/include"
- "--with-iconv-libraries=${libiconv}/lib"
- ] ++ lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ lib.optionals useLdGold [
- "CFLAGS=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
- ] ++ lib.optionals (disableLargeAddressSpace) [
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatibility.
- strictDeps = true;
-
- # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
- dontAddExtraLibs = true;
-
- nativeBuildInputs = [
- perl autoconf automake m4 python3 sphinx
- ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- checkTarget = "test";
-
- hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
-
- postInstall = ''
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-${version}";
- };
-
- meta = {
- homepage = "http://haskell.org/ghc";
- description = "The Glasgow Haskell Compiler";
- maintainers = with lib.maintainers; [ marcweber andres peti ];
- timeout = 24 * 3600;
- inherit (ghc.meta) license platforms;
- };
-
- dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
-
-} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
- dontPatchELF = true;
- noAuditTmpdir = true;
-})
diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix
deleted file mode 100644
index 9e99207d9aaa..000000000000
--- a/pkgs/development/compilers/ghc/8.8.3.nix
+++ /dev/null
@@ -1,268 +0,0 @@
-{ lib, stdenv, pkgsBuildTarget, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
-, bash
-
-, libiconv ? null, ncurses
-
-, # GHC can be built with system libffi or a bundled one.
- libffi ? null
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
- # aarch64 outputs otherwise exceed 2GB limit
-, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whether to build terminfo.
- enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
- (if useLLVM then "perf-cross" else "perf-cross-ncg")
-
-, # Whether to disable the large address space allocator
- # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- buildMK = dontStrip: ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
- ''
- # We only need to build stage1 on most cross-compilation because
- # we will be running the compiler on the native system. In some
- # situations, like native Musl compilation, we need the compiler
- # to actually link to our new Libc. The iOS simulator is a special
- # exception because we can’t actually run simulators binaries
- # ourselves.
- + lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
- CrossCompilePrefix = ${targetPrefix}
- HADDOCK_DOCS = NO
- BUILD_SPHINX_HTML = NO
- BUILD_SPHINX_PDF = NO
- '' + lib.optionalString dontStrip ''
- STRIP_CMD = :
- '' + lib.optionalString (!enableProfiledLibs) ''
- GhcLibWays = "v dyn"
- '' + lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- EXTRA_CC_OPTS += -std=gnu99
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: lib.optional enableTerminfo ncurses
- ++ [libffi]
- ++ lib.optional (!enableIntegerSimple) gmp
- ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
- toolsForTarget = [
- pkgsBuildTarget.targetPackages.stdenv.cc
- ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
- # see #84670 and #49071 for more background.
- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
-
-in
-stdenv.mkDerivation (rec {
- version = "8.8.3";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "128g932i3wix6ic03v04nh5755vyjiidzri9iybwad72yfmc1p70";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "doc" ];
-
- patches = [
- # See upstream patch at
- # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
- # from source distributions, the auto-generated configure script needs to be
- # patched as well, therefore we use an in-tree patch instead of pulling the
- # upstream patch. Don't forget to check backport status of the upstream patch
- # when adding new GHC releases in nixpkgs.
- ./respect-ar-path.patch
- ];
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK dontStrip}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
- sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
- '' + lib.optionalString targetPlatform.isMusl ''
- echo "patching llvm-targets for musl targets..."
- echo "Cloning these existing '*-linux-gnu*' targets:"
- grep linux-gnu llvm-targets | sed 's/^/ /'
- echo "(go go gadget sed)"
- sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
- echo "llvm-targets now contains these '*-linux-musl*' targets:"
- grep linux-musl llvm-targets | sed 's/^/ /'
-
- echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
- # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
- for x in configure aclocal.m4; do
- substituteInPlace $x \
- --replace '*-android*|*-gnueabi*)' \
- '*-android*|*-gnueabi*|*-musleabi*)'
- done
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ lib.optional (targetPlatform != hostPlatform) "target";
-
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ lib.optionals (libffi != null) [
- "--with-system-libffi"
- "--with-ffi-includes=${targetPackages.libffi.dev}/include"
- "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include"
- "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
- ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
- "--with-iconv-includes=${libiconv}/include"
- "--with-iconv-libraries=${libiconv}/lib"
- ] ++ lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ lib.optionals useLdGold [
- "CFLAGS=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
- ] ++ lib.optionals (disableLargeAddressSpace) [
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatibility.
- strictDeps = true;
-
- # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
- dontAddExtraLibs = true;
-
- nativeBuildInputs = [
- perl autoconf automake m4 python3 sphinx
- ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- checkTarget = "test";
-
- hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
-
- postInstall = ''
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-${version}";
- };
-
- meta = {
- homepage = "http://haskell.org/ghc";
- description = "The Glasgow Haskell Compiler";
- maintainers = with lib.maintainers; [ marcweber andres peti ];
- timeout = 24 * 3600;
- inherit (ghc.meta) license platforms;
- };
-
- dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
-
-} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
- dontPatchELF = true;
- noAuditTmpdir = true;
-})
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index b371cadb1dbf..50031f5acdc6 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
- version = "0.14.2";
+ version = "0.14.3";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-C56aM3FFnjtTQawQOnITVGXK5XSA/Pk7surt8MJHZK0=";
+ sha256 = "sha256-NCLPatJWpvYKM+QdJB/Gfldlz5MQynWZB8o4x4cf5cA=";
};
nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security ];
- cargoSha256 = "sha256-AkkXV1cOM5YFvG5dUt7VarSzWyBZmvFMW08n1KqSAxY=";
+ cargoSha256 = "sha256-Tvb6QJubV8FS8UER++bEhst7Z0hVw42TCl+wOzZzi8Y=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index cd33baad993b..e608a25462cc 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, pkg-config, libtool
, zip, libffi, libsigsegv, readline, gmp
-, gnutls, gnome2, cairo, SDL, sqlite
+, gnutls, gtk2, cairo, SDL, sqlite
, emacsSupport ? config.emacsSupport or false, emacs ? null }:
assert emacsSupport -> (emacs != null);
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
# http://smalltalk.gnu.org/download
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
+ libtool zip libffi libsigsegv-shared readline gmp gnutls gtk2
cairo SDL sqlite
]
++ lib.optional emacsSupport emacs;
diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
index 4432b1fe895d..d44f28f89294 100644
--- a/pkgs/development/compilers/go/1.15.nix
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -11,7 +11,7 @@ let
inherit (lib) optionals optionalString;
- version = "1.15.8";
+ version = "1.15.10";
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
- sha256 = "1hlphkrsvb5nza5ajm24x4nrhyg4b0afs88kk4jd310hg2vhl32l";
+ sha256 = "0rfx20y13cflv68nn8jci1fx34vfdn7qgyavm5hivd0h15pcmny1";
};
# perl is used for testing go vet
diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix
index 8267e9745dc1..d6690a71088e 100644
--- a/pkgs/development/compilers/go/1.16.nix
+++ b/pkgs/development/compilers/go/1.16.nix
@@ -11,7 +11,7 @@ let
inherit (lib) optionals optionalString;
- version = "1.16";
+ version = "1.16.2";
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
- sha256 = "0nn98xiw8zrvxf9f36p8dzc7ihrrkakr0g9jiy4haqb5alyhd23n";
+ sha256 = "1sl33wkhp6pi9f15f6khp5a7l7xwmpc3sp1zmji8pjr3g8l19jip";
};
# perl is used for testing go vet
diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix
index 9a0dc3435462..7eb8f8f7b984 100644
--- a/pkgs/development/compilers/go/binary.nix
+++ b/pkgs/development/compilers/go/binary.nix
@@ -8,8 +8,8 @@ let
"i686" = "386";
"x86_64" = "amd64";
"aarch64" = "arm64";
- "armv6l" = "arm";
- "armv7l" = "arm";
+ "armv6l" = "armv6l";
+ "armv7l" = "armv6l";
"powerpc64le" = "ppc64le";
}.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}");
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index fc30e37e4b7c..b54f57e9b646 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -89,7 +89,7 @@ let
makeMxCache = list:
stdenv.mkDerivation {
name = "mx-cache";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = with lib; ''
mkdir $out
${lib.concatMapStrings
diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix
index e10d10120347..011a7979df7f 100644
--- a/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/pkgs/development/compilers/gwt/2.4.0.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 584511923961..73b82ff48dbf 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -1,20 +1,44 @@
-{ lib, stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }:
-
-let inherit (ocamlPackages) ocaml camlp4; in
+{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls }:
let
- generic = { version, sha256, prePatch }:
+ ocamlDependencies = version:
+ if lib.versionAtLeast version "4.0"
+ then with ocaml-ng.ocamlPackages; [
+ ocaml
+ findlib
+ sedlex_2
+ xml-light
+ ptmap
+ camlp5
+ sha
+ dune_2
+ luv
+ ocaml_extlib
+ ] else with ocaml-ng.ocamlPackages_4_05; [
+ ocaml
+ camlp4
+ ];
+
+ defaultPatch = ''
+ substituteInPlace extra/haxelib_src/src/haxelib/client/Main.hx \
+ --replace '"neko"' '"${neko}/bin/neko"'
+ '';
+
+ generic = { sha256, version, prePatch ? defaultPatch }:
stdenv.mkDerivation {
pname = "haxe";
inherit version;
- buildInputs = [ocaml zlib pcre neko camlp4];
+ buildInputs = [ zlib pcre neko ]
+ ++ lib.optional (lib.versionAtLeast version "4.1") [ mbedtls ]
+ ++ ocamlDependencies version;
- src = fetchgit {
- url = "https://github.com/HaxeFoundation/haxe.git";
- inherit sha256;
+ src = fetchFromGitHub {
+ owner = "HaxeFoundation";
+ repo = "haxe";
+ rev = version;
fetchSubmodules = true;
- rev = "refs/tags/${version}";
+ inherit sha256;
};
inherit prePatch;
@@ -77,8 +101,8 @@ let
meta = with lib; {
description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
homepage = "https://haxe.org";
- license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt
- maintainers = [ maintainers.marcweber ];
+ license = with licenses; [ gpl2Plus mit ]; # based on upstream opam file
+ maintainers = [ maintainers.marcweber maintainers.locallycompact ];
platforms = platforms.linux ++ platforms.darwin;
};
};
@@ -89,15 +113,20 @@ in {
sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3";
prePatch = ''
sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' main.ml
- sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/tools/haxelib/Main.hx
+ substituteInPlace extra/haxelib_src/src/tools/haxelib/Main.hx \
+ --replace '"neko"' '"${neko}/bin/neko"'
'';
};
haxe_3_4 = generic {
version = "3.4.6";
sha256 = "1myc4b8fwp0f9vky17wv45n34a583f5sjvajsc93f5gm1wanp4if";
prePatch = ''
+ ${defaultPatch}
sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml
- sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx
'';
};
+ haxe_4_2 = generic {
+ version = "4.2.1";
+ sha256 = "sha256-0j6M21dh8DB1gC/bPYNJrVuDbJyqQbP+61ItO5RBUcA=";
+ };
}
diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix
index a523336b7b92..2a68090a04bd 100644
--- a/pkgs/development/compilers/julia/1.5.nix
+++ b/pkgs/development/compilers/julia/1.5.nix
@@ -1,7 +1,6 @@
-{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub
+{ lib, stdenv, fetchzip
# build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, cmake
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2, cmake
# libjulia dependencies
, libunwind, readline, utf8proc, zlib
# standard library dependencies
@@ -19,8 +18,8 @@ with lib;
let
majorVersion = "1";
minorVersion = "5";
- maintenanceVersion = "3";
- src_sha256 = "sha256:0jds8lrhk4hfdv7dg5p2ibzin9ivga7wrx7zwcmz6dqp3x792n1i";
+ maintenanceVersion = "4";
+ src_sha256 = "1ba1v7hakgj95xvhyff0zcp0574qv6vailjl48wl1f8w5k54lsw2";
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
in
@@ -28,10 +27,10 @@ stdenv.mkDerivation rec {
pname = "julia";
inherit version;
- src = fetchzip {
- url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
- sha256 = src_sha256;
- };
+ src = fetchzip {
+ url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
+ sha256 = src_sha256;
+ };
patches = [
./use-system-utf8proc-julia-1.3.patch
diff --git a/pkgs/development/compilers/julia/update-1.5.py b/pkgs/development/compilers/julia/update-1.5.py
new file mode 100755
index 000000000000..e37f37d456bf
--- /dev/null
+++ b/pkgs/development/compilers/julia/update-1.5.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p python3 python3Packages.requests
+
+import os
+import re
+import requests
+import subprocess
+
+latest = requests.get("https://api.github.com/repos/JuliaLang/julia/releases/latest").json()["tag_name"]
+assert latest[0] == "v"
+major, minor, patch = latest[1:].split(".")
+assert major == "1"
+# When a new minor version comes out we'll have to refactor/copy this update script.
+assert minor == "5"
+
+sha256 = subprocess.check_output(["nix-prefetch-url", "--unpack", f"https://github.com/JuliaLang/julia/releases/download/v{major}.{minor}.{patch}/julia-{major}.{minor}.{patch}-full.tar.gz"], text=True).strip()
+
+nix_path = os.path.join(os.path.dirname(__file__), "1.5.nix")
+nix0 = open(nix_path, "r").read()
+nix1 = re.sub("maintenanceVersion = \".*\";", f"maintenanceVersion = \"{patch}\";", nix0)
+nix2 = re.sub("src_sha256 = \".*\";", f"src_sha256 = \"{sha256}\";", nix1)
+open(nix_path, "w").write(nix2)
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 2ddc5b3d3a89..9154b7d76a64 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -12,8 +12,7 @@ in stdenv.mkDerivation {
};
propagatedBuildInputs = [ jre ] ;
- buildInputs = [ unzip ] ;
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper unzip ];
installPhase = ''
mkdir -p $out
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index e0a689c7fa05..a199747546ab 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,4 +1,4 @@
import ./generic.nix {
- version = "1.24.0";
- ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
+ version = "1.25.1";
+ ldcSha256 = "sha256-DjcW/pknvpEmTR/eXEEHECb2xEJic16evaU4CJthLUA=";
}
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix
index 37515b5039d8..64d57e3e811d 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
+ "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}"
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix
index c42e07eac4ca..88a412f6cb4f 100644
--- a/pkgs/development/compilers/llvm/11/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
] ++ lib.optionals (stdenv.isDarwin) [
"-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
+ "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}"
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
"-DCOMPILER_RT_BUILD_XRAY=OFF"
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 909c6b190536..81dbe7048e6b 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
index 6e47ffe8acaf..11d46289afe8 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 6320a3405d27..0f91f3c5e6c1 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 2e49ef17346d..a9dabebb59a0 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 2ab9dc8ffa2e..1e9aa1d5d1bf 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix
index 5f9dba0fc3cc..135fcd2d25ae 100644
--- a/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/default.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, callPackage, wrapCCWith }:
let
- version = "4.0.1";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "llvm-project";
rev = "rocm-${version}";
- hash = "sha256-5mQ8tN7A045JCF7tHKgAZAbyVmXOd6Wf0CVUiPA80YM=";
+ hash = "sha256-DlId/dF5r0ULl2omYPCyu1Ic3XKlLL7ndiCA0RaF264=";
};
in rec {
clang = wrapCCWith rec {
diff --git a/pkgs/development/compilers/llvm/rocm/lld.nix b/pkgs/development/compilers/llvm/rocm/lld.nix
index 2a05331f7a0f..a6e993bb203f 100644
--- a/pkgs/development/compilers/llvm/rocm/lld.nix
+++ b/pkgs/development/compilers/llvm/rocm/lld.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${llvm.src}" ];
+
postInstall = ''
moveToOutput include "$dev"
moveToOutput lib "$dev"
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 8b157fb4ca00..52606781935b 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,14 +1,16 @@
-{ lib, stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
}:
stdenv.mkDerivation rec {
pname = "neko";
- version = "2.2.0";
+ version = "2.3.0";
- src = fetchurl {
- url = "https://nekovm.org/media/neko-${version}-src.tar.gz";
- sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g";
+ src = fetchFromGitHub {
+ owner = "HaxeFoundation";
+ repo = "neko";
+ rev = "v${lib.replaceStrings [ "." ] [ "-" ] version}";
+ sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g";
};
nativeBuildInputs = [ cmake pkg-config git ];
@@ -31,8 +33,17 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A high-level dynamically typed programming language";
homepage = "https://nekovm.org";
- license = licenses.lgpl21;
- maintainers = [ maintainers.marcweber ];
+ license = [
+ # list based on https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE
+ licenses.gpl2Plus # nekoc, nekoml
+ licenses.lgpl21Plus # mysql.ndll
+ licenses.bsd3 # regexp.ndll
+ licenses.zlib # zlib.ndll
+ licenses.asl20 # mod_neko, mod_tora, mbedTLS
+ licenses.mit # overall, other libs
+ "https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE#L24-L40" # boehm gc
+ ];
+ maintainers = [ maintainers.marcweber maintainers.locallycompact ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 75b1a0f00203..676e35b06bb4 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,22 +1,10 @@
# https://nim-lang.github.io/Nim/packaging.html
+# https://nim-lang.org/docs/nimc.html
-{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub, makeWrapper, gdb, openssl
-, pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }:
+{ lib, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub, makeWrapper
+, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped }:
let
- version = "1.4.4";
- src = fetchurl {
- url = "https://nim-lang.org/download/nim-${version}.tar.xz";
- sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd";
- };
-
- meta = with lib; {
- description = "Statically typed, imperative programming language";
- homepage = "https://nim-lang.org/";
- license = licenses.mit;
- maintainers = with maintainers; [ ehmry ];
- };
-
parseCpu = platform:
with platform;
# Derive a Nim CPU identifier
@@ -83,197 +71,251 @@ let
nimHost = parsePlatform stdenv.hostPlatform;
nimTarget = parsePlatform stdenv.targetPlatform;
- wrapperInputs = rec {
+ bootstrapCompiler = stdenv.mkDerivation rec {
+ pname = "nim-bootstrap";
+ version = "0.20.0";
- bootstrap = stdenv.mkDerivation rec {
- pname = "nim-bootstrap";
- version = "0.20.0";
-
- src = fetchgit {
- # A Git checkout is much smaller than a GitHub tarball.
- url = "https://github.com/nim-lang/csources.git";
- rev = "v" + version;
- sha256 = "0i6vsfy1sgapx43n226q8m0pvn159sw2mhp50zm3hhb9zfijanis";
- };
-
- enableParallelBuilding = true;
-
- installPhase = ''
- runHook preInstall
- install -Dt $out/bin bin/nim
- runHook postInstall
- '';
+ src = fetchgit {
+ # A Git checkout is much smaller than a GitHub tarball.
+ url = "https://github.com/nim-lang/csources.git";
+ rev = "v${version}";
+ sha256 = "0i6vsfy1sgapx43n226q8m0pvn159sw2mhp50zm3hhb9zfijanis";
};
- unwrapped = stdenv.mkDerivation {
- pname = "nim-unwrapped";
- inherit version src;
-
- buildInputs = [ boehmgc openssl pcre readline sqlite ];
-
- patches = [
- ./NIM_CONFIG_DIR.patch
- # Override compiler configuration via an environmental variable
-
- ./nixbuild.patch
- # Load libraries at runtime by absolute path
- ];
-
- configurePhase = ''
- runHook preConfigure
- cp ${bootstrap}/bin/nim bin/
- echo 'define:nixbuild' >> config/nim.cfg
- runHook postConfigure
- '';
-
- kochArgs = [
- "--cpu:${nimHost.cpu}"
- "--os:${nimHost.os}"
- "-d:release"
- "-d:useGnuReadline"
- ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux)
- "-d:nativeStacktrace";
-
- buildPhase = ''
- runHook preBuild
- local HOME=$TMPDIR
- ./bin/nim c koch
- ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
- ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
- install -Dt $out/bin bin/*
- ln -sf $out/nim/bin/nim $out/bin/nim
- ./install.sh $out
- runHook postInstall
- '';
-
- inherit meta;
- };
-
- nimble-unwrapped = stdenv.mkDerivation rec {
- pname = "nimble-unwrapped";
- version = "0.13.1";
-
- src = fetchFromGitHub {
- owner = "nim-lang";
- repo = "nimble";
- rev = "v" + version;
- sha256 = "1idb4r0kjbqv16r6bgmxlr13w2vgq5332hmnc8pjbxiyfwm075x8";
- };
-
- nativeBuildInputs = [ nim-unwrapped ];
- buildInputs = [ openssl ];
-
- nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];
-
- buildPhase = ''
- runHook preBuild
- HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preBuild
- install -Dt $out/bin src/nimble
- runHook postBuild
- '';
- };
+ enableParallelBuilding = true;
+ installPhase = ''
+ runHook preInstall
+ install -Dt $out/bin bin/nim
+ runHook postInstall
+ '';
};
- wrapped = let
- nim' = nim-unwrapped;
- nimble' = nimble-unwrapped;
+in {
+
+ nim-unwrapped = stdenv.mkDerivation rec {
+ pname = "nim-unwrapped";
+ version = "1.4.4";
+ strictDeps = true;
+
+ src = fetchurl {
+ url = "https://nim-lang.org/download/nim-${version}.tar.xz";
+ sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd";
+ };
+
+ buildInputs = [ boehmgc openssl pcre readline sqlite ];
+
+ patches = [
+ ./NIM_CONFIG_DIR.patch
+ # Override compiler configuration via an environmental variable
+
+ ./nixbuild.patch
+ # Load libraries at runtime by absolute path
+ ];
+
+ configurePhase = ''
+ runHook preConfigure
+ cp ${bootstrapCompiler}/bin/nim bin/
+ echo 'define:nixbuild' >> config/nim.cfg
+ runHook postConfigure
+ '';
+
+ kochArgs = [
+ "--cpu:${nimHost.cpu}"
+ "--os:${nimHost.os}"
+ "-d:release"
+ "-d:useGnuReadline"
+ ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace";
+
+ buildPhase = ''
+ runHook preBuild
+ local HOME=$TMPDIR
+ ./bin/nim c koch
+ ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
+ ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -Dt $out/bin bin/*
+ ln -sf $out/nim/bin/nim $out/bin/nim
+ ./install.sh $out
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Statically typed, imperative programming language";
+ homepage = "https://nim-lang.org/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ehmry ];
+ };
+ };
+
+ nimble-unwrapped = stdenv.mkDerivation rec {
+ pname = "nimble-unwrapped";
+ version = "0.13.1";
+ strictDeps = true;
+
+ src = fetchFromGitHub {
+ owner = "nim-lang";
+ repo = "nimble";
+ rev = "v${version}";
+ sha256 = "1idb4r0kjbqv16r6bgmxlr13w2vgq5332hmnc8pjbxiyfwm075x8";
+ };
+
+ depsBuildBuild = [ nim-unwrapped ];
+ buildInputs = [ openssl ];
+
+ nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];
+
+ buildPhase = ''
+ runHook preBuild
+ HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preBuild
+ install -Dt $out/bin src/nimble
+ runHook postBuild
+ '';
+ };
+
+ nim = let
+ nim' = buildPackages.nim-unwrapped;
+ nimble' = buildPackages.nimble-unwrapped;
inherit (stdenv) targetPlatform;
in stdenv.mkDerivation {
name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
inherit (nim') version;
preferLocalBuild = true;
+ strictDeps = true;
nativeBuildInputs = [ makeWrapper ];
+ patches = [
+ ./nim.cfg.patch
+ # Remove configurations that clash with ours
+ ];
+
unpackPhase = ''
runHook preUnpack
- tar xf ${nim'.src} nim-$version/config/nim.cfg
+ tar xf ${nim'.src} nim-$version/config
cd nim-$version
runHook postUnpack
'';
dontConfigure = true;
- wrapperArgs = [
- "--prefix PATH : ${lib.makeBinPath [ stdenv.cc gdb ]}:${
- placeholder "out"
- }/bin"
- "--prefix LD_LIBRARY_PATH : ${
- lib.makeLibraryPath [ stdenv.cc.libc openssl ]
- }"
- "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
- ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"''
- # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
- ];
-
- buildPhase = with stdenv;
- let
- ccType = if cc.isGNU then
- "gcc"
- else if cc.isClang then
- "clang"
- else
- abort "no Nim configuration available for ${cc.name}";
- in ''
+ buildPhase =
+ # Configure the Nim compiler to use $CC and $CXX as backends
+ # The compiler is configured by two configuration files, each with
+ # a different DSL. The order of evaluation matters and that order
+ # is not documented, so duplicate the configuration across both files.
+ ''
runHook preBuild
- cat >> config/nim.cfg << EOF
+ cat >> config/config.nims << WTF
- define:nixbuild
- os = ${nimTarget.os}
- cpu = ${nimTarget.cpu}
- cc = ${ccType}
- EOF
+ switch("os", "${nimTarget.os}")
+ switch("cpu", "${nimTarget.cpu}")
+ switch("define", "nixbuild")
- mkdir -p $out/bin $out/etc/nim
- export cc=$CC
- export cxx=$CXX
- substituteAll config/nim.cfg $out/etc/nim/nim.cfg \
- --replace "cc = gcc" ""
+ # Configure the compiler using the $CC set by Nix at build time
+ import strutils
+ let cc = getEnv"CC"
+ if cc.contains("gcc"):
+ switch("cc", "gcc")
+ elif cc.contains("clang"):
+ switch("cc", "clang")
+ WTF
- for binpath in ${nim'}/bin/nim?*; do
- local binname=`basename $binpath`
- makeWrapper \
- $binpath $out/bin/${targetPlatform.config}-$binname \
- $wrapperArgs
- ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
- done
+ mv config/nim.cfg config/nim.cfg.old
+ cat > config/nim.cfg << WTF
+ os = "${nimTarget.os}"
+ cpu = "${nimTarget.cpu}"
+ define:"nixbuild"
+ WTF
- makeWrapper \
- ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
- $wrapperArgs
- ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
+ cat >> config/nim.cfg < config/nim.cfg.old
+ rm config/nim.cfg.old
- makeWrapper \
- ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
- $wrapperArgs
- ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
+ cat >> config/nim.cfg << WTF
- makeWrapper \
- ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
- --suffix PATH : $out/bin
- ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
+ clang.cpp.exe %= "\$CXX"
+ clang.cpp.linkerexe %= "\$CXX"
+ clang.exe %= "\$CC"
+ clang.linkerexe %= "\$CC"
+ gcc.cpp.exe %= "\$CXX"
+ gcc.cpp.linkerexe %= "\$CXX"
+ gcc.exe %= "\$CC"
+ gcc.linkerexe %= "\$CC"
+ WTF
runHook postBuild
'';
- dontInstall = true;
+ wrapperArgs = [
+ "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
+ placeholder "out"
+ }/bin"
+ # Used by nim-gdb
- meta = meta // {
+ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
+ # These libraries may be referred to by the standard library.
+ # This is broken for cross-compilation because the package
+ # set will be shifted back by nativeBuildInputs.
+
+ "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
+ # Use the custom configuration
+
+ ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"''
+ # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/etc
+
+ cp -r config $out/etc/nim
+
+ for binpath in ${nim'}/bin/nim?*; do
+ local binname=`basename $binpath`
+ makeWrapper \
+ $binpath $out/bin/${targetPlatform.config}-$binname \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
+ done
+
+ makeWrapper \
+ ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
+
+ makeWrapper \
+ ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
+
+ makeWrapper \
+ ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
+ --suffix PATH : $out/bin
+ ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
+
+ runHook postInstall
+ '';
+
+ passthru = {
+ nim = nim';
+ nimble = nimble';
+ };
+
+ meta = nim'.meta // {
description = nim'.meta.description
+ " (${targetPlatform.config} wrapper)";
- platforms = lib.platforms.unix;
+ platforms = with lib.platforms; unix ++ genode;
};
};
-in wrapped // wrapperInputs
+}
diff --git a/pkgs/development/compilers/nim/nim.cfg.patch b/pkgs/development/compilers/nim/nim.cfg.patch
new file mode 100644
index 000000000000..a95b672d1c1d
--- /dev/null
+++ b/pkgs/development/compilers/nim/nim.cfg.patch
@@ -0,0 +1,70 @@
+diff --git a/config/nim.cfg b/config/nim.cfg
+index a33a2f0a9..e069193ff 100644
+--- a/config/nim.cfg
++++ b/config/nim.cfg
+@@ -8,26 +8,12 @@
+ # Environment variables can be accessed like so:
+ # gcc.path %= "$CC_PATH"
+
+-cc = gcc
+-
+ # additional options always passed to the compiler:
+ --parallel_build: "0" # 0 to auto-detect number of processors
+
+ hint[LineTooLong]=off
+ #hint[XDeclaredButNotUsed]=off
+
+-# Examples of how to setup a cross-compiler:
+-
+-# Cross-compiling for Raspberry Pi.
+-# (This compiler is available in gcc-arm-linux-gnueabihf package on Ubuntu)
+-arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc"
+-arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc"
+-
+-# For OpenWRT, you will also need to adjust PATH to point to your toolchain.
+-mips.linux.gcc.exe = "mips-openwrt-linux-gcc"
+-mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc"
+-
+-
+ path="$lib/deprecated/core"
+ path="$lib/deprecated/pure"
+ path="$lib/pure/collections"
+@@ -111,7 +97,7 @@ path="$lib/pure"
+ @end
+
+ @if unix:
+- @if not bsd or haiku:
++ @if not bsd or genode or haiku:
+ # -fopenmp
+ gcc.options.linker = "-ldl"
+ gcc.cpp.options.linker = "-ldl"
+@@ -295,29 +281,6 @@ vcc.cpp.options.size = "/O1"
+ # Configuration for the Tiny C Compiler:
+ tcc.options.always = "-w"
+
+-# Configuration for the Genode toolchain
+-@if genode:
+- noCppExceptions # avoid std C++
+- tlsEmulation:on # no TLS segment register magic
+- @if i386 or amd64:
+- gcc.exe = "genode-x86-gcc"
+- gcc.cpp.exe = "genode-x86-g++"
+- gcc.cpp.linkerexe = "genode-x86-ld"
+- @elif arm:
+- gcc.exe = "genode-arm-gcc"
+- gcc.cpp.exe = "genode-arm-g++"
+- gcc.cpp.linkerexe = "genode-arm-ld"
+- @elif arm64:
+- gcc.exe = "genode-aarch64-gcc"
+- gcc.cpp.exe = "genode-aarch64-g++"
+- gcc.cpp.linkerexe = "genode-aarch64-ld"
+- @elif riscv64:
+- gcc.exe = "genode-riscv-gcc"
+- gcc.cpp.exe = "genode-riscv-g++"
+- gcc.cpp.linkerexe = "genode-riscv-ld"
+- @end
+-@end
+-
+ @if arm or arm64:
+ --define:nimEmulateOverflowChecks
+ @end
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index d4a6b6250b52..d9853dd642ab 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -66,6 +66,10 @@ stdenv.mkDerivation (args // {
preConfigure = optionalString (!lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
+ '' + optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
+ # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176
+ # This is required for aarch64-darwin, everything else works as is.
+ AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c"
'';
postBuild = ''
mkdir -p $out/include
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index a24dca373f1e..f9dd7205659e 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -25,9 +25,9 @@ let
sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index f1c6d8493eb7..8c12b5be7f2e 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -22,9 +22,9 @@ let
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index 05e367e63146..7e4d9fc7d693 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -22,9 +22,9 @@ let
sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix
index bda6444a8f98..d98d0e9f8ee6 100644
--- a/pkgs/development/compilers/openjdk/14.nix
+++ b/pkgs/development/compilers/openjdk/14.nix
@@ -22,9 +22,9 @@ let
sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 96a01b0cd925..75dc722b1b22 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -83,9 +83,9 @@ let
outputs = [ "out" "jre" ];
- nativeBuildInputs = [ pkg-config lndir ];
+ nativeBuildInputs = [ pkg-config lndir unzip ];
buildInputs = [
- cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
+ cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix
index 069380802ac5..6bcd79b274be 100644
--- a/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -15,7 +15,8 @@ let
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
};
- buildInputs = [ unzip freetype ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ freetype ];
installPhase = ''
mkdir -p $out
diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix
index 4df180c1f5a7..a5cd15817e9a 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -18,7 +18,8 @@ let
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
};
- buildInputs = [ unzip freetype ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ freetype ];
installPhase = ''
mkdir -p $out
diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index 8885db4115ea..938210547605 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -7,15 +7,17 @@ let
};
jdk = stdenv.mkDerivation rec {
- name = "zulu15.28.51-ca-jdk15.0.1";
+ pname = "zulu15.28.51-ca-jdk";
+ version = "15.0.1";
src = fetchurl {
- url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
+ url = "https://cdn.azul.com/zulu/bin/${pname}${version}-macosx_x64.tar.gz";
sha256 = "0h738pbnwcn7pjp0qyryzazqj5nw5sy2f8l0ycl39crm9ia6akvh";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};
- buildInputs = [ unzip freetype ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ freetype ];
installPhase = ''
mkdir -p $out
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index ddd523ad7871..5606059c62d3 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -22,9 +22,9 @@ let
sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix
index 5da1ec77016c..8910d7f1e610 100644
--- a/pkgs/development/compilers/ponyc/pony-corral.nix
+++ b/pkgs/development/compilers/ponyc/pony-corral.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation ( rec {
pname = "corral";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "ponylang";
repo = pname;
rev = version;
- sha256 = "0kydx4psl6k4n46as9xc5xwbwapibm6g7haxds7y9d392807qfqk";
+ sha256 = "sha256-YJZ1jGMOeZKGZaTrWO2mtR94F0voC2DXaghi0LytF7I=";
};
buildInputs = [ ponyc ];
diff --git a/pkgs/development/compilers/rust/1_49.nix b/pkgs/development/compilers/rust/1_50.nix
similarity index 59%
rename from pkgs/development/compilers/rust/1_49.nix
rename to pkgs/development/compilers/rust/1_50.nix
index 3e76cdfe9690..06449d59dad6 100644
--- a/pkgs/development/compilers/rust/1_49.nix
+++ b/pkgs/development/compilers/rust/1_50.nix
@@ -19,8 +19,8 @@
} @ args:
import ./default.nix {
- rustcVersion = "1.49.0";
- rustcSha256 = "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm";
+ rustcVersion = "1.50.0";
+ rustcSha256 = "0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm";
llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
@@ -33,22 +33,22 @@ import ./default.nix {
# Note: the version MUST be one version prior to the version we're
# building
- bootstrapVersion = "1.48.0";
+ bootstrapVersion = "1.49.0";
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
- i686-unknown-linux-gnu = "7fdb8836a1f0427d5b47e6a2d496f67ebff04350407411f57cf20c9b3544e26f";
- x86_64-unknown-linux-gnu = "950420a35b2dd9091f1b93a9ccd5abc026ca7112e667f246b1deb79204e2038b";
- x86_64-unknown-linux-musl = "4ed9627f57b4e0b9807fc5e7513d9731f4791668b7f875b9e44e65e21072c56f";
- arm-unknown-linux-gnueabihf = "e68a81eebd4570343a0fc35cb8ee24cad911d6cee2e374f284b76546ca6636d5";
- armv7-unknown-linux-gnueabihf = "3aed4a63ebdd57690a31d11afbe95e6407edc224a6769be5694a1ed43bf899cb";
- aarch64-unknown-linux-gnu = "c4769418d8d89f432e4a3a21ad60f99629e4b13bbfc29aef7d9d51c4e8ee8a8a";
- aarch64-unknown-linux-musl = "ac4de580a28e45a9773b389b296d13bfeeb08263cb1f8343859577a54940dae9";
- x86_64-apple-darwin = "20e727cad10f43e3abcedb2a80979ae26923038e0e8a855e8a783da255054113";
- powerpc64le-unknown-linux-gnu = "e6457a0214f3b1b04bd5b2618bba7e3826e254216420dede2971b571a1c13bb1";
+ i686-unknown-linux-gnu = "5371bfa2c8e566aa283acdfa93d24b981c789d7c040ac1ca74e76bff1c7f6598";
+ x86_64-unknown-linux-gnu = "8b14446df82f3707d69cf58fed92f18e0bff91621c62baf89288ef70e3e92981";
+ x86_64-unknown-linux-musl = "f92a5a4adcfac4206a223d089a364a8375d1b6f112f3f2efa3f6d53d08a61904";
+ arm-unknown-linux-gnueabihf = "e5d93576eef874a9b22be9aa157cac5c8cdebebde8b57f0693248d4a589df42c";
+ armv7-unknown-linux-gnueabihf = "34ba3c979b144ef27d3c71d177cc1774551edf26e79d36719c86a51d9b9e34c0";
+ aarch64-unknown-linux-gnu = "b551bd482041307fa3373a687d6d6a2c4c0931c2e0a68b8b75dc80bc5cf5f002";
+ aarch64-unknown-linux-musl = "0a43d96a508c720520328112d609916d062f866a5c35f1db8f906284035d6d98";
+ x86_64-apple-darwin = "fe3e248bc4b0ee0a2595693687ad845c8a8bda824a56c9321520bcca02433716";
+ powerpc64le-unknown-linux-gnu = "365d7721dd2521e5dad12aa73651bad2be375e798e443636d2c523cad5b54359";
};
- selectRustPackage = pkgs: pkgs.rust_1_49;
+ selectRustPackage = pkgs: pkgs.rust_1_50;
rustcPatches = [
];
diff --git a/pkgs/development/compilers/solc/0.7.nix b/pkgs/development/compilers/solc/0.7.nix
new file mode 100644
index 000000000000..99b67b56510d
--- /dev/null
+++ b/pkgs/development/compilers/solc/0.7.nix
@@ -0,0 +1,78 @@
+{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
+, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
+, cln ? null, gmp ? null
+}:
+
+# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
+# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS
+
+assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0";
+assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
+
+let
+ jsoncppVersion = "1.9.4";
+ jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz";
+ jsoncpp = fetchzip {
+ url = jsoncppUrl;
+ sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
+ };
+in
+gccStdenv.mkDerivation rec {
+
+ pname = "solc";
+ version = "0.7.4";
+
+ # upstream suggests avoid using archive generated by github
+ src = fetchzip {
+ url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
+ sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg";
+ };
+
+ postPatch = ''
+ substituteInPlace cmake/jsoncpp.cmake \
+ --replace "${jsoncppUrl}" ${jsoncpp}
+ '';
+
+ cmakeFlags = [
+ "-DBoost_USE_STATIC_LIBS=OFF"
+ ] ++ lib.optionals (!z3Support) [
+ "-DUSE_Z3=OFF"
+ ] ++ lib.optionals (!cvc4Support) [
+ "-DUSE_CVC4=OFF"
+ ];
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ boost ]
+ ++ lib.optionals z3Support [ z3 ]
+ ++ lib.optionals cvc4Support [ cvc4 cln gmp ];
+ checkInputs = [ ncurses python3 ];
+
+ # Test fails on darwin for unclear reason
+ doCheck = gccStdenv.hostPlatform.isLinux;
+
+ checkPhase = ''
+ while IFS= read -r -d ''' dir
+ do
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir
+ export LD_LIBRARY_PATH
+ done < <(find . -type d -print0)
+
+ pushd ..
+ # IPC tests need aleth avaliable, so we disable it
+ sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
+ for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do
+ patchShebangs "$i"
+ done
+ TERM=xterm ./scripts/tests.sh
+ popd
+ '';
+
+ meta = with lib; {
+ description = "Compiler for Ethereum smart contract language Solidity";
+ homepage = "https://github.com/ethereum/solidity";
+ license = licenses.gpl3;
+ platforms = with platforms; linux; # darwin is currently broken
+ maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
+ inherit version;
+ };
+}
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 546697d8efec..c8f0c50d8a59 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,6 +1,16 @@
-{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
-, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
-, cln ? null, gmp ? null
+{ lib, gccStdenv, fetchzip
+, boost
+, cmake
+, coreutils
+, fetchpatch
+, ncurses
+, python3
+, z3Support ? true
+, z3 ? null
+, cvc4Support ? true
+, cvc4 ? null
+, cln ? null
+, gmp ? null
}:
# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
@@ -10,69 +20,88 @@ assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0";
assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
let
- jsoncppVersion = "1.9.4";
+ jsoncppVersion = "1.9.3";
jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz";
jsoncpp = fetchzip {
url = jsoncppUrl;
- sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
+ sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq";
+ };
+
+ range3Version = "0.11.0";
+ range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz";
+ range3 = fetchzip {
+ url = range3Url;
+ sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh";
+ };
+
+ solc = gccStdenv.mkDerivation rec {
+ pname = "solc";
+ version = "0.8.2";
+
+ # upstream suggests avoid using archive generated by github
+ src = fetchzip {
+ url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
+ sha256 = "11w7sa1y2dirzh84k04fkwbfc6xpjp5jr65w1pmb2pnkjvvf46xq";
+ };
+
+ postPatch = ''
+ substituteInPlace cmake/jsoncpp.cmake \
+ --replace "${jsoncppUrl}" ${jsoncpp}
+ substituteInPlace cmake/range-v3.cmake \
+ --replace "${range3Url}" ${range3}
+ '';
+
+ cmakeFlags = [
+ "-DBoost_USE_STATIC_LIBS=OFF"
+ ] ++ lib.optionals (!z3Support) [
+ "-DUSE_Z3=OFF"
+ ] ++ lib.optionals (!cvc4Support) [
+ "-DUSE_CVC4=OFF"
+ ];
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ boost ]
+ ++ lib.optionals z3Support [ z3 ]
+ ++ lib.optionals cvc4Support [ cvc4 cln gmp ];
+ checkInputs = [ ncurses python3 ];
+
+ # tests take 60+ minutes to complete, only run as part of passthru tests
+ doCheck = false;
+
+ checkPhase = ''
+ while IFS= read -r -d ''' dir
+ do
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir
+ export LD_LIBRARY_PATH
+ done < <(find . -type d -print0)
+
+ pushd ..
+ # IPC tests need aleth avaliable, so we disable it
+ sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
+ for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do
+ patchShebangs "$i"
+ done
+ TERM=xterm ./scripts/tests.sh
+ popd
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/solc --version > /dev/null
+ '';
+
+ passthru.tests = {
+ solcWithTests = solc.overrideAttrs (attrs: { doCheck = true; });
+ };
+
+ meta = with lib; {
+ description = "Compiler for Ethereum smart contract language Solidity";
+ homepage = "https://github.com/ethereum/solidity";
+ license = licenses.gpl3;
+ platforms = with platforms; linux; # darwin is currently broken
+ maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
+ inherit version;
+ };
};
in
-gccStdenv.mkDerivation rec {
-
- pname = "solc";
- version = "0.7.4";
-
- # upstream suggests avoid using archive generated by github
- src = fetchzip {
- url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
- sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg";
- };
-
- postPatch = ''
- substituteInPlace cmake/jsoncpp.cmake \
- --replace "${jsoncppUrl}" ${jsoncpp}
- '';
-
- cmakeFlags = [
- "-DBoost_USE_STATIC_LIBS=OFF"
- ] ++ lib.optionals (!z3Support) [
- "-DUSE_Z3=OFF"
- ] ++ lib.optionals (!cvc4Support) [
- "-DUSE_CVC4=OFF"
- ];
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ boost ]
- ++ lib.optionals z3Support [ z3 ]
- ++ lib.optionals cvc4Support [ cvc4 cln gmp ];
- checkInputs = [ ncurses python3 ];
-
- # Test fails on darwin for unclear reason
- doCheck = gccStdenv.hostPlatform.isLinux;
-
- checkPhase = ''
- while IFS= read -r -d ''' dir
- do
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir
- export LD_LIBRARY_PATH
- done < <(find . -type d -print0)
-
- pushd ..
- # IPC tests need aleth avaliable, so we disable it
- sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
- for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do
- patchShebangs "$i"
- done
- TERM=xterm ./scripts/tests.sh
- popd
- '';
-
- meta = with lib; {
- description = "Compiler for Ethereum smart contract language Solidity";
- homepage = "https://github.com/ethereum/solidity";
- license = licenses.gpl3;
- platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
- inherit version;
- };
-}
+ solc
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index ce666852e38a..addf64138011 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -4,7 +4,32 @@
, cmake, libyaml, Security
, libjpeg, libX11, libXext, libXft, libXinerama
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
-, extraPacks ? []
+# Packs must be installed from a local directory during the build, with dependencies
+# resolved manually, e.g. to install the 'julian' pack, which depends on the 'delay', 'list_util' and 'typedef' packs:
+# julian = pkgs.fetchzip {
+# name = "swipl-pack-julian";
+# url = "https://github.com/mndrix/julian/archive/v0.1.3.zip";
+# sha256 = "1sgql7c21p3c5m14kwa0bcmlwn9fql612krn9h36gla1j9yjdfgy";
+# };
+# delay = pkgs.fetchzip {
+# name = "swipl-pack-delay";
+# url = "https://github.com/mndrix/delay/archive/v0.3.3.zip";
+# sha256 = "0ira87afxnc2dnbbmgwmrr8qvary8lhzvhqwd52dccm6yqd3nybg";
+# };
+# list_util = pkgs.fetchzip {
+# name = "swipl-pack-list_util";
+# url = "https://github.com/mndrix/list_util/archive/v0.13.0.zip";
+# sha256 = "0lx7vffflak0y8l8vg8k0g8qddwwn23ksbz02hi3f8rbarh1n89q";
+# };
+# typedef = builtins.fetchTarball {
+# name = "swipl-pack-typedef";
+# url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz";
+# sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3";
+# };
+# swiProlog = pkgs.swiProlog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [
+# julian delay list_util typedef
+# ]; };
+, extraPacks ? []
, withGui ? false
}:
@@ -26,6 +51,11 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
+ # Add the packInstall path to the swipl pack search path
+ postPatch = ''
+ echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl
+ '';
+
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ gmp readline openssl
@@ -39,6 +69,10 @@ stdenv.mkDerivation {
cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ];
+ preInstall = ''
+ mkdir -p $out/lib/swipl/pack
+ '';
+
postInstall = builtins.concatStringsSep "\n"
( builtins.map (packInstall "$out") extraPacks
);
diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix
index 8b74f46fd040..7381e7c89fec 100644
--- a/pkgs/development/compilers/urn/default.nix
+++ b/pkgs/development/compilers/urn/default.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation {
description = "Yet another Lisp variant which compiles to Lua";
license = licenses.bsd3;
maintainers = with maintainers; [ CrazedProgrammer ];
+ platforms = platforms.all;
};
passthru = {
diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix
new file mode 100644
index 000000000000..03f2d054cc80
--- /dev/null
+++ b/pkgs/development/compilers/xa/dxa.nix
@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchurl
+, installShellFiles
+}:
+
+stdenv.mkDerivation rec {
+ pname = "dxa";
+ version = "0.1.4";
+
+ src = fetchurl {
+ url = "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz";
+ hash = "sha256-C0rgwK51Ij9EZCm9GeiVnWIkEkse0d60ok8G9hm2a5U=";
+ };
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ dontConfigure = true;
+
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc"
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -d $out/bin/
+ install dxa $out/bin/
+ installManPage dxa.1
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ homepage = "https://www.floodgap.com/retrotech/xa/";
+ description = "Andre Fachat's open-source 6502 disassembler";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix
new file mode 100644
index 000000000000..c445940f5cde
--- /dev/null
+++ b/pkgs/development/compilers/xa/xa.nix
@@ -0,0 +1,51 @@
+{ lib
+, stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+ pname = "xa";
+ version = "2.3.11";
+
+ src = fetchurl {
+ url = "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz";
+ hash = "sha256-MvIWTJnjBSGOmSlwhW3Y4jCbXLasR1jXsq/jv+vJAS0=";
+ };
+
+ dontConfigure = true;
+
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace "DESTDIR" "PREFIX" \
+ --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \
+ --replace "LDD = gcc" "LDD = ${stdenv.cc.targetPrefix}cc" \
+ --replace "CFLAGS = -O2" "CFLAGS ?=" \
+ --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc"
+ '';
+
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+ meta = with lib; {
+ homepage = "https://www.floodgap.com/retrotech/xa/";
+ description = "Andre Fachat's open-source 6502 cross assembler";
+ longDescription = ''
+ xa is a high-speed, two-pass portable cross-assembler. It understands
+ mnemonics and generates code for NMOS 6502s (such as 6502A, 6504, 6507,
+ 6510, 7501, 8500, 8501, 8502 ...), CMOS 6502s (65C02 and Rockwell R65C02)
+ and the 65816.
+
+ Key amongst its features:
+
+ - C-like preprocessor (and understands cpp for additional feature support)
+ - rich expression syntax and pseudo-op vocabulary
+ - multiple character sets
+ - binary linking
+ - supports o65 relocatable objects with a full linker and relocation
+ suite, as well as "bare" plain binary object files
+ - block structure for label scoping
+ '';
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index b57671d8637b..c4dd7d74eb0a 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -12,16 +12,20 @@ in mkCoqDerivation {
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
- { case = "8.13"; out = "1.9.3"; }
+ { case = "8.13"; out = "1.9.4"; }
{ case = "8.12"; out = "1.8.0"; }
- { case = "8.11"; out = "1.6.0_8.11"; }
+ { case = "8.11"; out = "1.6.1_8.11"; }
] null;
+ release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z";
release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07";
release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1";
release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8";
+ release."1.6.1_8.11".sha256 = "0yyyh35i1nb3pg4hw7cak15kj4y6y9l84nwar9k1ifdsagh5zq53";
+ release."1.6.1_8.11".version = "1.6.1";
release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq";
+ release."1.6.0_8.11".version = "1.6.0";
release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b";
releaseRev = v: "v${v}";
diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix
new file mode 100644
index 000000000000..4de6e2da8b51
--- /dev/null
+++ b/pkgs/development/coq-modules/fourcolor/default.nix
@@ -0,0 +1,24 @@
+{ lib, mkCoqDerivation, coq, mathcomp, version ? null }:
+with lib;
+
+mkCoqDerivation {
+ pname = "fourcolor";
+ owner = "math-comp";
+
+ release."1.2.3".rev = "v1.2.3";
+ release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4=";
+
+ inherit version;
+ defaultVersion = with versions; switch mathcomp.version [
+ { case = pred.inter (isGe "1.11.0") (isLt "1.13"); out = "1.2.3"; }
+ ] null;
+
+ propagatedBuildInputs = [ mathcomp.algebra ];
+
+ meta = {
+ description = "Formal proof of the Four Color Theorem ";
+ maintainers = with maintainers; [ siraben ];
+ license = licenses.cecill-b;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 5b3501516e15..4637edebdb77 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -10,7 +10,7 @@
# See the documentation at doc/languages-frameworks/coq.section.md. #
############################################################################
-{ lib, ncurses, which, graphviz, lua,
+{ lib, ncurses, which, graphviz, lua, fetchzip,
mkCoqDerivation, recurseIntoAttrs, withDoc ? false, single ? false,
coqPackages, coq, ocamlPackages, version ? null }@args:
with builtins // lib;
@@ -55,27 +55,51 @@ let
derivation = mkCoqDerivation ({
inherit version pname defaultVersion release releaseRev repo owner;
- nativeBuildInputs = optional withDoc graphviz;
+ nativeBuildInputs = optionals withDoc [ graphviz lua ];
mlPlugin = versions.isLe "8.6" coq.coq-version;
- extraBuildInputs = [ ncurses which ] ++ optional withDoc lua;
+ extraBuildInputs = [ ncurses which ];
propagatedBuildInputs = mathcomp-deps;
buildFlags = optional withDoc "doc";
preBuild = ''
- patchShebangs etc/utils/ssrcoqdep || true
+ if [[ -f etc/utils/ssrcoqdep ]]
+ then patchShebangs etc/utils/ssrcoqdep
+ fi
+ if [[ -f etc/buildlibgraph ]]
+ then patchShebangs etc/buildlibgraph
+ fi
'' + ''
cd ${pkgpath}
'' + optionalString (package == "all") pkgallMake;
- installTargets = "install" + optionalString withDoc " doc";
-
meta = {
homepage = "https://math-comp.github.io/";
license = licenses.cecill-b;
maintainers = with maintainers; [ vbgl jwiegley cohencyril ];
};
- } // optionalAttrs (package != "single") { passthru = genAttrs packages mathcomp_; });
+ } // optionalAttrs (package != "single")
+ { passthru = genAttrs packages mathcomp_; }
+ // optionalAttrs withDoc {
+ htmldoc_template =
+ fetchzip {
+ url = "https://github.com/math-comp/math-comp.github.io/archive/doc-1.12.0.zip";
+ sha256 = "0y1352ha2yy6k2dl375sb1r68r1qi9dyyy7dyzj5lp9hxhhq69x8";
+ };
+ postBuild = ''
+ cp -rf _build_doc/* .
+ rm -r _build_doc
+ '';
+ postInstall =
+ let tgt = "$out/share/coq/${coq.coq-version}/"; in
+ optionalString withDoc ''
+ mkdir -p ${tgt}
+ cp -r htmldoc ${tgt}
+ cp -r $htmldoc_template/htmldoc_template/* ${tgt}/htmldoc/
+ '';
+ buildTargets = "doc";
+ extraInstallFlags = [ "-f Makefile.coq" ];
+ });
patched-derivation1 = derivation.overrideAttrs (o:
optionalAttrs (o.pname != null && o.pname == "mathcomp-all" &&
o.version != null && o.version != "dev" && versions.isLt "1.7" o.version)
diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix
index 0770d83f21d9..5ff4ffd75653 100644
--- a/pkgs/development/gnuradio-modules/ais/default.nix
+++ b/pkgs/development/gnuradio-modules/ais/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, mkDerivation
, fetchFromGitHub
, cmake
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ad242777ec1c..a374229e53da 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -72,15 +72,6 @@ self: super: {
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
};
- # Backport fix for bash: compgen: command not found
- # which happens in nix-shell when a non-interactive bash is on PATH
- # PR to master: https://github.com/pcapriotti/optparse-applicative/pull/408
- optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch {
- name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff";
- url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
- sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql";
- });
-
# Fix test trying to access /home directory
shell-conduit = overrideCabal super.shell-conduit (drv: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
@@ -93,33 +84,26 @@ self: super: {
# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;
- # Tests require older tasty
+ # Tests require older versions of tasty.
+ cborg = (doJailbreak super.cborg).override { base16-bytestring = self.base16-bytestring_0_1_1_7; };
hzk = dontCheck super.hzk;
+ resolv = doJailbreak super.resolv;
+ tdigest = doJailbreak super.tdigest;
+ text-short = doJailbreak super.text-short;
+ tree-diff = doJailbreak super.tree-diff;
# Tests require a Kafka broker running locally
haskakafka = dontCheck super.haskakafka;
- # Depends on broken "lss" package.
- snaplet-lss = dontDistribute super.snaplet-lss;
-
- # Depends on broken "NewBinary" package.
- ASN1 = dontDistribute super.ASN1;
-
- # Depends on broken "frame" package.
- frame-markdown = dontDistribute super.frame-markdown;
-
- # Depends on broken "Elm" package.
- hakyll-elm = dontDistribute super.hakyll-elm;
- haskelm = dontDistribute super.haskelm;
- snap-elm = dontDistribute super.snap-elm;
-
- # Depends on broken "hails" package.
- hails-bin = dontDistribute super.hails-bin;
-
bindings-levmar = overrideCabal super.bindings-levmar (drv: {
extraLibraries = [ pkgs.blas ];
});
+ # Requires wrapQtAppsHook
+ qtah-cpp-qt5 = overrideCabal super.qtah-cpp-qt5 (drv: {
+ buildDepends = [ pkgs.qt5.wrapQtAppsHook ];
+ });
+
# The Haddock phase fails for one reason or another.
deepseq-magic = dontHaddock super.deepseq-magic;
feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1
@@ -215,9 +199,6 @@ self: super: {
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix);
- # https://github.com/haskell-nix/hnix-store/issues/127
- hnix-store-core = addTestToolDepend super.hnix-store-core self.tasty-discover;
-
# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;
@@ -235,13 +216,7 @@ self: super: {
angel = dontCheck super.angel;
apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw
app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw
- aws = appendPatch (dontCheck super.aws) # needs aws credentials
- (pkgs.fetchpatch {
- # https://github.com/aristidb/aws/pull/271
- # bump a version bound
- url = https://github.com/aristidb/aws/commit/3639262ccd6761dea76f052692ac3aefbd254723.patch;
- sha256 = "0nxaspldgayqjnidda8w7wps5gdpr2wz6vynl7vkaw8kzxks9bci";
- });
+ aws = doJailbreak (dontCheck super.aws); # needs aws credentials, jailbreak for base16-bytestring
aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing
binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw
binary-search = dontCheck super.binary-search;
@@ -339,6 +314,7 @@ self: super: {
nats-queue = dontCheck super.nats-queue;
netpbm = dontCheck super.netpbm;
network = dontCheck super.network;
+ network_2_6_3_1 = dontCheck super.network_2_6_3_1; # package is missing files for test
network-dbus = dontCheck super.network-dbus;
notcpp = dontCheck super.notcpp;
ntp-control = dontCheck super.ntp-control;
@@ -462,9 +438,6 @@ self: super: {
# https://github.com/afcowie/locators/issues/1
locators = dontCheck super.locators;
- # Test suite won't compile against tasty-hunit 0.9.x.
- zlib = dontCheck super.zlib;
-
# Test suite won't compile against tasty-hunit 0.10.x.
binary-parser = dontCheck super.binary-parser;
binary-parsers = dontCheck super.binary-parsers;
@@ -554,9 +527,6 @@ self: super: {
# https://github.com/liyang/thyme/issues/36
thyme = dontCheck super.thyme;
- # https://github.com/k0ral/hbro-contrib/issues/1
- hbro-contrib = dontDistribute super.hbro-contrib;
-
# Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233.
Elm = markBroken super.Elm;
elm-build-lib = markBroken super.elm-build-lib;
@@ -828,9 +798,12 @@ self: super: {
# Jailbreak is necessary to break out of tasty < 1.x dependency.
cryptohash-sha256 = markUnbroken (doJailbreak super.cryptohash-sha256);
+ # The test suite has all kinds of out-dated dependencies, so it feels easier
+ # to just disable it.
+ cryptohash-sha1 = dontCheck super.cryptohash-sha1;
+ cryptohash-md5 = dontCheck super.cryptohash-md5;
+
# Needs tasty-quickcheck ==0.8.*, which we don't have.
- cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
- cryptohash-md5 = doJailbreak super.cryptohash-md5;
gitHUD = dontCheck super.gitHUD;
githud = dontCheck super.githud;
@@ -973,7 +946,10 @@ self: super: {
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
- niv = generateOptparseApplicativeCompletion "niv" super.niv;
+ niv = generateOptparseApplicativeCompletion "niv" (super.niv.overrideScope (self: super: {
+ # Needs override because of: https://github.com/nmattia/niv/issues/312
+ optparse-applicative = self.optparse-applicative_0_15_1_0;
+ }));
ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
stack = generateOptparseApplicativeCompletion "stack" super.stack;
@@ -1336,7 +1312,7 @@ self: super: {
commonmark-extensions = dontCheck super.commonmark-extensions;
# Testsuite trying to run `which haskeline-examples-Test`
- haskeline_0_8_1_1 = dontCheck super.haskeline_0_8_1_1;
+ haskeline_0_8_1_2 = dontCheck super.haskeline_0_8_1_2;
# Tests for list-t, superbuffer, and stm-containers
# depend on HTF and it is broken, 2020-08-23
@@ -1403,10 +1379,7 @@ self: super: {
# PATH.
update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ];
in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal
- (addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: {
- optparse-generic = self.optparse-generic_1_4_4;
- optparse-applicative = self.optparse-applicative_0_16_1_0;
- })) deps) (drv: {
+ (addTestToolDepends super.update-nix-fetchgit deps) (drv: {
buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ];
postInstall = drv.postInstall or "" + ''
wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${
@@ -1424,6 +1397,16 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck super.haskell-language-server;
+ # 2021-03-19: Too restrictive upper bound on optparse-applicative
+ stylish-haskell = doJailbreak super.stylish-haskell;
+
+ # 2021-03-19: https://github.com/facebookincubator/retrie/issues/24
+ retrie = doJailbreak super.retrie;
+
+ # Jailbreak because of restrictive upper bound on base16-bytestring
+ # 2021-03-19: https://github.com/Avi-D-coder/implicit-hie-cradle/pull/8
+ implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
+
# 2021-03-09: Overrides because nightly is to old for hls 1.0.0
lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
@@ -1433,7 +1416,8 @@ self: super: {
# 2021-03-21 Test hangs
# https://github.com/haskell/haskell-language-server/issues/1562
- ghcide = dontCheck super.ghcide;
+ # Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595
+ ghcide = doJailbreak (dontCheck super.ghcide);
# 2020-03-09: Tests broken in hackage release
# fixed on upstream, but not released in hiedb 0.3.0.1
@@ -1510,7 +1494,7 @@ self: super: {
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
heist = doJailbreak super.heist;
- hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_1; });
+ hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_2; });
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap;
@@ -1661,4 +1645,38 @@ self: super: {
# Test suite does not compile.
feed = dontCheck super.feed;
+ spacecookie = overrideCabal super.spacecookie (old: {
+ buildTools = (old.buildTools or []) ++ [ pkgs.installShellFiles ];
+ # let testsuite discover the resulting binary
+ preCheck = ''
+ export SPACECOOKIE_TEST_BIN=./dist/build/spacecookie/spacecookie
+ '' + (old.preCheck or "");
+ # install man pages shipped in the sdist
+ postInstall = ''
+ installManPage docs/man/*
+ '' + (old.postInstall or "");
+ });
+
+ # Patch and jailbreak can be removed at next release, chatter > 0.9.1.0
+ # * Remove dependency on regex-tdfa-text
+ # * Jailbreak as bounds on cereal are too strict
+ # * Disable test suite which doesn't compile
+ # https://github.com/creswick/chatter/issues/38
+ chatter = appendPatch
+ (dontCheck (doJailbreak (super.chatter.override { regex-tdfa-text = null; })))
+ (pkgs.fetchpatch {
+ url = "https://github.com/creswick/chatter/commit/e8c15a848130d7d27b8eb5e73e8a0db1366b2e62.patch";
+ sha256 = "1dzak8d12h54vss5fxnrclygz0fz9ygbqvxd5aifz5n3vrwwpj3g";
+ });
+
+ # test suite doesn't compile anymore due to changed hunit/tasty APIs
+ fullstop = dontCheck super.fullstop;
+
+ # https://github.com/jgm/pandoc/issues/7163
+ pandoc = dontCheck super.pandoc;
+
+ # Too strict version bounds on cryptonite.
+ # Issue reported upstream, no bug tracker url yet.
+ darcs = doJailbreak super.darcs;
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index f1af62b1f51a..c4bab1f0785e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -42,19 +42,17 @@ self: super: {
unix = null;
xhtml = null;
- cabal-install = super.cabal-install.override {
- Cabal = super.Cabal_3_4_0_0;
- hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; };
- # Usung dontCheck to break test dependency cycles
- edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; });
- random = super.random_1_2_0;
- };
+ # cabal-install needs more recent versions of Cabal and random, but an older
+ # version of base16-bytestring.
+ cabal-install = super.cabal-install.overrideScope (self: super: {
+ Cabal = self.Cabal_3_4_0_0;
+ base16-bytestring = self.base16-bytestring_0_1_1_7;
+ random = dontCheck super.random_1_2_0; # break infinite recursion
+ hashable = doJailbreak super.hashable; # allow random 1.2.x
+ });
# cabal-install-parsers is written for Cabal 3.4
- cabal-install-parsers = super.cabal-install-parsers.override {
- Cabal = super.Cabal_3_4_0_0;
- base16-bytestring = super.base16-bytestring_1_0_1_0;
- };
+ cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_4_0_0; };
# Jailbreak to fix the build.
base-noprelude = doJailbreak super.base-noprelude;
@@ -91,4 +89,5 @@ self: super: {
# Break out of "Cabal < 3.2" constraint.
stylish-haskell = doJailbreak super.stylish-haskell;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
deleted file mode 100644
index bd9f43e90c9d..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
- # Suitable LLVM version.
- llvmPackages = pkgs.llvmPackages;
-
- # Disable GHC 8.2.x core libraries.
- array = null;
- base = null;
- binary = null;
- bytestring = null;
- Cabal = null;
- containers = null;
- deepseq = null;
- directory = null;
- filepath = null;
- ghc-boot = null;
- ghc-boot-th = null;
- ghc-compact = null;
- ghc-heap = null;
- ghc-prim = null;
- ghci = null;
- haskeline = null;
- hoopl = null;
- hpc = null;
- integer-gmp = null;
- pretty = null;
- process = null;
- rts = null;
- template-haskell = null;
- terminfo = null;
- time = null;
- transformers = null;
- unix = null;
- xhtml = null;
-
- # These are now core libraries in GHC 8.4.x.
- mtl = self.mtl_2_2_2;
- parsec = self.parsec_3_1_14_0;
- stm = self.stm_2_5_0_0;
- text = self.text_1_2_4_0;
-
- # Needs Cabal 3.0.x.
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; };
-
- # https://github.com/bmillwood/applicative-quoters/issues/6
- applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
- sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
- });
-
- # https://github.com/nominolo/ghc-syb/issues/20
- ghc-syb-utils = dontCheck super.ghc-syb-utils;
-
- # Upstream failed to distribute the testsuite for 8.2
- # https://github.com/alanz/ghc-exactprint/pull/60
- ghc-exactprint = dontCheck super.ghc-exactprint;
-
- # Reduction stack overflow; size = 38
- # https://github.com/jystic/hadoop-tools/issues/31
- hadoop-rpc =
- let patch = pkgs.fetchpatch
- { url = "https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch";
- sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp";
- stripLen = 1;
- };
- in appendPatch super.hadoop-rpc patch;
-
- # Custom Setup.hs breaks with Cabal 2
- # https://github.com/NICTA/coordinate/pull/4
- coordinate =
- let patch = pkgs.fetchpatch
- { url = "https://github.com/NICTA/coordinate/pull/4.patch";
- sha256 = "06sfxk5cyd8nqgjyb95jkihxxk8m6dw9m3mlv94sm2qwylj86gqy";
- };
- in appendPatch super.coordinate patch;
-
- # https://github.com/purescript/purescript/issues/3189
- purescript = doJailbreak (super.purescript);
-
- # These packages need Cabal 2.2.x, which is not the default.
- cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
- cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
- distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
- stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
-
- # Older GHC versions need these additional dependencies.
- ListLike = addBuildDepend super.ListLike self.semigroups;
- base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant;
-
- # ghc versions prior to 8.8.x needs additional dependency to compile successfully.
- ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
deleted file mode 100644
index 6831c7c327d7..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
- # This compiler version needs llvm 5.x.
- llvmPackages = pkgs.llvmPackages_5;
-
- # Disable GHC 8.4.x core libraries.
- array = null;
- base = null;
- binary = null;
- bytestring = null;
- Cabal = null;
- containers = null;
- deepseq = null;
- directory = null;
- filepath = null;
- ghc-boot = null;
- ghc-boot-th = null;
- ghc-compact = null;
- ghc-heap = null;
- ghc-prim = null;
- ghci = null;
- haskeline = null;
- hpc = null;
- integer-gmp = null;
- mtl = null;
- parsec = null;
- pretty = null;
- process = null;
- rts = null;
- stm = null;
- template-haskell = null;
- terminfo = null;
- text = null;
- time = null;
- transformers = null;
- unix = null;
- xhtml = null;
-
- # Needs Cabal 3.2.x.
- cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; };
-
- # Restricts aeson to <1.4
- # https://github.com/purescript/purescript/pull/3537
- purescript = doJailbreak super.purescript;
-
- # https://github.com/jcristovao/enclosed-exceptions/issues/12
- enclosed-exceptions = dontCheck super.enclosed-exceptions;
-
- # https://github.com/jaor/xmobar/issues/356
- xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; });
- hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x
-
- # Reduction stack overflow; size = 38
- # https://github.com/jystic/hadoop-tools/issues/31
- hadoop-rpc =
- let patch = pkgs.fetchpatch
- { url = "https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch";
- sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp";
- stripLen = 1;
- };
- in appendPatch super.hadoop-rpc patch;
-
- # stack-1.9.1 needs Cabal 2.4.x, a recent version of hpack, and a non-recent
- # version of yaml. Go figure. We avoid overrideScope here because using it to
- # change Cabal would re-compile every single package instead of just those
- # that have it as an actual library dependency. The explicit overrides are
- # more verbose but friendlier for Hydra.
- stack = (doJailbreak super.stack).override {
- Cabal = self.Cabal_2_4_1_0;
- hpack = self.hpack.override { Cabal = self.Cabal_2_4_1_0; };
- hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_1_0; };
- };
-
- # Older GHC versions need these additional dependencies.
- aeson = addBuildDepend super.aeson self.contravariant;
- base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant;
-
- # Newer versions don't compile.
- resolv = self.resolv_0_1_1_2;
-
- # The old Haddock cannot process the newer documentation syntax.
- fast-logger = dontHaddock super.fast-logger;
-
- # ghc versions prior to 8.8.x needs additional dependency to compile successfully.
- ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
- hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 996d21826021..00797c0c86f1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -52,15 +52,17 @@ self: super: {
haddock = self.haddock_2_23_1;
haddock-api = self.haddock-api_2_23_1;
- # These builds need newer versions of Cabal.
+ # This build needs a newer version of Cabal.
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
- cabal-install = super.cabal-install.override {
- Cabal = super.Cabal_3_4_0_0;
- hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; };
- # Using dontCheck to break test dependency cycles
- edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; });
- random = super.random_1_2_0;
- };
+
+ # cabal-install needs more recent versions of Cabal and random, but an older
+ # version of base16-bytestring.
+ cabal-install = super.cabal-install.overrideScope (self: super: {
+ Cabal = self.Cabal_3_4_0_0;
+ base16-bytestring = self.base16-bytestring_0_1_1_7;
+ random = dontCheck super.random_1_2_0; # break infinite recursion
+ hashable = doJailbreak super.hashable; # allow random 1.2.x
+ });
# Ignore overly restrictive upper version bounds.
aeson-diff = doJailbreak super.aeson-diff;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index e3099bfe5105..1b8b087326e8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -43,12 +43,14 @@ self: super: {
unix = null;
xhtml = null;
- # Build cabal-install with the compiler's native Cabal.
- cabal-install = (doJailbreak super.cabal-install).override {
- # Use dontCheck to break test dependency cycles
- edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; });
- random = super.random_1_2_0;
- };
+ # cabal-install needs more recent versions of random, but an older
+ # version of base16-bytestring.
+ cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
+ Cabal = null;
+ base16-bytestring = self.base16-bytestring_0_1_1_7;
+ random = dontCheck super.random_1_2_0; # break infinite recursion
+ hashable = doJailbreak super.hashable; # allow random 1.2.x
+ });
# Jailbreaks & Version Updates
async = doJailbreak super.async;
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
deleted file mode 100644
index 00a8c8d520bb..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ /dev/null
@@ -1,209 +0,0 @@
-# GHCJS package fixes
-#
-# Please insert new packages *alphabetically*
-# in the OTHER PACKAGES section.
-{ pkgs, haskellLib }:
-
-let
- removeLibraryHaskellDepends = pnames: depends:
- builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends;
-in
-
-with haskellLib;
-
-self: super:
-
-## GENERAL SETUP BASE PACKAGES
-
- let # The stage 1 packages
- stage1 = pkgs.lib.genAttrs super.ghc.stage1Packages (pkg: null);
- # The stage 2 packages. Regenerate with ../compilers/ghcjs/gen-stage2.rb
- stage2 = super.ghc.mkStage2 {
- inherit (self) callPackage;
- };
- in stage1 // stage2 // {
-
- # GHCJS does not ship with the same core packages as GHC.
- # https://github.com/ghcjs/ghcjs/issues/676
- stm = self.stm_2_5_0_0;
- ghc-compact = self.ghc-compact_0_1_0_0;
-
- network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
- zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
- unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
-
- # LLVM is not supported on this GHC; use the latest one.
- inherit (pkgs) llvmPackages;
-
- inherit (self.ghc.bootPkgs)
- jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
-
- # Don't set integer-simple to null!
- # GHCJS uses integer-gmp, so any package expression that depends on
- # integer-simple is wrong.
- #integer-simple = null;
-
- # These packages are core libraries in GHC 8.6..x, but not here.
- bin-package-db = null;
- haskeline = self.haskeline_0_7_5_0;
- hpc = self.hpc_0_6_0_3;
- terminfo = self.terminfo_0_4_1_4;
- xhtml = self.xhtml_3000_2_2_1;
-
-## OTHER PACKAGES
-
- # haddock throws the error: No input file(s).
- fail = dontHaddock super.fail;
-
- cereal = addBuildDepend super.cereal [ self.fail ];
-
- entropy = overrideCabal super.entropy (old: {
- postPatch = old.postPatch or "" + ''
- # cabal doesn’t find ghc in this script, since it’s in the bootPkgs
- sed -e '/Simple.Program/a import Distribution.Simple.Program.Types' \
- -e 's|mConf.*=.*$|mConf = Just $ simpleConfiguredProgram "ghc" (FoundOnSystem "${self.ghc.bootPkgs.ghc}/bin/ghc")|g' -i Setup.hs
- '';
- });
-
- # https://github.com/kazu-yamamoto/logger/issues/97
- fast-logger = overrideCabal super.fast-logger (old: {
- postPatch = old.postPatch or "" + ''
- # remove the Safe extensions, since ghcjs-boot directory
- # doesn’t provide Trustworthy
- sed -ie '/LANGUAGE Safe/d' System/Log/FastLogger/*.hs
- cat System/Log/FastLogger/Date.hs
- '';
- });
-
- # experimental
- ghcjs-ffiqq = self.callPackage
- ({ mkDerivation, base, template-haskell, ghcjs-base, split, containers, text, ghc-prim
- }:
- mkDerivation {
- pname = "ghcjs-ffiqq";
- version = "0.1.0.0";
- src = pkgs.fetchFromGitHub {
- owner = "ghcjs";
- repo = "ghcjs-ffiqq";
- rev = "b52338c2dcd3b0707bc8aff2e171411614d4aedb";
- sha256 = "08zxfm1i6zb7n8vbz3dywdy67vkixfyw48580rwfp48rl1s2z1c7";
- };
- libraryHaskellDepends = [
- base template-haskell ghcjs-base split containers text ghc-prim
- ];
- description = "FFI QuasiQuoter for GHCJS";
- license = pkgs.lib.licenses.mit;
- }) {};
- # experimental
- ghcjs-vdom = self.callPackage
- ({ mkDerivation, base, ghc-prim, ghcjs-ffiqq, ghcjs-base, ghcjs-prim
- , containers, split, template-haskell
- }:
- mkDerivation rec {
- pname = "ghcjs-vdom";
- version = "0.2.0.0";
- src = pkgs.fetchFromGitHub {
- owner = "ghcjs";
- repo = pname;
- rev = "1c1175ba22eca6d7efa96f42a72290ade193c148";
- sha256 = "0c6l1dk2anvz94yy5qblrfh2iv495rjq4qmhlycc24dvd02f7n9m";
- };
- libraryHaskellDepends = [
- base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split
- template-haskell
- ];
- license = pkgs.lib.licenses.mit;
- description = "bindings for https://github.com/Matt-Esch/virtual-dom";
- }) {};
-
- ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
- libraryHaskellDepends = with self; [
- ghcjs-base ghcjs-dom-jsffi text transformers
- ];
- configureFlags = [ "-fjsffi" "-f-webkit" ];
- });
-
- ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
- libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ];
- isLibrary = true;
- });
-
- ghc-paths = overrideCabal super.ghc-paths (drv: {
- patches = [ ./patches/ghc-paths-nix-ghcjs.patch ];
- });
-
- http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ];
- # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.*
-
- # These are the correct dependencies specified when calling `cabal2nix --compiler ghcjs`
- # By default, the `miso` derivation present in hackage-packages.nix
- # does not contain dependencies suitable for ghcjs
- miso = overrideCabal super.miso (drv: {
- libraryHaskellDepends = with self; [
- BoundedChan bytestring containers ghcjs-base aeson base
- http-api-data http-types network-uri scientific servant text
- transformers unordered-containers vector
- ];
- });
-
- pqueue = overrideCabal super.pqueue (drv: {
- postPatch = ''
- sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
- sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
- sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs
- sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs
- sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs
- sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs
- '';
- });
-
- profunctors = overrideCabal super.profunctors (drv: {
- preConfigure = ''
- sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs
- '';
- });
-
- protolude = doJailbreak super.protolude;
-
- # reflex 0.3, made compatible with the newest GHCJS.
- reflex = overrideCabal super.reflex (drv: {
- src = pkgs.fetchFromGitHub {
- owner = "ryantrinkle";
- repo = "reflex";
- rev = "cc62c11a6cde31412582758c236919d4bb766ada";
- sha256 = "1j4vw0636bkl46lj8ry16i04vgpivjc6bs3ls54ppp1wfp63q7w4";
- };
- });
-
- # reflex-dom 0.2, made compatible with the newest GHCJS.
- reflex-dom = overrideCabal super.reflex-dom (drv: {
- src = pkgs.fetchFromGitHub {
- owner = "ryantrinkle";
- repo = "reflex-dom";
- rev = "639d9ca13c2def075e83344c9afca6eafaf24219";
- sha256 = "0166ihbh3dbfjiym9w561svpgvj0x4i8i8ws70xaafi0cmpsxrar";
- };
- libraryHaskellDepends =
- removeLibraryHaskellDepends [
- "glib" "gtk3" "webkitgtk3" "webkitgtk3-javascriptcore" "raw-strings-qq" "unix"
- ] drv.libraryHaskellDepends;
- });
-
- transformers-compat = overrideCabal super.transformers-compat (drv: {
- configureFlags = [];
- });
-
- # triggers an internal pattern match failure in haddock
- # https://github.com/haskell/haddock/issues/553
- wai = dontHaddock super.wai;
-
- base-orphans = dontCheck super.base-orphans;
- distributive = dontCheck super.distributive;
-
- # https://github.com/glguy/th-abstraction/issues/53
- th-abstraction = dontCheck super.th-abstraction;
- # https://github.com/dreixel/syb/issues/21
- syb = dontCheck super.syb;
- # https://github.com/ghcjs/ghcjs/issues/677
- hspec-core = dontCheck super.hspec-core;
-}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 263cf833b166..08fb8aa88f75 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -73,8 +73,11 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
+ - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet.
+ - ghcide < 1.1 # To stay hls 1.0 compatible
+ - hls-retrie-plugin < 1.0.0.1 # To stay hls 1.0 compatible
- # Stackage Nightly 2021-03-12
+ # Stackage Nightly 2021-03-17
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -88,7 +91,7 @@ default-package-overrides:
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.2.0.0
- - aeson-combinators ==0.0.4.1
+ - aeson-combinators ==0.0.5.0
- aeson-commit ==1.3
- aeson-compat ==0.3.9
- aeson-default ==0.9.1.0
@@ -208,10 +211,10 @@ default-package-overrides:
- amazonka-waf ==1.6.1
- amazonka-workspaces ==1.6.1
- amazonka-xray ==1.6.1
- - amqp ==0.21.0
+ - amqp ==0.22.0
- amqp-utils ==0.6.1.0
- annotated-wl-pprint ==0.7.0
- - ansi-terminal ==0.10.3
+ - ansi-terminal ==0.11
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
- apecs ==0.9.2
@@ -228,7 +231,6 @@ default-package-overrides:
- approximate-equality ==1.1.0.2
- app-settings ==0.2.0.12
- arbor-lru-cache ==0.1.1.1
- - arbor-postgres ==0.0.5
- arithmoi ==0.11.0.1
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
@@ -278,7 +280,7 @@ default-package-overrides:
- bank-holidays-england ==0.2.0.6
- barbies ==2.0.2.0
- base16 ==0.3.0.1
- - base16-bytestring ==0.1.1.7
+ - base16-bytestring ==1.0.1.0
- base16-lens ==0.1.3.2
- base32 ==0.2.0.0
- base32-lens ==0.1.1.1
@@ -375,6 +377,7 @@ default-package-overrides:
- bugzilla-redhat ==0.3.1
- burrito ==1.2.0.1
- butcher ==1.3.3.2
+ - buttplug-hs-core ==0.1.0.0
- bv ==0.5
- bv-little ==1.1.1
- byteable ==0.1.1
@@ -412,7 +415,7 @@ default-package-overrides:
- cardano-coin-selection ==1.0.1
- carray ==0.1.6.8
- casa-client ==0.0.1
- - casa-types ==0.0.1
+ - casa-types ==0.0.2
- cased ==0.1.0.0
- case-insensitive ==1.2.1.0
- cases ==0.1.4
@@ -457,7 +460,7 @@ default-package-overrides:
- cipher-rc4 ==0.1.4
- circle-packing ==0.1.0.6
- circular ==0.3.1.1
- - citeproc ==0.3.0.8
+ - citeproc ==0.3.0.9
- clash-ghc ==1.2.5
- clash-lib ==1.2.5
- clash-prelude ==1.2.5
@@ -477,18 +480,15 @@ default-package-overrides:
- cmark-lucid ==0.1.0.0
- cmdargs ==0.10.21
- codec-beam ==0.2.0
- - codec-rpm ==0.2.2
- code-page ==0.2.1
- - co-log ==0.4.0.1
- co-log-concurrent ==0.5.0.0
- co-log-core ==0.2.1.1
- - Color ==0.3.0
+ - Color ==0.3.1
- colorful-monoids ==0.2.1.3
- colorize-haskell ==1.0.1
- colour ==2.3.5
- - colourista ==0.1.0.0
- combinatorial ==0.1.0.1
- - comfort-array ==0.4
+ - comfort-array ==0.4.1
- comfort-graph ==0.0.3.1
- commonmark ==0.1.1.4
- commonmark-extensions ==0.2.0.4
@@ -501,7 +501,7 @@ default-package-overrides:
- compensated ==0.8.3
- compiler-warnings ==0.1.0
- composable-associations ==0.1.0.0
- - composable-associations-aeson ==0.1.0.0
+ - composable-associations-aeson ==0.1.0.1
- composite-aeson ==0.7.4.0
- composite-aeson-path ==0.7.4.0
- composite-aeson-refined ==0.7.4.0
@@ -514,7 +514,7 @@ default-package-overrides:
- composition ==1.0.2.1
- composition-extra ==2.0.0
- concise ==0.1.0.1
- - concurrency ==1.11.0.0
+ - concurrency ==1.11.0.1
- concurrent-extra ==0.7.0.12
- concurrent-output ==1.10.12
- concurrent-split ==0.0.1.1
@@ -528,7 +528,7 @@ default-package-overrides:
- conduit-parse ==0.2.1.0
- conduit-zstd ==0.0.2.0
- conferer ==1.1.0.0
- - conferer-aeson ==1.1.0.0
+ - conferer-aeson ==1.1.0.1
- conferer-hspec ==1.1.0.0
- conferer-warp ==1.1.0.0
- ConfigFile ==1.1.4
@@ -556,7 +556,6 @@ default-package-overrides:
- core-text ==0.3.0.0
- countable ==1.0
- country ==0.2.1
- - cpio-conduit ==0.7.0
- cpphs ==1.20.9.1
- cprng-aes ==0.6.1
- cpu ==0.1.2
@@ -577,7 +576,7 @@ default-package-overrides:
- cryptohash-sha1 ==0.11.100.1
- cryptohash-sha256 ==0.11.102.0
- cryptohash-sha512 ==0.11.100.1
- - cryptonite ==0.27
+ - cryptonite ==0.28
- cryptonite-conduit ==0.2.2
- cryptonite-openssl ==0.7
- crypto-numbers ==0.2.7
@@ -628,7 +627,7 @@ default-package-overrides:
- data-forest ==0.1.0.8
- data-has ==0.4.0.0
- data-hash ==0.2.0.1
- - data-interval ==2.0.1
+ - data-interval ==2.1.0
- data-inttrie ==0.1.4
- data-lens-light ==0.1.2.2
- data-memocombinators ==0.5.1
@@ -649,12 +648,12 @@ default-package-overrides:
- debian-build ==0.10.2.0
- debug-trace-var ==0.2.0
- dec ==0.0.4
- - Decimal ==0.5.1
+ - Decimal ==0.5.2
- declarative ==0.5.4
- deepseq-generics ==0.2.0.0
- deepseq-instances ==0.1.0.1
- deferred-folds ==0.9.17
- - dejafu ==2.4.0.1
+ - dejafu ==2.4.0.2
- dense-linear-algebra ==0.1.0.0
- depq ==0.4.1.0
- deque ==0.4.3
@@ -691,12 +690,13 @@ default-package-overrides:
- dlist-nonempty ==0.1.1
- dns ==4.0.1
- dockerfile ==0.2.0
- - doclayout ==0.3
+ - doclayout ==0.3.0.2
- doctemplates ==0.9
- doctest ==0.16.3
- doctest-discover ==0.2.0.0
- doctest-driver-gen ==0.3.0.3
- doctest-exitcode-stdio ==0.0
+ - doctest-extract ==0.1
- doctest-lib ==0.1
- doldol ==0.4.1.2
- do-list ==1.0.1
@@ -712,7 +712,7 @@ default-package-overrides:
- dual ==0.1.1.1
- dublincore-xml-conduit ==0.1.0.2
- dunai ==0.7.0
- - duration ==0.1.0.0
+ - duration ==0.2.0.0
- dvorak ==0.1.0.0
- dynamic-state ==0.3.1
- dyre ==0.8.12
@@ -794,7 +794,7 @@ default-package-overrides:
- executable-path ==0.0.3.1
- exit-codes ==1.0.0
- exomizer ==1.0.0
- - experimenter ==0.1.0.4
+ - experimenter ==0.1.0.10
- expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.10
- exp-pairs ==0.2.1.0
@@ -844,6 +844,7 @@ default-package-overrides:
- fixed-length ==0.2.2
- fixed-vector ==1.2.0.0
- fixed-vector-hetero ==0.6.0.0
+ - fix-whitespace ==0.0.5
- flac ==0.2.0
- flac-picture ==0.1.2
- flags-applicative ==0.1.0.2
@@ -951,7 +952,7 @@ default-package-overrides:
- ghc-byteorder ==4.11.0.0.10
- ghc-check ==0.5.0.3
- ghc-core ==0.5.6
- - ghc-events ==0.15.1
+ - ghc-events ==0.16.0
- ghc-exactprint ==0.6.4
- ghcid ==0.8.7
- ghci-hexcalc ==0.1.1.0
@@ -969,7 +970,7 @@ default-package-overrides:
- ghc-typelits-extra ==0.4.2
- ghc-typelits-knownnat ==0.7.5
- ghc-typelits-natnormalise ==0.7.4
- - ghc-typelits-presburger ==0.5.2.0
+ - ghc-typelits-presburger ==0.6.0.0
- ghost-buster ==0.1.1.0
- gi-atk ==2.0.22
- gi-cairo ==1.0.24
@@ -991,8 +992,7 @@ default-package-overrides:
- gingersnap ==0.3.1.0
- gi-pango ==1.0.23
- githash ==0.1.5.0
- - github ==0.26
- - github-release ==1.3.6
+ - github-release ==1.3.7
- github-rest ==1.0.3
- github-types ==0.2.1
- github-webhooks ==0.15.0
@@ -1016,6 +1016,7 @@ default-package-overrides:
- graphite ==0.10.0.1
- graphql-client ==1.1.0
- graphs ==0.7.1
+ - graphula ==2.0.0.3
- graphviz ==2999.20.1.0
- graph-wrapper ==0.2.6.0
- gravatar ==0.8.0
@@ -1032,7 +1033,6 @@ default-package-overrides:
- hackage-db ==2.1.0
- hackage-security ==0.6.0.1
- haddock-library ==1.9.0
- - hadolint ==1.23.0
- hadoop-streaming ==0.2.0.3
- hakyll-convert ==0.3.0.4
- half ==0.3.1
@@ -1078,11 +1078,11 @@ default-package-overrides:
- hdaemonize ==0.5.6
- HDBC ==2.4.0.3
- HDBC-session ==0.1.2.0
- - headroom ==0.4.0.0
+ - headroom ==0.4.1.0
- heap ==1.0.4
- heaps ==0.3.6.1
- hebrew-time ==0.1.2
- - hedgehog ==1.0.4
+ - hedgehog ==1.0.5
- hedgehog-corpus ==0.2.0
- hedgehog-fakedata ==0.0.1.4
- hedgehog-fn ==1.0
@@ -1095,18 +1095,17 @@ default-package-overrides:
- hexml ==0.3.4
- hexml-lens ==0.2.1
- hexpat ==0.20.13
- - hexstring ==0.11.1
- hformat ==0.3.3.1
- hfsevents ==0.1.6
- hgrev ==0.2.6
- hidapi ==0.1.5
- - hie-bios ==0.7.4
+ - hie-bios ==0.7.5
- hi-file-parser ==0.1.0.0
- higher-leveldb ==0.6.0.0
- highlighting-kate ==0.6.4
- hinfo ==0.0.3.0
- hinotify ==0.4.1
- - hint ==0.9.0.3
+ - hint ==0.9.0.4
- hjsmin ==0.2.0.4
- hkd-default ==1.1.0.0
- hkgr ==0.2.7
@@ -1152,9 +1151,10 @@ default-package-overrides:
- hsinstall ==2.6
- HSlippyMap ==3.0.1
- hslogger ==1.3.1.0
- - hslua ==1.2.0
+ - hslua ==1.3.0.1
- hslua-aeson ==1.0.3.1
- hslua-module-doclayout ==0.2.0.1
+ - hslua-module-path ==0.1.0.1
- hslua-module-system ==0.2.2.1
- hslua-module-text ==0.3.0.1
- HsOpenSSL ==0.11.5.1
@@ -1180,10 +1180,11 @@ default-package-overrides:
- hspec-parsec ==0
- hspec-smallcheck ==0.5.2
- hspec-tables ==0.0.1
- - hspec-wai ==0.10.1
- - hspec-wai-json ==0.10.1
+ - hspec-wai ==0.11.0
+ - hspec-wai-json ==0.11.0
- hs-php-session ==0.0.9.3
- - hsshellscript ==3.4.5
+ - hsshellscript ==3.5.0
+ - hs-tags ==0.1.5
- HStringTemplate ==0.8.7
- HSvm ==0.1.1.3.22
- HsYAML ==0.2.1.0
@@ -1196,9 +1197,9 @@ default-package-overrides:
- html-entities ==1.1.4.3
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
- - http2 ==2.0.5
+ - http2 ==2.0.6
- HTTP ==4000.3.15
- - http-api-data ==0.4.1.1
+ - http-api-data ==0.4.2
- http-client ==0.6.4.1
- http-client-openssl ==0.3.2.0
- http-client-overrides ==0.1.1.0
@@ -1209,7 +1210,7 @@ default-package-overrides:
- http-directory ==0.1.8
- http-download ==0.2.0.0
- httpd-shed ==0.4.1.1
- - http-link-header ==1.0.3.1
+ - http-link-header ==1.2.0
- http-media ==0.8.0.0
- http-query ==0.1.0.1
- http-reverse-proxy ==0.6.0
@@ -1286,9 +1287,10 @@ default-package-overrides:
- indexed-list-literals ==0.2.1.3
- indexed-profunctors ==0.1
- indexed-traversable ==0.1.1
+ - indexed-traversable-instances ==0.1
- infer-license ==0.2.0
- inflections ==0.4.0.6
- - influxdb ==1.9.1
+ - influxdb ==1.9.1.1
- ini ==0.4.1
- inj ==1.0
- inline-c ==0.9.1.4
@@ -1344,9 +1346,9 @@ default-package-overrides:
- ix-shapable ==0.1.0
- jack ==0.7.1.4
- jalaali ==1.0.0.0
- - jira-wiki-markup ==1.3.3
+ - jira-wiki-markup ==1.3.4
- jose ==0.8.4
- - jose-jwt ==0.9.0
+ - jose-jwt ==0.9.1
- js-chart ==2.9.4.1
- js-dgtable ==0.5.2
- js-flot ==0.8.3
@@ -1369,6 +1371,7 @@ default-package-overrides:
- kawhi ==0.3.0
- kazura-queue ==0.1.0.4
- kdt ==0.2.4
+ - keep-alive ==0.2.0.0
- keycode ==0.2.2
- keys ==3.12.3
- ki ==0.2.0.1
@@ -1381,6 +1384,7 @@ default-package-overrides:
- kubernetes-webhook-haskell ==0.2.0.3
- l10n ==0.1.0.1
- labels ==0.3.3
+ - lackey ==1.0.14
- LambdaHack ==0.9.5.0
- lame ==0.2.0
- language-avro ==0.1.3.1
@@ -1396,7 +1400,7 @@ default-package-overrides:
- lapack ==0.3.2
- lapack-carray ==0.0.3
- lapack-comfort-array ==0.0.0.1
- - lapack-ffi ==0.0.2
+ - lapack-ffi ==0.0.3
- lapack-ffi-tools ==0.1.2.1
- largeword ==1.2.5
- latex ==0.1.0.4
@@ -1432,7 +1436,6 @@ default-package-overrides:
- liboath-hs ==0.0.1.2
- libyaml ==0.1.2
- LibZip ==1.0.1
- - life-sync ==1.1.1.0
- lifted-async ==0.10.1.3
- lifted-base ==0.2.3.12
- lift-generics ==0.2
@@ -1450,7 +1453,6 @@ default-package-overrides:
- list-singleton ==1.0.0.5
- list-t ==1.0.4
- ListTree ==0.2.3
- - little-logger ==0.3.1
- little-rio ==0.2.2
- llvm-hs ==9.0.1
- llvm-hs-pure ==9.0.0
@@ -1523,12 +1525,12 @@ default-package-overrides:
- messagepack ==0.5.4
- metrics ==0.4.1.1
- mfsolve ==0.3.2.0
- - microlens ==0.4.11.2
+ - microlens ==0.4.12.0
- microlens-aeson ==2.3.1
- microlens-contra ==0.1.0.2
- - microlens-ghc ==0.4.12
+ - microlens-ghc ==0.4.13
- microlens-mtl ==0.2.0.1
- - microlens-platform ==0.4.1
+ - microlens-platform ==0.4.2
- microlens-process ==0.2.0.2
- microlens-th ==0.4.3.9
- microspec ==0.2.1.3
@@ -1551,7 +1553,7 @@ default-package-overrides:
- mixed-types-num ==0.4.1
- mltool ==0.2.0.1
- mmap ==0.5.9
- - mmark ==0.0.7.3
+ - mmark ==0.0.7.2
- mmark-cli ==0.0.5.0
- mmark-ext ==0.2.1.3
- mmorph ==1.1.5
@@ -1625,7 +1627,7 @@ default-package-overrides:
- mwc-random ==0.14.0.0
- mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0
- - mysql ==0.1.7.3
+ - mysql ==0.2
- mysql-simple ==0.4.5
- n2o ==0.11.1
- nagios-check ==0.3.2
@@ -1668,11 +1670,12 @@ default-package-overrides:
- nix-paths ==1.0.1
- nonce ==1.0.7
- nondeterminism ==1.4
- - non-empty ==0.3.2
+ - non-empty ==0.3.3
- nonempty-containers ==0.3.4.1
- nonemptymap ==0.0.6.0
- non-empty-sequence ==0.2.0.4
- nonempty-vector ==0.2.1.0
+ - nonempty-zipper ==1.0.0.1
- non-negative ==0.1.2
- not-gloss ==0.7.7.0
- no-value ==1.0.0.0
@@ -1684,7 +1687,7 @@ default-package-overrides:
- nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- - numeric-prelude ==0.4.3.2
+ - numeric-prelude ==0.4.3.3
- numhask ==0.6.0.2
- NumInstances ==1.4
- numtype-dk ==0.5.0.2
@@ -1729,8 +1732,8 @@ default-package-overrides:
- optics-vl ==0.2.1
- optional-args ==1.0.2
- options ==1.2.1.1
- - optparse-applicative ==0.15.1.0
- - optparse-generic ==1.3.1
+ - optparse-applicative ==0.16.1.0
+ - optparse-generic ==1.4.4
- optparse-simple ==0.1.1.3
- optparse-text ==0.1.1.0
- ordered-containers ==0.2.2
@@ -1741,8 +1744,8 @@ default-package-overrides:
- pager ==0.1.1.0
- pagination ==0.2.2
- pagure-cli ==0.2
- - pandoc ==2.11.4
- - pandoc-plot ==1.1.0
+ - pandoc ==2.12
+ - pandoc-plot ==1.1.1
- pandoc-types ==1.22
- pantry ==0.5.1.4
- parallel ==3.2.2.0
@@ -1760,8 +1763,9 @@ default-package-overrides:
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.2.1
- partial-semigroup ==0.5.1.8
- - password ==2.1.1.0
- - password-instances ==2.0.0.2
+ - password ==3.0.0.0
+ - password-instances ==3.0.0.0
+ - password-types ==1.0.0.0
- path ==0.7.0
- path-binary-instance ==0.1.0.1
- path-extensions ==0.1.1.0
@@ -1892,7 +1896,7 @@ default-package-overrides:
- promises ==0.3
- prompt ==0.1.1.2
- prospect ==0.1.0.0
- - proto3-wire ==1.1.0
+ - proto3-wire ==1.2.0
- protobuf ==0.2.1.3
- protobuf-simple ==0.1.1.0
- protocol-buffers ==2.4.17
@@ -1900,7 +1904,6 @@ default-package-overrides:
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.1.0.1
- proto-lens ==0.7.0.0
- - proto-lens-optparse ==0.1.1.7
- proto-lens-protobuf-types ==0.7.0.0
- proto-lens-protoc ==0.7.0.0
- proto-lens-runtime ==0.7.0.0
@@ -1958,10 +1961,11 @@ default-package-overrides:
- rank2classes ==1.4.1
- Rasterific ==0.7.5.3
- rasterific-svg ==0.3.3.2
- - ratel ==1.0.13
+ - ratel ==1.0.14
- rate-limit ==1.4.2
- - ratel-wai ==1.1.4
+ - ratel-wai ==1.1.5
- rattle ==0.2
+ - rattletrap ==11.0.0
- Rattus ==0.5
- rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0
@@ -1997,7 +2001,7 @@ default-package-overrides:
- regex-compat ==0.95.2.1
- regex-compat-tdfa ==0.95.1.4
- regex-pcre ==0.95.0.0
- - regex-pcre-builtin ==0.95.1.3.8.43
+ - regex-pcre-builtin ==0.95.2.3.8.43
- regex-posix ==0.96.0.0
- regex-tdfa ==1.3.1.0
- regex-with-pcre ==1.1.0.0
@@ -2017,6 +2021,7 @@ default-package-overrides:
- req ==3.9.0
- req-conduit ==1.0.0
- rerebase ==1.6.1
+ - rescue ==0.4.2.1
- resistor-cube ==0.0.1.2
- resolv ==0.1.2.0
- resource-pool ==0.2.3.2
@@ -2088,7 +2093,7 @@ default-package-overrides:
- selda-postgresql ==0.1.8.1
- selda-sqlite ==0.1.7.1
- selections ==0.3.0.0
- - selective ==0.4.1.1
+ - selective ==0.4.2
- semialign ==1.1.0.1
- semialign-indexed ==1.1
- semialign-optics ==1.1
@@ -2116,7 +2121,6 @@ default-package-overrides:
- servant-exceptions ==0.2.1
- servant-exceptions-server ==0.2.1
- servant-foreign ==0.15.3
- - servant-github-webhook ==0.4.2.0
- servant-http-streams ==0.18.2
- servant-machines ==0.15.1
- servant-multipart ==0.12
@@ -2168,15 +2172,15 @@ default-package-overrides:
- singleton-bool ==0.1.5
- singleton-nats ==0.4.5
- singletons ==2.7
- - singletons-presburger ==0.5.0.0
+ - singletons-presburger ==0.6.0.0
- siphash ==1.0.3
- sitemap-gen ==0.1.0.0
- sized ==1.0.0.0
- skein ==1.0.9.4
- skews ==0.1.0.3
- skip-var ==0.1.1.0
- - skylighting ==0.10.4
- - skylighting-core ==0.10.4
+ - skylighting ==0.10.4.1
+ - skylighting-core ==0.10.4.1
- slack-api ==0.12
- slack-progressbar ==0.1.0.1
- slist ==0.1.1.0
@@ -2248,7 +2252,7 @@ default-package-overrides:
- storable-record ==0.0.5
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13.1
- - store ==0.7.9
+ - store ==0.7.10
- store-core ==0.4.4.4
- store-streaming ==0.2.0.3
- stratosphere ==0.59.1
@@ -2256,6 +2260,7 @@ default-package-overrides:
- streaming-attoparsec ==1.0.0.1
- streaming-bytestring ==0.2.0
- streaming-commons ==0.2.2.1
+ - streamly ==0.7.3
- streams ==3.3
- strict ==0.4.0.1
- strict-concurrency ==0.2.4.3
@@ -2277,11 +2282,11 @@ default-package-overrides:
- stripe-haskell ==2.6.2
- stripe-http-client ==2.6.2
- stripe-tests ==2.6.2
- - strive ==5.0.13
+ - strive ==5.0.14
- structs ==0.1.5
- structured ==0.1.0.1
- - structured-cli ==2.6.0.0
- - subcategories ==0.1.0.0
+ - structured-cli ==2.7.0.1
+ - subcategories ==0.1.1.0
- sum-type-boilerplate ==0.1.1
- sundown ==0.6
- superbuffer ==0.3.1.1
@@ -2320,14 +2325,14 @@ default-package-overrides:
- tar ==0.5.1.1
- tar-conduit ==0.3.2
- tardis ==0.4.3.0
- - tasty ==1.2.3
- - tasty-ant-xml ==1.1.7
+ - tasty ==1.4.1
+ - tasty-ant-xml ==1.1.8
- tasty-bench ==0.2.2
- tasty-dejafu ==2.0.0.7
- tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.3
- tasty-focus ==1.0.1
- - tasty-golden ==2.3.3.2
+ - tasty-golden ==2.3.4
- tasty-hedgehog ==1.0.1.0
- tasty-hspec ==1.1.6
- tasty-hunit ==0.10.0.3
@@ -2338,7 +2343,7 @@ default-package-overrides:
- tasty-program ==1.0.5
- tasty-quickcheck ==0.10.1.2
- tasty-rerun ==1.1.18
- - tasty-silver ==3.1.15
+ - tasty-silver ==3.2.1
- tasty-smallcheck ==0.8.2
- tasty-test-reporter ==0.1.1.4
- tasty-th ==0.1.7
@@ -2363,7 +2368,7 @@ default-package-overrides:
- test-framework-smallcheck ==0.2
- test-fun ==0.1.0.0
- testing-type-modifiers ==0.1.0.1
- - texmath ==0.12.1.1
+ - texmath ==0.12.2
- text-ansi ==0.1.1
- text-binary ==0.2.1.1
- text-builder ==0.6.6.1
@@ -2373,7 +2378,7 @@ default-package-overrides:
- text-latin1 ==0.3.1
- text-ldap ==0.1.1.13
- textlocal ==0.1.0.5
- - text-manipulate ==0.2.0.1
+ - text-manipulate ==0.3.0.0
- text-metrics ==0.3.0
- text-postgresql ==0.0.3.1
- text-printer ==0.5.0.1
@@ -2383,11 +2388,11 @@ default-package-overrides:
- text-show ==3.9
- text-show-instances ==3.8.4
- text-zipper ==0.11
- - tfp ==1.0.1.1
+ - tfp ==1.0.2
- tf-random ==0.5
- th-abstraction ==0.4.2.0
- th-bang-compat ==0.0.1.0
- - th-compat ==0.1.1
+ - th-compat ==0.1.2
- th-constraint-compat ==0.0.1.0
- th-data-compat ==0.1.0.0
- th-desugar ==1.11
@@ -2396,7 +2401,7 @@ default-package-overrides:
- these-lens ==1.0.1.2
- these-optics ==1.0.1.2
- these-skinny ==0.7.4
- - th-expand-syns ==0.4.6.0
+ - th-expand-syns ==0.4.8.0
- th-extras ==0.0.0.4
- th-lift ==0.8.2
- th-lift-instances ==0.1.18
@@ -2447,15 +2452,13 @@ default-package-overrides:
- topograph ==1.0.0.1
- torsor ==0.1
- tostring ==0.2.1.1
- - tracing ==0.0.5.2
- - tracing-control ==0.0.6
- transaction ==0.1.1.3
- transformers-base ==0.4.5.2
- transformers-bifunctors ==0.1
- transformers-compat ==0.6.6
- transformers-fix ==1.0
- traverse-with-class ==1.0.1.0
- - tree-diff ==0.1
+ - tree-diff ==0.2
- tree-fun ==0.8.1.0
- tree-view ==0.5.1
- trifecta ==2.1.1
@@ -2468,7 +2471,7 @@ default-package-overrides:
- tuples-homogenous-h98 ==0.1.1.0
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- - turtle ==1.5.20
+ - turtle ==1.5.21
- typecheck-plugin-nat-simple ==0.1.0.2
- TypeCompose ==0.9.14
- typed-process ==0.2.6.0
@@ -2504,6 +2507,7 @@ default-package-overrides:
- unicode ==0.0.1.1
- unicode-show ==0.1.0.4
- unicode-transforms ==0.3.7.1
+ - unification-fd ==0.11.1
- union-find ==0.2
- unipatterns ==0.0.0.0
- uniplate ==1.6.13
@@ -2541,11 +2545,11 @@ default-package-overrides:
- utf8-light ==0.4.2
- utf8-string ==1.0.2
- util ==0.1.17.1
- - utility-ht ==0.0.15
+ - utility-ht ==0.0.16
- uuid ==1.3.14
- uuid-types ==1.0.4
- validation ==1.1.1
- - validation-selective ==0.1.0.0
+ - validation-selective ==0.1.0.1
- validity ==0.11.0.0
- validity-aeson ==0.2.0.4
- validity-bytestring ==0.4.1.1
@@ -2595,7 +2599,6 @@ default-package-overrides:
- wai-feature-flags ==0.1.0.1
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.6
- - wai-middleware-auth ==0.2.3.1
- wai-middleware-caching ==0.1.0.2
- wai-middleware-clacks ==0.1.0.1
- wai-middleware-static ==0.9.0
@@ -2629,7 +2632,7 @@ default-package-overrides:
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.0.0.5
- - witherable-class ==0
+ - witherable ==0.4.1
- within ==0.2.0.1
- with-location ==0.1.0
- with-utf8 ==1.0.2.2
@@ -2695,7 +2698,6 @@ default-package-overrides:
- yesod-gitrev ==0.2.1
- yesod-markdown ==0.12.6.6
- yesod-newsfeed ==1.7.0.0
- - yesod-page-cursor ==2.0.0.4
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.5
- yesod-sitemap ==1.6.0
@@ -2732,6 +2734,7 @@ extra-packages:
- Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc.
- Cabal == 3.2.* # required for cabal-install etc.
+ - base16-bytestring < 1 # required for cabal-install etc.
- dhall == 1.29.0 # required for ats-pkg
- dhall == 1.37.1 # required for spago 0.19.0.
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
@@ -2750,6 +2753,7 @@ extra-packages:
- haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08
+ - optparse-applicative < 0.16 # needed for niv-0.2.19
package-maintainers:
peti:
@@ -2871,27 +2875,27 @@ unsupported-platforms:
alsa-mixer: [ x86_64-darwin ]
alsa-pcm: [ x86_64-darwin ]
alsa-seq: [ x86_64-darwin ]
- AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin ]
- barbly: [ i686-linux, x86_64-linux ]
+ AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
bindings-directfb: [ x86_64-darwin ]
- d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin ]
- DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin ]
- dx9base: [ i686-linux, x86_64-linux, x86_64-darwin ]
- dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin ]
- dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
freenect: [ x86_64-darwin ]
FTGL: [ x86_64-darwin ]
gi-ostree: [ x86_64-darwin ]
- gtk-mac-integration: [ i686-linux, x86_64-linux ]
+ gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
hcwiid: [ x86_64-darwin ]
HFuse: [ x86_64-darwin ]
- hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
lio-fs: [ x86_64-darwin ]
midi-alsa: [ x86_64-darwin ]
pam: [ x86_64-darwin ]
PortMidi: [ x86_64-darwin ]
Raincat: [ x86_64-darwin ]
- reactivity: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
rtlsdr: [ x86_64-darwin ]
rubberband: [ x86_64-darwin ]
sdl2-mixer: [ x86_64-darwin ]
@@ -2899,18 +2903,18 @@ unsupported-platforms:
tokyotyrant-haskell: [ x86_64-darwin ]
vulkan: [ i686-linux, armv7l-linux ]
VulkanMemoryAllocator: [ i686-linux, armv7l-linux ]
- Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Win32: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+ Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
xattr: [ x86_64-darwin ]
- XInput: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
xmobar: [ x86_64-darwin ]
dont-distribute-packages:
@@ -3343,6 +3347,7 @@ broken-packages:
- asic
- asil
- asn
+ - ASN1
- asn1-codec
- asn1-data
- assert
@@ -4013,7 +4018,6 @@ broken-packages:
- Chart-tests
- chart-unit
- charter
- - chatter
- chatty-text
- chatwork
- cheapskate-terminal
@@ -5388,6 +5392,7 @@ broken-packages:
- fractals
- fraction
- frag
+ - frame-markdown
- Frames-beam
- Frames-dsv
- Frames-map-reduce
@@ -5450,7 +5455,6 @@ broken-packages:
- ftree
- ftshell
- full-sessions
- - fullstop
- funbot
- funbot-client
- funbot-git-hook
@@ -5945,6 +5949,7 @@ broken-packages:
- hahp
- haiji
- hailgun-send
+ - hails-bin
- hairy
- hakaru
- hakismet
@@ -5961,6 +5966,7 @@ broken-packages:
- hakyll-contrib-links
- hakyll-dhall
- hakyll-dir-list
+ - hakyll-elm
- hakyll-favicon
- hakyll-filestore
- hakyll-images
@@ -6127,7 +6133,6 @@ broken-packages:
- haskell-reflect
- haskell-rules
- haskell-spacegoo
- - haskell-src
- haskell-src-exts-observe
- haskell-src-exts-prisms
- haskell-src-exts-qq
@@ -6189,6 +6194,7 @@ broken-packages:
- haskellscript
- HaskellTorrent
- HaskellTutorials
+ - haskelm
- haskelzinc
- haskeme
- haskey
@@ -6623,10 +6629,6 @@ broken-packages:
- hopencl
- HOpenCV
- hopfield
- - hoppy-docs
- - hoppy-generator
- - hoppy-runtime
- - hoppy-std
- hops
- hoq
- horizon
@@ -6913,6 +6915,7 @@ broken-packages:
- http-wget
- http2-client-grpc
- http2-grpc-proto-lens
+ - http2-grpc-proto3-wire
- https-everywhere-rules
- https-everywhere-rules-raw
- httpspec
@@ -6960,6 +6963,7 @@ broken-packages:
- hw-kafka-avro
- hw-prim-bits
- hw-simd
+ - hw-simd-cli
- hw-uri
- hwall-auth-iitk
- hweblib
@@ -9180,6 +9184,7 @@ broken-packages:
- proto-lens-combinators
- proto-lens-descriptors
- proto3-suite
+ - proto3-wire
- protobuf-native
- protocol
- protocol-buffers-descriptor-fork
@@ -9254,10 +9259,6 @@ broken-packages:
- qr-imager
- qr-repa
- qsem
- - qtah-cpp-qt5
- - qtah-examples
- - qtah-generator
- - qtah-qt5
- QuadEdge
- QuadTree
- quantfin
@@ -10005,7 +10006,6 @@ broken-packages:
- sha1
- shade
- shadower
- - shake-bench
- shake-bindist
- shake-cabal-build
- shake-dhall
@@ -10052,6 +10052,7 @@ broken-packages:
- Shpadoinkle-examples
- Shpadoinkle-html
- Shpadoinkle-router
+ - Shpadoinkle-template
- Shpadoinkle-widgets
- shpider
- shuffle
@@ -10190,6 +10191,7 @@ broken-packages:
- snap-auth-cli
- snap-blaze-clay
- snap-configuration-utilities
+ - snap-elm
- snap-error-collector
- snap-extras
- snap-routes
@@ -10211,6 +10213,7 @@ broken-packages:
- snaplet-hdbc
- snaplet-hslogger
- snaplet-influxdb
+ - snaplet-lss
- snaplet-mandrill
- snaplet-mongoDB
- snaplet-mongodb-minimalistic
@@ -11366,6 +11369,7 @@ broken-packages:
- wai-middleware-route
- wai-middleware-static-caching
- wai-middleware-travisci
+ - wai-middleware-validation
- wai-rate-limit-redis
- wai-request-spec
- wai-responsible
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 81fc63419380..345632ddd8b4 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -27,7 +27,7 @@ self: {
attoparsec base bytestring linear packer
];
description = "3D model parsers";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -581,6 +581,8 @@ self: {
];
description = "ASN.1 support for Haskell";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"AVar" = callPackage
@@ -603,7 +605,7 @@ self: {
libraryHaskellDepends = [ base regex-compat Win32 ];
description = "A binding to a part of the ANSI escape code for the console";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"AbortT-monadstf" = callPackage
@@ -938,7 +940,7 @@ self: {
PrimitiveArray vector
];
description = "Collection of alignment algorithms";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1131,7 +1133,7 @@ self: {
base containers mtl poly-rec requirements tagged template-haskell
];
description = "Strongly typed Attribute Grammars implemented using type-level programming";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"AttoBencode" = callPackage
@@ -1313,14 +1315,14 @@ self: {
pname = "BNFC-meta";
version = "0.6.1";
sha256 = "0snackflcjxza4iqbd85fdsmylwr3bj71nsfrs2s2idc3nlxc7ia";
- revision = "1";
- editedCabalFile = "1lj92qxjf7gbgifhz1p6jw20079x6772gkbhvpd8ba4956dvzna3";
+ revision = "2";
+ editedCabalFile = "1xg96a83jhz5jiw16yrgm3x5k7fz7zmz6cvggnfmjvw7v7bl69ph";
libraryHaskellDepends = [
alex-meta array base fail happy-meta haskell-src-meta syb
template-haskell
];
description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"Baggins" = callPackage
@@ -1333,7 +1335,7 @@ self: {
editedCabalFile = "16206xd8lm8fkvpxbm19h403264xyjki07s9lam3pgq985xbqk35";
libraryHaskellDepends = [ base cairo containers mtl ];
description = "Tools for self-assembly";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1414,7 +1416,7 @@ self: {
base bytestring cassava deepseq directory statistics time vector
];
description = "Benchmark functions with history";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1535,7 +1537,7 @@ self: {
filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
];
description = "Libary for Hidden Markov Models in HMMER3 format";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1558,7 +1560,7 @@ self: {
vector-read-instances zlib
];
description = "Base library for bioinformatics";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1586,7 +1588,7 @@ self: {
tasty-silver tasty-th text
];
description = "BLAST-related tools";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1599,7 +1601,7 @@ self: {
sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w";
libraryHaskellDepends = [ base bytestring iteratee ];
description = "Vienna / DotBracket / ExtSS parsers";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1642,7 +1644,7 @@ self: {
directory either-unwrap text vector word8
];
description = "Ensembl related datastructures and functions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1659,7 +1661,7 @@ self: {
base BiobaseXNA bytestring containers filemanip iteratee tuple
];
description = "Importer for FR3D resources";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1704,7 +1706,7 @@ self: {
http-conduit hxt mtl network Taxonomy text transformers
];
description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1726,7 +1728,7 @@ self: {
either-unwrap hxt text
];
description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1766,7 +1768,7 @@ self: {
base criterion lens text transformers
];
description = "Infernal data structures and tools";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1779,7 +1781,7 @@ self: {
sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r";
libraryHaskellDepends = [ base bytestring containers iteratee ];
description = "Multiple Alignment Format";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1829,7 +1831,7 @@ self: {
];
executableHaskellDepends = [ cmdargs ];
description = "RNA folding training data";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1848,7 +1850,7 @@ self: {
filepath lens primitive PrimitiveArray repa split vector
];
description = "Import Turner RNA parameters";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -1899,7 +1901,7 @@ self: {
base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector
];
description = "Import Vienna energy parameters";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -2025,7 +2027,7 @@ self: {
HTTP http-conduit hxt mtl network transformers zip-archive
];
description = "Libary to interface with the NCBI blast REST interface";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -2074,7 +2076,7 @@ self: {
];
executableHaskellDepends = [ base cmdargs ];
description = "A tool for posting Haskelly articles to blogs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -2127,7 +2129,7 @@ self: {
base containers criterion MissingH network-uri parsec
];
description = "A markdown-like markup language designed for blog posts";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -2292,7 +2294,7 @@ self: {
QuickCheck test-framework test-framework-quickcheck2
];
description = "Encode/Decode values to/from CBOR";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -2459,7 +2461,7 @@ self: {
];
executableHaskellDepends = [ cmdargs ];
description = "Infernal covariance model comparison";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -3321,7 +3323,7 @@ self: {
testHaskellDepends = [ base hspec hspec-discover parsec text ];
testToolDepends = [ hspec-discover ];
description = "Libary for parsing Clustal tools output";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -3375,8 +3377,8 @@ self: {
}:
mkDerivation {
pname = "Color";
- version = "0.3.0";
- sha256 = "18aissrpllxll01k203i2agfff89ffah465zvb0yx0lvs8jh2xr7";
+ version = "0.3.1";
+ sha256 = "1gg15kb6za69w0b3x8pzrqbrh9b8g7g0zwj2a9ajf0wgp8kylp5b";
libraryHaskellDepends = [ base data-default-class deepseq vector ];
testHaskellDepends = [
base colour doctest hspec HUnit JuicyPixels massiv massiv-test
@@ -3935,7 +3937,7 @@ self: {
transformers-compat utf8-string xml-conduit xml-hamlet
];
description = "RFC 4918 WebDAV support";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"DBFunctor" = callPackage
@@ -4016,7 +4018,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base MuCheck ];
description = "Distributed Mutation Analysis framework for MuCheck";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -4293,7 +4295,7 @@ self: {
utf8-string
];
description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -4447,8 +4449,8 @@ self: {
}:
mkDerivation {
pname = "Decimal";
- version = "0.5.1";
- sha256 = "0k7kh05mr2f54w1lpgq1nln0h8k6s6h99dyp5jzsb9cfbb3aap2p";
+ version = "0.5.2";
+ sha256 = "19w7i9f0lbiyzwa0v3bm95233vi7f1688f0xms6cnjsf88h04ym3";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [
base deepseq HUnit QuickCheck test-framework test-framework-hunit
@@ -4676,7 +4678,7 @@ self: {
];
testHaskellDepends = [ base hspec lens mtl text ];
description = "A client library for the DigitalOcean API";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -4704,7 +4706,7 @@ self: {
librarySystemDepends = [ dsound ];
description = "Partial binding to the Microsoft DirectSound API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {dsound = null;};
"DisTract" = callPackage
@@ -4742,7 +4744,7 @@ self: {
];
testHaskellDepends = [ base doctest ];
description = "Discussion support system";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -4827,7 +4829,7 @@ self: {
PrimitiveArray repa split vector
];
description = "Frameshift-aware alignment of protein sequences with DNA sequences";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -5050,7 +5052,7 @@ self: {
array base criterion QuickCheck random vector
];
description = "Dynamic time warping of sequences";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -5356,7 +5358,7 @@ self: {
Taxonomy text transformers
];
description = "Libary to interface with the NCBI Entrez REST service";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -5506,7 +5508,7 @@ self: {
base containers ghc mtl operational random SafeSemaphore time unix
];
description = "A general data-flow framework";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -5526,7 +5528,7 @@ self: {
array base containers deepseq Etage fgl mtl parallel random time
];
description = "Data-flow based graph algorithms";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -5644,7 +5646,7 @@ self: {
libraryHaskellDepends = [ base inline-c ];
testHaskellDepends = [ base hspec inline-c ];
description = "Haskell Foreign Accelerate Interface";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"FComp" = callPackage
@@ -5669,7 +5671,7 @@ self: {
template-haskell time uu-parsinglib
];
description = "Compose music";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -5698,7 +5700,7 @@ self: {
libraryHaskellDepends = [ base ];
librarySystemDepends = [ fmodex64 ];
description = "The Haskell FModEx raw API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {fmodex64 = null;};
@@ -5739,7 +5741,9 @@ self: {
librarySystemDepends = [ ftgl ];
description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) ftgl;};
"FTGL-bytestring" = callPackage
@@ -6768,7 +6772,7 @@ self: {
sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4";
libraryHaskellDepends = [ base OpenGLRaw ];
description = "Utilities for working with OpenGL matrices";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -7103,7 +7107,7 @@ self: {
base QuickCheck tasty tasty-quickcheck tasty-th vector
];
description = "Hox gene clustering";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -7158,7 +7162,7 @@ self: {
test-framework-th
];
description = "MCFGs for Genus-1 RNA Pseudoknots";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -7440,7 +7444,7 @@ self: {
base dataenc download-curl utf8-string xml
];
description = "Interface to Google Suggest API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"GoogleTranslate" = callPackage
@@ -7454,7 +7458,7 @@ self: {
AttoJson base bytestring dataenc download-curl
];
description = "Interface to Google Translate API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -7504,7 +7508,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Grammar products and higher-dimensional grammars";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -7524,7 +7528,7 @@ self: {
];
executableHaskellDepends = [ array base mtl ];
description = "Graph500 benchmark-related definitions and data set generator";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -7540,7 +7544,7 @@ self: {
array base containers Graph500 mtl stm time
];
description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -7559,7 +7563,7 @@ self: {
array base containers Graph500 GraphHammer mtl
];
description = "Test harness for TriangleCount analysis";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -8171,7 +8175,7 @@ self: {
sha256 = "09h6wfalziw39c2sghj8qw82vyvnl01qlsam6ngkfkdirgj5sg5h";
libraryHaskellDepends = [ base c-storable-deriving ];
description = "A Queue with a random (weighted) pick function";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -8191,7 +8195,9 @@ self: {
'';
description = "HFuse is a binding for the Linux FUSE library";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) fuse;};
"HGE2D" = callPackage
@@ -8914,7 +8920,7 @@ self: {
executableHaskellDepends = [ base ];
executablePkgconfigDepends = [ opencv ];
description = "A binding for the OpenCV computer vision library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) opencv;};
@@ -9053,7 +9059,7 @@ self: {
HROOT-io HROOT-math HROOT-tree template-haskell
];
description = "Haskell binding to the ROOT data analysis framework";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9068,7 +9074,7 @@ self: {
base fficxx fficxx-runtime template-haskell
];
description = "Haskell binding to ROOT Core modules";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9085,7 +9091,7 @@ self: {
base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell
];
description = "Haskell binding to ROOT Graf modules";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9102,7 +9108,7 @@ self: {
base fficxx fficxx-runtime HROOT-core template-haskell
];
description = "Haskell binding to ROOT Hist modules";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9119,7 +9125,7 @@ self: {
base fficxx fficxx-runtime HROOT-core template-haskell
];
description = "Haskell binding to ROOT IO modules";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9136,7 +9142,7 @@ self: {
base fficxx fficxx-runtime HROOT-core template-haskell
];
description = "Haskell binding to ROOT Math modules";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9153,7 +9159,7 @@ self: {
base fficxx fficxx-runtime HROOT-core template-haskell
];
description = "Haskell binding to ROOT Tree modules";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9413,7 +9419,7 @@ self: {
unordered-containers
];
description = "The Haskell Test Framework";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9635,7 +9641,7 @@ self: {
sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458";
libraryHaskellDepends = [ base bytestring serialport stm ];
description = "An Haskell library to drive the french Minitel through a serial port";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9841,7 +9847,7 @@ self: {
];
testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
description = "Aggression analysis for Tweets on Twitter";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9890,7 +9896,7 @@ self: {
executableHaskellDepends = [ base random transformers ];
testHaskellDepends = [ base hspec transformers ];
description = "The classic game of Hangman";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9934,7 +9940,7 @@ self: {
process sox template-haskell uu-parsinglib vector
];
description = "Harmony Analysis and Retrieval of Music";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -9957,7 +9963,7 @@ self: {
uu-parsinglib
];
description = "Parsing and unambiguously representing musical chords";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"HasBigDecimal" = callPackage
@@ -9985,7 +9991,7 @@ self: {
librarySystemDepends = [ CacBDD ];
testHaskellDepends = [ base hspec QuickCheck ];
description = "Haskell bindings for CacBDD";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {CacBDD = null;};
@@ -10003,7 +10009,7 @@ self: {
base haskell98 hmatrix hmatrix-special mtl parsec random
];
description = "A Haskell library for inference using Gaussian processes";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -10061,7 +10067,7 @@ self: {
base containers directory ghc-prim HList tagged
];
description = "HaskRel, Haskell as a DBMS with support for the relational algebra";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -10827,6 +10833,21 @@ self: {
license = lib.licenses.publicDomain;
}) {inherit (pkgs) openssl;};
+ "HsOpenSSL_0_11_6" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
+ mkDerivation {
+ pname = "HsOpenSSL";
+ version = "0.11.6";
+ sha256 = "1gkx6kk03ziz9wk6iwxcdpf1ig8a9whwv3yjbzmqrwkp7fh1wdrw";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [ base bytestring network time ];
+ librarySystemDepends = [ openssl ];
+ testHaskellDepends = [ base bytestring ];
+ description = "Partial OpenSSL binding for Haskell";
+ license = lib.licenses.publicDomain;
+ hydraPlatforms = lib.platforms.none;
+ }) {inherit (pkgs) openssl;};
+
"HsOpenSSL-x509-system" = callPackage
({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
mkDerivation {
@@ -10950,7 +10971,7 @@ self: {
text
];
description = "Pure Haskell YAML 1.2 processor";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"HsYAML-aeson" = callPackage
@@ -11065,7 +11086,7 @@ self: {
];
benchmarkHaskellDepends = [ array base criterion Munkres random ];
description = "A Linear Sum Assignment Problem (LSAP) solver";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"Hydrogen" = callPackage
@@ -11101,7 +11122,7 @@ self: {
libraryHaskellDepends = [ array base QuickCheck ];
testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
description = "Code for the Haskell course taught at the University of Seville";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -11293,7 +11314,7 @@ self: {
sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb";
libraryHaskellDepends = [ base mtl template-haskell ];
description = "A library for writing Imperative style haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -11444,7 +11465,7 @@ self: {
];
testHaskellDepends = [ base doctest ];
description = "DSL for IRC bots";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -11578,7 +11599,7 @@ self: {
sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp";
libraryHaskellDepends = [ base hosc ];
description = "control JackMiniMix";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -11756,8 +11777,8 @@ self: {
pname = "JuicyPixels-blurhash";
version = "0.1.0.3";
sha256 = "0kgl2j7990p8q5yrkn0wgaszc9fzva1pc3277j11k1lbjsymz360";
- revision = "3";
- editedCabalFile = "1mspqkmvn5j6xs3cb882szbnrzaxf0p2nyyxkfqfnbma204cs2fi";
+ revision = "4";
+ editedCabalFile = "0jxrcv4x3xr3v4lka0z5b13ywdic5f1dh19ivshrvad3xnv7kx0g";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -12483,7 +12504,7 @@ self: {
pipes-parse
];
description = "Library for RedPitaya";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -12564,7 +12585,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base directory filepath unix ];
description = "A simple sandboxing tool for Haskell packages";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -12596,7 +12617,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base directory random SDL SDL-ttf ];
description = "A Snake II clone written using SDL";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -12726,7 +12747,7 @@ self: {
libraryHaskellDepends = [ base binary bytestring HTF mtl ];
testHaskellDepends = [ base binary bytestring HTF mtl ];
description = "Algorithmic Doom map generation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -13051,7 +13072,7 @@ self: {
libraryHaskellDepends = [ base containers mtl ];
testHaskellDepends = [ base containers mtl ];
description = "Generate MASM code from haskell";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -13064,7 +13085,7 @@ self: {
sha256 = "0yh84vybrxs6bv3z4qx4n9m4xwsb4kw21l35s5v4gg8yllgbb79r";
libraryHaskellDepends = [ base bytestring hidapi mtl ];
description = "Haskell interface for controlling the mBot educational robot";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -13084,7 +13105,7 @@ self: {
];
executableHaskellDepends = [ cmdargs split ];
description = "Folding algorithm based on nucleotide cyclic motifs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -13179,7 +13200,7 @@ self: {
tasty tasty-hunit tasty-quickcheck tasty-th
];
description = "A GLPK backend to the MIP library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) glpk;};
@@ -13302,7 +13323,7 @@ self: {
sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn";
libraryHaskellDepends = [ base ];
description = "Mapping";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -13649,7 +13670,7 @@ self: {
sha256 = "1n90lfrvfr1ni7ninlxbs4wk0m7mibdpi9sy26ifih51nmk8nziq";
libraryHaskellDepends = [ base numeric-prelude ];
description = "Modular arithmetic via Numeric-Prelude";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"Moe" = callPackage
@@ -13930,7 +13951,7 @@ self: {
sha256 = "1dglyak17db7q9nd6s255w2zh8lh192vidyjvgvh53vbybymb20z";
libraryHaskellDepends = [ base containers split ];
description = "Morse code";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"MuCheck" = callPackage
@@ -13950,7 +13971,7 @@ self: {
temporary time
];
description = "Automated Mutation Testing";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -13966,7 +13987,7 @@ self: {
libraryHaskellDepends = [ base HUnit MuCheck ];
executableHaskellDepends = [ base HUnit MuCheck ];
description = "Automated Mutation Testing for HUnit tests";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -13982,7 +14003,7 @@ self: {
libraryHaskellDepends = [ base hspec hspec-core MuCheck ];
executableHaskellDepends = [ base hspec hspec-core MuCheck ];
description = "Automated Mutation Testing for Hspec tests";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -13998,7 +14019,7 @@ self: {
libraryHaskellDepends = [ base MuCheck QuickCheck ];
executableHaskellDepends = [ base MuCheck QuickCheck ];
description = "Automated Mutation Testing for QuickCheck tests";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -14014,7 +14035,7 @@ self: {
libraryHaskellDepends = [ base MuCheck smallcheck ];
executableHaskellDepends = [ base MuCheck smallcheck ];
description = "Automated Mutation Testing for SmallCheck tests";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -14059,7 +14080,7 @@ self: {
transformers unliftio-core vector xml-conduit xml-types
];
description = "interface to MusicBrainz XML2 and JSON web services";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"MusicBrainz-libdiscid" = callPackage
@@ -14106,7 +14127,7 @@ self: {
base QuickCheck tasty tasty-quickcheck tasty-th vector
];
description = "Most likely order of mutation events in RNA";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -14193,7 +14214,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 time
];
description = "A Haskell interface to Lego Mindstorms NXT";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {bluetooth = null;};
@@ -14249,7 +14270,7 @@ self: {
editedCabalFile = "01ma6068mnwn9f7jpa5g8kkl7lyhl5wnpw9ad44zz9gki1mrw37i";
libraryHaskellDepends = [ base containers random ];
description = "A name generator written in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"NanoProlog" = callPackage
@@ -14406,7 +14427,7 @@ self: {
sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv";
libraryHaskellDepends = [ base random vector ];
description = "A port of John Skilling's nested sampling C code to Haskell";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"NetSNMP" = callPackage
@@ -14736,7 +14757,7 @@ self: {
libraryHaskellDepends = [ base containers primes ];
testHaskellDepends = [ base containers HUnit primes ];
description = "A library for number theoretic computations, written in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -14766,7 +14787,7 @@ self: {
ADPfusion base ghc-prim mtl primitive PrimitiveArray vector
];
description = "Nussinov78 using the ADPfusion library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -15438,7 +15459,7 @@ self: {
isExecutable = true;
libraryHaskellDepends = [ base bytestring containers ];
description = "A library for analysis of 3-D protein coordinates";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"PPrinter" = callPackage
@@ -15706,7 +15727,7 @@ self: {
old-locale process random RSA SafeSemaphore time unix
];
description = "A proven synchronization server for high performance computing";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -15719,7 +15740,7 @@ self: {
sha256 = "11vshnbxfl8p38aix4h2b0vms8j58agwxbmhd9pkxai764sl6j7g";
libraryHaskellDepends = [ base parsec ];
description = "Parsec combinators for more complex objects";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"ParserFunction" = callPackage
@@ -15768,7 +15789,7 @@ self: {
libraryHaskellDepends = [ base cmdargs HTTP network network-uri ];
executableHaskellDepends = [ base cmdargs ];
description = "CLI for pasting to lpaste.net";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"PathTree" = callPackage
@@ -15899,7 +15920,7 @@ self: {
string-conversions temporary text time
];
description = "Personal Happstack Server Utils";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16017,7 +16038,7 @@ self: {
sha256 = "047aw1pka7xsqnshbmirkxd80m92w96xfb0kpi1a22bx0kpgg58w";
libraryHaskellDepends = [ base containers regex-tdfa ];
description = "Pluralize English words";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"Pollutocracy" = callPackage
@@ -16045,7 +16066,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base bytestring network splice ];
description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16062,7 +16083,9 @@ self: {
librarySystemDepends = [ alsaLib ];
description = "A binding for PortMedia/PortMidi";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) alsaLib;};
"PortMidi-simple" = callPackage
@@ -16284,7 +16307,7 @@ self: {
executableHaskellDepends = [ base ];
doHaddock = false;
description = "A networked event handling framework for hooking into other programs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16301,7 +16324,7 @@ self: {
base network parsec Pup-Events-PQueue stm transformers
];
description = "A networked event handling framework for hooking into other programs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"Pup-Events-Demo" = callPackage
@@ -16319,7 +16342,7 @@ self: {
Pup-Events-Server stm
];
description = "A networked event handling framework for hooking into other programs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16332,7 +16355,7 @@ self: {
sha256 = "0sngiqxzj5kif452s2hn3x1kv257815c5v19dp4wqazbyc373iwx";
libraryHaskellDepends = [ base stm ];
description = "A networked event handling framework for hooking into other programs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"Pup-Events-Server" = callPackage
@@ -16347,7 +16370,7 @@ self: {
base network parsec Pup-Events-PQueue stm transformers
];
description = "A networked event handling framework for hooking into other programs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16532,7 +16555,7 @@ self: {
libraryHaskellDepends = [ base QuickCheck ];
testHaskellDepends = [ base hspec QuickCheck ];
description = "Generator of \"valid\" and \"invalid\" data in a type class";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16557,7 +16580,7 @@ self: {
websockets-snap
];
description = "Quick and easy data visualization with Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16683,7 +16706,7 @@ self: {
libraryHaskellDepends = [ base binary bytestring ];
testHaskellDepends = [ base binary bytestring hspec ];
description = "RLP serialization as defined in Ethereum Yellow Paper";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16729,7 +16752,7 @@ self: {
base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs
];
description = "RNA secondary structure prediction";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16750,7 +16773,7 @@ self: {
containers HsTools primitive PrimitiveArray RNAFold split vector
];
description = "RNA secondary structure folding";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16777,7 +16800,7 @@ self: {
];
executableHaskellDepends = [ bytestring cmdargs file-embed ];
description = "Multi-target RNA sequence design";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16798,7 +16821,7 @@ self: {
];
executableHaskellDepends = [ cmdargs ];
description = "Draw RNA secondary structures";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16832,7 +16855,7 @@ self: {
text time vector ViennaRNAParser
];
description = "Unsupervized construction of RNA family models";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16854,7 +16877,7 @@ self: {
];
executableHaskellDepends = [ cmdargs split ];
description = "RNA folding with non-canonical basepairs and base-triplets";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -16932,7 +16955,9 @@ self: {
];
description = "A puzzle game written in Haskell with a cat in lead role";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {};
"Random123" = callPackage
@@ -17166,7 +17191,7 @@ self: {
base cmdargs cond containers directory
];
description = "A utility for computing distributions of material to review among reviewers";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -17310,7 +17335,7 @@ self: {
test-framework-quickcheck2
];
description = "Limits the size of a directory's contents";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -17714,7 +17739,7 @@ self: {
];
libraryToolDepends = [ c2hsc ];
description = "Declarative coördination language for streaming networks";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -17906,7 +17931,7 @@ self: {
pipes-bytestring pipes-parse split
];
description = "A parser for SWMM 5 binary .OUT files";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"SableCC2Hs" = callPackage
@@ -18083,7 +18108,7 @@ self: {
regex-compat sqlite-simple unix
];
description = "Size limited temp filesystem based on fuse";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -18157,7 +18182,7 @@ self: {
base cmdargs directory either-unwrap
];
description = "Selects a representative subset of sequences from multiple sequence alignment";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -18220,7 +18245,7 @@ self: {
base directory filepath hslogger mtl old-locale random time
];
description = "Easy Loggingframework";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -18264,7 +18289,7 @@ self: {
filepath mtl parsec QuickCheck regex-tdfa
];
description = "Shell script analysis tool";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"Shellac" = callPackage
@@ -18598,6 +18623,39 @@ self: {
broken = true;
}) {};
+ "Shpadoinkle-streaming" = callPackage
+ ({ mkDerivation, base, lens, Shpadoinkle, streaming, text }:
+ mkDerivation {
+ pname = "Shpadoinkle-streaming";
+ version = "0.0.0.1";
+ sha256 = "1bvrkyj9l8asczfamw26x1hwj8bcxr7812zjm1m91jg4xzipayv2";
+ libraryHaskellDepends = [ base lens Shpadoinkle streaming text ];
+ description = "Integration of the streaming library with Shpadoinkle continuations";
+ license = lib.licenses.bsd3;
+ }) {};
+
+ "Shpadoinkle-template" = callPackage
+ ({ mkDerivation, base, file-embed, html-parse, Shpadoinkle
+ , Shpadoinkle-backend-static, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "Shpadoinkle-template";
+ version = "0.0.0.1";
+ sha256 = "1iyxb0hnyfcb4fipwrvzr03g3rai5lc5k7sysrd691l0dsh2jill";
+ libraryHaskellDepends = [
+ base html-parse Shpadoinkle Shpadoinkle-backend-static
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base file-embed html-parse Shpadoinkle Shpadoinkle-backend-static
+ template-haskell text
+ ];
+ description = "Read standard file formats into Shpadoinkle with Template Haskell";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"Shpadoinkle-widgets" = callPackage
({ mkDerivation, aeson, base, compactable, containers
, edit-distance, email-validate, hspec, jsaddle, mtl, QuickCheck
@@ -18756,7 +18814,7 @@ self: {
libraryHaskellDepends = [ base split ];
testHaskellDepends = [ base Cabal ];
description = "Simple table generator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"Sit" = callPackage
@@ -18932,7 +18990,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base QuickCheck ];
description = "Sonnex is an alternative to Soundex for french language";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -19278,7 +19336,7 @@ self: {
sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6";
libraryHaskellDepends = [ base statistics tuple vector ];
description = "Collection of useful statistical methods";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"StockholmAlignment" = callPackage
@@ -19294,7 +19352,7 @@ self: {
vector
];
description = "Libary for Stockholm aligmnent format";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -19448,7 +19506,7 @@ self: {
sha256 = "1wbixjgzad3s9jj16kl0gvwg82g3hqvkag9wr5j58w98a4qyqw8i";
libraryHaskellDepends = [ base ];
description = "String manipulation utilities";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"SuffixStructures" = callPackage
@@ -19802,7 +19860,7 @@ self: {
aeson base bytestring either-unwrap fgl parsec text vector
];
description = "Libary for parsing, processing and vizualization of taxonomy data";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -19823,7 +19881,7 @@ self: {
EntrezHTTP fgl hxt parsec process Taxonomy text vector
];
description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -19853,7 +19911,7 @@ self: {
template-haskell text
];
description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -19915,7 +19973,7 @@ self: {
process text
];
description = "Generates testcases from program-snippets";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"Theora" = callPackage
@@ -19952,7 +20010,7 @@ self: {
sha256 = "0rpcv6kw351ykj36f83qdqygrhk4ylqlcgcswxl8gg1v33jaaqmz";
libraryHaskellDepends = [ base ];
description = "Mutable objects that reside in their own threads";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"Thrift" = callPackage
@@ -20011,7 +20069,7 @@ self: {
sha256 = "02plz1y7lmvp3jpl5srsnx2nkl6yhhfn6pqj00szs688cahk2dik";
libraryHaskellDepends = [ base binary bytestring dataenc ];
description = "TigerHash with C implementation";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"TimePiece" = callPackage
@@ -20075,7 +20133,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base containers matrix random ];
description = "Game for Lounge Marmelade";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -20370,7 +20428,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base containers directory time ];
description = "Command Line Typing speed tester";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"UISF" = callPackage
@@ -20767,7 +20825,7 @@ self: {
];
testHaskellDepends = [ base hspec parsec ];
description = "Libary for parsing ViennaRNA package output";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"Villefort" = callPackage
@@ -20824,7 +20882,7 @@ self: {
];
description = "Bindings to the VulkanMemoryAllocator library";
license = lib.licenses.bsd3;
- platforms = [ "x86_64-darwin" "x86_64-linux" ];
+ platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
}) {};
"WAVE" = callPackage
@@ -21189,12 +21247,12 @@ self: {
platforms = lib.platforms.none;
}) {};
- "Win32_2_11_1_0" = callPackage
+ "Win32_2_12_0_0" = callPackage
({ mkDerivation }:
mkDerivation {
pname = "Win32";
- version = "2.11.1.0";
- sha256 = "18rsfx3ca8r7y4ifxn1mggn8j6ppgkn698wsq0pwqb63riva09rk";
+ version = "2.12.0.0";
+ sha256 = "068k26s1vxwz94w7bkqs9xbkh0z2mp1mimyklarr8rh26v978qin";
description = "A binding to Windows Win32 API";
license = lib.licenses.bsd3;
platforms = lib.platforms.none;
@@ -21209,7 +21267,7 @@ self: {
libraryHaskellDepends = [ base Win32 ];
description = "Binding to the Win32 console API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"Win32-dhcp-server" = callPackage
@@ -21221,7 +21279,7 @@ self: {
libraryHaskellDepends = [ base text Win32 Win32-errors ];
description = "Win32 DHCP Server Management API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"Win32-errors" = callPackage
@@ -21238,7 +21296,7 @@ self: {
testHaskellDepends = [ base hspec QuickCheck Win32 ];
description = "Alternative error handling for Win32 foreign calls";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"Win32-extras" = callPackage
@@ -21253,7 +21311,7 @@ self: {
librarySystemDepends = [ imm32 msimg32 ];
description = "Provides missing Win32 API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {imm32 = null; msimg32 = null;};
"Win32-junction-point" = callPackage
@@ -21265,7 +21323,7 @@ self: {
libraryHaskellDepends = [ base text Win32 Win32-errors ];
description = "Support for manipulating NTFS junction points";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"Win32-notify" = callPackage
@@ -21279,7 +21337,7 @@ self: {
libraryHaskellDepends = [ base containers directory Win32 ];
description = "A binding to part of the Win32 library for file notification";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"Win32-security" = callPackage
@@ -21293,7 +21351,7 @@ self: {
libraryHaskellDepends = [ base text Win32 Win32-errors ];
description = "Haskell bindings to a security-related functions of the Windows API";
license = lib.licenses.mit;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"Win32-services" = callPackage
@@ -21306,7 +21364,7 @@ self: {
librarySystemDepends = [ Advapi32 ];
description = "Windows service applications";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {Advapi32 = null;};
"Win32-services-wrapper" = callPackage
@@ -21322,7 +21380,7 @@ self: {
];
description = "Wrapper code for making a Win32 service";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"Win32-shortcut" = callPackage
@@ -21394,7 +21452,7 @@ self: {
tasty-th text
];
description = "Bigram word pair alignments";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -21615,7 +21673,7 @@ self: {
librarySystemDepends = [ xinput ];
description = "Bindings for the DirectX XInput library";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {inherit (pkgs.xorg) xinput;};
"XML" = callPackage
@@ -21646,7 +21704,7 @@ self: {
sha256 = "1vdgbmf27ghvyjzkcymsz9fgv9lcss41n5hiyqc58nzg0w18r0ik";
libraryHaskellDepends = [ base parsec ];
description = "A library to parse xml";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"XMMS" = callPackage
@@ -21975,10 +22033,8 @@ self: {
}:
mkDerivation {
pname = "Z-Data";
- version = "0.7.0.0";
- sha256 = "1b4ycsq5g459ynp989kldq6r3ssawr64a2hp3dzy804pwrp8v62m";
- revision = "1";
- editedCabalFile = "057si6f4hz5kda3gyr2b8kni17dmv28z82b64qi142gjr3gx415i";
+ version = "0.7.1.0";
+ sha256 = "12ay07rfyprdbgf6ndh4ywcklfqnjdk1gdf0xli27a96i86i7x44";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq ghc-prim
@@ -22005,8 +22061,8 @@ self: {
}:
mkDerivation {
pname = "Z-IO";
- version = "0.7.0.0";
- sha256 = "1yw0ym2iw1hi3jn2xrp1hwi6vbv69d0fpvvz3n2328v4i0ryjdjf";
+ version = "0.7.1.0";
+ sha256 = "18d2q9fg4ydqpnrzvpcx1arjv4yl2966aax68fz3izgmsbp95k0l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -23328,7 +23384,7 @@ self: {
libraryHaskellDepends = [ base ];
executableHaskellDepends = [ base ];
description = "Maybe gives you a cute girl";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"acme-default" = callPackage
@@ -23481,7 +23537,7 @@ self: {
sha256 = "039pz5lw3p8iy1gaijvbc8296djxcziw70a0rnw0iz3iy29w1fmc";
libraryHaskellDepends = [ base text ];
description = "free your haskell from the tyranny of npm!";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -24069,7 +24125,7 @@ self: {
parsec-permutation strict text time
];
description = "Convert adblock config files to privoxy format";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"addLicenseInfo" = callPackage
@@ -24276,7 +24332,7 @@ self: {
sha256 = "0cp14n2l3scbsp7f6s4r19ngn2ympns03pm6s07hdkpavvgli1zg";
libraryHaskellDepends = [ base ];
description = "Modelling, rendering and quantitative analysis on attack defense trees";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -24501,20 +24557,19 @@ self: {
"aeson-combinators" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
- , deepseq, doctest, fail, hspec, scientific, text, time
- , time-compat, unordered-containers, utf8-string, uuid-types
- , vector, void
+ , deepseq, fail, hspec, scientific, text, time, time-compat
+ , unordered-containers, utf8-string, uuid-types, vector, void
}:
mkDerivation {
pname = "aeson-combinators";
- version = "0.0.4.1";
- sha256 = "1nvw5n7kfqrrci76350zd3mqvssb775ka4044kxgw0bhdzy3gcpg";
+ version = "0.0.5.0";
+ sha256 = "1z5fbvpffx2lv3d2wk9g74hmkx1n1yjkwd3vy57f3pp5npja7f3a";
libraryHaskellDepends = [
aeson base bytestring containers fail scientific text time
time-compat unordered-containers uuid-types vector void
];
testHaskellDepends = [
- aeson base bytestring doctest hspec text utf8-string
+ aeson base bytestring hspec text utf8-string
];
benchmarkHaskellDepends = [
aeson base bytestring criterion deepseq text
@@ -25389,7 +25444,7 @@ self: {
monad-parallel mtl OpenGL sdl2 stm text uuid vector
];
description = "A simple Game Engine using SDL";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -26010,7 +26065,7 @@ self: {
regex-compat syb temporary unix utf8-string zlib
];
description = "Haskell compiler that produce binary through C language";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -26116,8 +26171,8 @@ self: {
}:
mkDerivation {
pname = "alex-meta";
- version = "0.3.0.12";
- sha256 = "0s0yhkl0ymr50agqnsbscw8926jk4044n6scw086ylhcijx3qmxa";
+ version = "0.3.0.13";
+ sha256 = "0lbralcid373p25m4qhrhrjak87p8wp4as3304sj6ba6xka89q3v";
libraryHaskellDepends = [
array base containers haskell-src-meta QuickCheck template-haskell
];
@@ -26238,7 +26293,7 @@ self: {
tf-random transformers
];
description = "Algorithmic automation for various DAWs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -26814,7 +26869,9 @@ self: {
libraryPkgconfigDepends = [ alsaLib ];
description = "Binding to the ALSA Library API (Exceptions)";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) alsaLib;};
"alsa-gui" = callPackage
@@ -26869,7 +26926,9 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Bindings to the ALSA simple mixer API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) alsaLib;};
"alsa-pcm" = callPackage
@@ -26889,7 +26948,9 @@ self: {
libraryPkgconfigDepends = [ alsaLib ];
description = "Binding to the ALSA Library API (PCM audio)";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) alsaLib;};
"alsa-pcm-tests" = callPackage
@@ -26925,7 +26986,9 @@ self: {
libraryPkgconfigDepends = [ alsaLib ];
description = "Binding to the ALSA Library API (MIDI sequencer)";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) alsaLib;};
"alsa-seq-tests" = callPackage
@@ -29654,8 +29717,8 @@ self: {
}:
mkDerivation {
pname = "amqp";
- version = "0.21.0";
- sha256 = "1sni1bl2rmc2fq2zla0h093acd7yisfdizd5wrxclammzav7x0gk";
+ version = "0.22.0";
+ sha256 = "1yr81pwmjnap5bir9nrmpwakg4rz4fwcjzbkdr8azqbp9x0hr9k2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -29730,7 +29793,7 @@ self: {
utf8-string x509-system
];
description = "AMQP toolset for the command line";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"amqp-worker" = callPackage
@@ -29857,7 +29920,7 @@ self: {
system-fileio system-filepath text
];
description = "Simple literate programming preprocessor";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"anansi-hscolour" = callPackage
@@ -29872,7 +29935,7 @@ self: {
anansi base bytestring containers hscolour monads-tf text
];
description = "Colorized looms for Anansi";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"anansi-pandoc" = callPackage
@@ -29887,7 +29950,7 @@ self: {
anansi base bytestring containers monads-tf pandoc text
];
description = "Looms which use Pandoc to parse and produce a variety of formats";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -29928,7 +29991,7 @@ self: {
sha256 = "1wn0kap7bw6sp9yi1awcmxh11s5ra4b44qbf97plsvrmpfz15cc5";
libraryHaskellDepends = [ base process ];
description = "Android methods exposed to Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -30028,7 +30091,7 @@ self: {
];
benchmarkHaskellDepends = [ base criterion ];
description = "A small, general-purpose programming language";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -30062,7 +30125,7 @@ self: {
];
testHaskellDepends = [ ansi-terminal-game base hspec parsec ];
description = "text-file based ASCII animator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -30308,19 +30371,6 @@ self: {
}) {};
"ansi-terminal" = callPackage
- ({ mkDerivation, base, colour }:
- mkDerivation {
- pname = "ansi-terminal";
- version = "0.10.3";
- sha256 = "0z5m6ljmdyjyzq0s08rjjdzdj1ry4fz2ni7xlxd86addvwr2wbps";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base colour ];
- description = "Simple ANSI terminal support, with Windows compatibility";
- license = lib.licenses.bsd3;
- }) {};
-
- "ansi-terminal_0_11" = callPackage
({ mkDerivation, base, colour }:
mkDerivation {
pname = "ansi-terminal";
@@ -30331,7 +30381,6 @@ self: {
libraryHaskellDepends = [ base colour ];
description = "Simple ANSI terminal support, with Windows compatibility";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"ansi-terminal-game" = callPackage
@@ -30356,7 +30405,7 @@ self: {
unidecode
];
description = "sdl-like functions for terminal applications, based on ansi-terminal";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -30414,7 +30463,7 @@ self: {
time time-locale-compat yesod yesod-auth
];
description = "A web interface to Antisplice dungeons";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -30465,7 +30514,7 @@ self: {
ironforge mtl network plugins time transformers
];
description = "This is an IRC bot for Mafia and Resistance";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -30832,7 +30881,7 @@ self: {
transformers
];
description = "An engine for text-based dungeons";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -31129,7 +31178,7 @@ self: {
xdg-basedir
];
description = "Server and community browser for the game Tremulous";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -31289,34 +31338,34 @@ self: {
"api-tools" = callPackage
({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base
- , base16-bytestring, base64-bytestring, bytestring, Cabal
- , case-insensitive, cborg, containers, deepseq, happy, lens
- , QuickCheck, regex-compat-tdfa, safe, safecopy, scientific
+ , base16-bytestring, base64-bytestring, bytestring
+ , case-insensitive, cborg, containers, criterion, deepseq, happy
+ , lens, QuickCheck, regex-compat-tdfa, safe, safecopy, scientific
, serialise, tasty, tasty-hunit, tasty-quickcheck, template-haskell
, text, time, unordered-containers, vector
}:
mkDerivation {
pname = "api-tools";
- version = "0.8.0.2";
- sha256 = "0q10vqaf4y3zwa2nrwllxi8ac8ch6jjr4r3s5g6gy51bp04ggzv9";
+ version = "0.9.0.0";
+ sha256 = "04496r4l598i2m14gj1wpz8a976as0gkbw0745h85ap8hy23vfjx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty array attoparsec base base16-bytestring
- base64-bytestring bytestring Cabal case-insensitive cborg
- containers deepseq lens QuickCheck regex-compat-tdfa safe safecopy
- scientific serialise template-haskell text time
- unordered-containers vector
+ base64-bytestring bytestring case-insensitive cborg containers
+ deepseq lens QuickCheck regex-compat-tdfa safe safecopy scientific
+ serialise template-haskell text time unordered-containers vector
];
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [
aeson aeson-pretty base bytestring deepseq QuickCheck serialise
];
testHaskellDepends = [
- aeson aeson-pretty base base64-bytestring bytestring Cabal cborg
+ aeson aeson-pretty base base64-bytestring bytestring cborg
containers QuickCheck safecopy serialise tasty tasty-hunit
tasty-quickcheck template-haskell text time unordered-containers
];
+ benchmarkHaskellDepends = [ base criterion text time ];
description = "DSL for generating API boilerplate and docs";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -31857,7 +31906,7 @@ self: {
base mtl QuickCheck test-framework test-framework-quickcheck2
];
description = "An applicative parser combinator library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -32294,7 +32343,7 @@ self: {
transformers unix utf8-string
];
description = "Automatic Rule-Based Time Tracker";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"arcgrid" = callPackage
@@ -32631,7 +32680,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base directory wx ];
description = "An interpreter for the Argh! programming language in wxHaskell";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -32712,7 +32761,7 @@ self: {
base bimap containers glib gtk HDBC indents mtl parsec
];
description = "A computer assisted argumentation transcription and editing software";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -33087,7 +33136,7 @@ self: {
test-framework-quickcheck2 test-framework-th
];
description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -33492,7 +33541,7 @@ self: {
base random random-shuffle terminfo time
];
description = "ASCII animations for the holidays!";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"ascii-predicates" = callPackage
@@ -33614,7 +33663,7 @@ self: {
split zlib
];
description = "Process Ascii Vectors for Advantest 93k";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -34436,7 +34485,7 @@ self: {
editedCabalFile = "0vh6k6397f3y03y28shx0gf0lvdlb6pdcdhd1j8r1svhjbyphfdp";
libraryHaskellDepends = [ array base containers ghc-prim ];
description = "serialisation for Haskell values with sharing support";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"aterm-utils" = callPackage
@@ -35034,7 +35083,7 @@ self: {
sha256 = "1jf9065pqmdfshkd0cqiamhivs9an4slqx82n7yj0kkhdxw5lyq4";
libraryHaskellDepends = [ attoparsec base bytestring ];
description = "An ARFF file parser using Attoparsec";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"attoparsec-base64" = callPackage
@@ -35299,7 +35348,7 @@ self: {
QuickCheck
];
description = "Variable-length integer decoding for Attoparsec";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"attosplit" = callPackage
@@ -35660,7 +35709,7 @@ self: {
base bytestring colour ghc-prim gloss JuicyPixels random vector
];
description = "Generates and displays patterns from next nearest neighbors cellular automata";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -35856,8 +35905,8 @@ self: {
pname = "avers";
version = "0.0.17.1";
sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
- revision = "39";
- editedCabalFile = "1y77mk83yap8yx5wlybpr06wwy3qvmq0svqc4c6dfyvjd9wjvsdv";
+ revision = "40";
+ editedCabalFile = "0wsr91a87kikvibl18knwkglawl9m96scdyd539zpgh6djbzmsqf";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock containers cryptonite
filepath inflections memory MonadRandom mtl network network-uri
@@ -35875,7 +35924,7 @@ self: {
rethinkdb-client-driver text
];
description = "Server-side implementation of the Avers storage model";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -35943,29 +35992,59 @@ self: {
"aviation-cessna172-diagrams" = callPackage
({ mkDerivation, aviation-cessna172-weight-balance, aviation-units
, aviation-weight-balance, base, colour, diagrams-cairo
- , diagrams-core, diagrams-lib, directory, doctest, filepath
- , hgeometry, lens, mtl, parsec, plots, QuickCheck, quickcheck-text
- , template-haskell
+ , diagrams-core, diagrams-lib, hgeometry, hgeometry-combinatorial
+ , lens, mtl, plots
}:
mkDerivation {
pname = "aviation-cessna172-diagrams";
- version = "0.0.2";
- sha256 = "05z4z953x16d3flvvh9x1q1cskm0ff802jg1digjhg5n0rqmd7fa";
+ version = "0.0.3";
+ sha256 = "1hkb32dsxqrhk788vkb669n9kkan951m4slk2x77zmf52cmk8ljw";
libraryHaskellDepends = [
aviation-cessna172-weight-balance aviation-units
aviation-weight-balance base colour diagrams-cairo diagrams-core
- diagrams-lib hgeometry lens mtl plots
- ];
- testHaskellDepends = [
- base directory doctest filepath parsec QuickCheck quickcheck-text
- template-haskell
+ diagrams-lib hgeometry hgeometry-combinatorial lens mtl plots
];
description = "Diagrams for the Cessna 172 aircraft in aviation";
license = "unknown";
hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {aviation-cessna172-weight-balance = null;
- aviation-units = null; aviation-weight-balance = null;};
+ }) {};
+
+ "aviation-cessna172-weight-balance" = callPackage
+ ({ mkDerivation, aviation-units, aviation-weight-balance, base
+ , lens
+ }:
+ mkDerivation {
+ pname = "aviation-cessna172-weight-balance";
+ version = "0.0.2";
+ sha256 = "1lnj3dr7jkc3c3rvg6knwapjvk7cnxf3901df4xn7mqwg996sdgj";
+ libraryHaskellDepends = [
+ aviation-units aviation-weight-balance base lens
+ ];
+ description = "Weight and Balance for the Cessna 172 aircraft in aviation";
+ license = lib.licenses.bsd3;
+ }) {};
+
+ "aviation-units" = callPackage
+ ({ mkDerivation, base, lens }:
+ mkDerivation {
+ pname = "aviation-units";
+ version = "0.0.2";
+ sha256 = "14m3sbic6zppg8hn1i7b6rd40bw731hz6mr393h897jjlvxygcc2";
+ libraryHaskellDepends = [ base lens ];
+ description = "Units of measurements used in aviation";
+ license = lib.licenses.bsd3;
+ }) {};
+
+ "aviation-weight-balance" = callPackage
+ ({ mkDerivation, aviation-units, base, lens }:
+ mkDerivation {
+ pname = "aviation-weight-balance";
+ version = "0.0.2";
+ sha256 = "1pqkqxdhl1a3pbrmjxz9vl3wjp90kic9vi6bjjr2q9i6six1xbjw";
+ libraryHaskellDepends = [ aviation-units base lens ];
+ description = "Weight and Balance structures used in aviation";
+ license = lib.licenses.bsd3;
+ }) {};
"avl-static" = callPackage
({ mkDerivation, base, QuickCheck, test-framework
@@ -36012,6 +36091,8 @@ self: {
pname = "avro";
version = "0.5.2.0";
sha256 = "1apvqny4dikx5b7yqxs8a4hsxipl5xvz2i3c5bna1faiagxav1i1";
+ revision = "1";
+ editedCabalFile = "0081mnhn26824rbdsz1n74i9m21yfkh6y4g3v7ksh933dxagyiij";
libraryHaskellDepends = [
aeson array base base16-bytestring bifunctors binary bytestring
containers data-binary-ieee754 deepseq fail HasBigDecimal hashable
@@ -36098,7 +36179,7 @@ self: {
sha256 = "0mvfirb41jnjvq4mpky0xpdrh238hjwslfqg82ksnam001sxnpng";
libraryHaskellDepends = [ base ];
description = "A prelude which I can be happy with. Based on base-prelude.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -36115,7 +36196,7 @@ self: {
aeson attoparsec awesomium-raw base containers text vector
];
description = "High-level Awesomium bindings";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -36128,7 +36209,7 @@ self: {
sha256 = "175hgqix2j26579g0rrryl86w7qvla95nvf4lwfxsxxwqgcq3zpd";
libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
description = "Utilities for using Awesomium with GLUT";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -36143,7 +36224,7 @@ self: {
librarySystemDepends = [ awesomium ];
libraryToolDepends = [ c2hs ];
description = "Low-level Awesomium bindings";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {awesomium = null;};
@@ -36590,6 +36671,8 @@ self: {
pname = "aws-lambda-runtime";
version = "0.0.0.1";
sha256 = "1yzqqlgi7yb9b5imh6zfmwbc097bj7r0zi8mkk82c81cv5rcjy08";
+ revision = "1";
+ editedCabalFile = "0gmf698hlxcg241zshn7rl3c2yqkk668inz43xjvahjj4rzqrnjy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -36982,7 +37065,7 @@ self: {
base Diff directory filepath hspec options process unix
];
description = "A simple DevOps tool which will never \"reach\" enterprice level";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -37203,7 +37286,7 @@ self: {
librarySystemDepends = [ babl ];
libraryPkgconfigDepends = [ babl ];
description = "Haskell bindings to BABL library";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {inherit (pkgs) babl;};
"babylon" = callPackage
@@ -37726,7 +37809,7 @@ self: {
];
description = "Create status bar menus for macOS from executables";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-darwin" ];
}) {};
"barchart" = callPackage
@@ -37951,7 +38034,7 @@ self: {
sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263";
libraryHaskellDepends = [ base ];
description = "The IO functions included in base delimited into small, composable classes";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -38030,7 +38113,7 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "base16-bytestring" = callPackage
+ "base16-bytestring_0_1_1_7" = callPackage
({ mkDerivation, base, bytestring, ghc-prim }:
mkDerivation {
pname = "base16-bytestring";
@@ -38042,9 +38125,10 @@ self: {
testHaskellDepends = [ base bytestring ];
description = "Fast base16 (hex) encoding and decoding for ByteStrings";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
}) {};
- "base16-bytestring_1_0_1_0" = callPackage
+ "base16-bytestring" = callPackage
({ mkDerivation, base, bytestring, criterion, deepseq, HUnit
, QuickCheck, test-framework, test-framework-hunit
, test-framework-quickcheck2
@@ -38061,7 +38145,6 @@ self: {
benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
description = "RFC 4648-compliant Base16 encodings for ByteStrings";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"base16-lens" = callPackage
@@ -38863,7 +38946,7 @@ self: {
libraryHaskellDepends = [ base parsec ];
testHaskellDepends = [ base hspec parsec ];
description = "Ability to read, write, and modify BBDB files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"bbi" = callPackage
@@ -38985,7 +39068,7 @@ self: {
persistent-sqlite persistent-template resourcet text time unix
];
description = "Tools for managing a content store of software packages";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) ostree;};
@@ -39023,7 +39106,7 @@ self: {
string-conversions string-qq temporary text time wai warp
];
description = "BDCS API Server";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) libgit2-glib;};
@@ -39458,7 +39541,7 @@ self: {
utf8-string xhtml
];
description = "Bein is a provenance and workflow management system for bioinformatics";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -39566,7 +39649,7 @@ self: {
sha256 = "1zwk05lf76xcdbqrbaid3whmn04injrg7dnlji2v2i5li0pnpr3c";
libraryHaskellDepends = [ base process random time ];
description = "Test the time it takes to run a haskell function";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"benchpress" = callPackage
@@ -40098,7 +40181,7 @@ self: {
uu-parsinglib
];
description = "A parser for the Billboard chord dataset";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -40362,7 +40445,7 @@ self: {
sha256 = "1rb4fpx5hlq661md7nrpgpmi7jjdq3r1ky6q9vxl6f72h085acvl";
libraryHaskellDepends = [ base binary ghc-prim ];
description = "Automatic deriving of Binary using GHC.Generics";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -41052,7 +41135,7 @@ self: {
librarySystemDepends = [ bfd opcodes ];
libraryToolDepends = [ alex happy ];
description = "Bindings for libbfd, a library of the GNU `binutils'";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {bfd = null; opcodes = null;};
@@ -41066,7 +41149,7 @@ self: {
libraryHaskellDepends = [ bindings-DSL ];
librarySystemDepends = [ dttools ];
description = "Bindings to the CCTools WorkQueue C library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {dttools = null;};
@@ -41087,7 +41170,7 @@ self: {
librarySystemDepends = [ codec2 ];
executableHaskellDepends = [ base binary bytestring split ];
description = "Very low-level FFI bindings for Codec2";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {inherit (pkgs) codec2;};
"bindings-common" = callPackage
@@ -41128,7 +41211,9 @@ self: {
libraryPkgconfigDepends = [ directfb ];
description = "Low level bindings to DirectFB";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) directfb;};
"bindings-eskit" = callPackage
@@ -41247,7 +41332,7 @@ self: {
libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
libraryPkgconfigDepends = [ gts ];
description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {inherit (pkgs) gts;};
"bindings-hamlib" = callPackage
@@ -41264,7 +41349,7 @@ self: {
librarySystemDepends = [ hamlib ];
executableHaskellDepends = [ base ];
description = "Hamlib bindings for Haskell";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) hamlib;};
@@ -41455,7 +41540,9 @@ self: {
librarySystemDepends = [ lxc ];
description = "Direct Haskell bindings to LXC (Linux containers) C API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) lxc;};
"bindings-mmap" = callPackage
@@ -41510,7 +41597,7 @@ self: {
base bytestring hspec HUnit QuickCheck quickcheck-io
];
description = "bindings to nettle crypto library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs) nettle;};
"bindings-parport" = callPackage
@@ -41556,7 +41643,7 @@ self: {
libraryHaskellDepends = [ base bindings-DSL ];
librarySystemDepends = [ potrace ];
description = "Low-level bindings to the potrace bitmap tracing library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {inherit (pkgs) potrace;};
"bindings-ppdev" = callPackage
@@ -41589,7 +41676,7 @@ self: {
base cmdargs containers directory filepath process text unix
];
description = "Wrapping saga_cmd";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"bindings-sane" = callPackage
@@ -41601,7 +41688,7 @@ self: {
libraryHaskellDepends = [ base bindings-DSL ];
libraryPkgconfigDepends = [ sane-backends ];
description = "FFI bindings to libsane";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {inherit (pkgs) sane-backends;};
"bindings-sc3" = callPackage
@@ -41719,7 +41806,7 @@ self: {
editedCabalFile = "0mq2h1j1xd52irb35y9j0znxzpk661w3dl4d5a011sln4jd3f663";
libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -41799,8 +41886,8 @@ self: {
}:
mkDerivation {
pname = "binsm";
- version = "0.1.1";
- sha256 = "1wiqslvf21xm15rf161lzffk5zzivbxs9sa9v7d257cx4d9qvy15";
+ version = "0.1.2";
+ sha256 = "1nhdzy3hqqin67i25kgrrcny99lrdr9i6xddr8gjm6b32kqhakhw";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -42030,7 +42117,7 @@ self: {
libraryHaskellDepends = [ array base binary biocore bytestring ];
executableHaskellDepends = [ array base cmdargs mtl ];
description = "Library and executables for working with SFF files";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -42110,7 +42197,7 @@ self: {
lens optparse-generic sparse-linear-algebra text text-show vector
];
description = "Plot a colorful tree";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -42165,7 +42252,7 @@ self: {
base configurator directory filepath mtl selda selda-sqlite text
];
description = "A small tool that clears qutebrowser cookies";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"bisect-binary" = callPackage
@@ -42830,6 +42917,8 @@ self: {
pname = "bits-extra";
version = "0.0.2.0";
sha256 = "1c54008kinzcx93kc8vcp7wq7la662m8nk82ax76i9b0gvbkk21f";
+ revision = "1";
+ editedCabalFile = "1ri4z6zj20qsyyzsrl89sjcm4ir2w6538i6l36a6ffz7f0h0ahng";
libraryHaskellDepends = [ base ghc-prim vector ];
testHaskellDepends = [
base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog
@@ -43206,7 +43295,7 @@ self: {
];
testHaskellDepends = [ base QuickCheck ];
description = "The pirate bay client";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"blacktip" = callPackage
@@ -43796,7 +43885,7 @@ self: {
executableHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
description = "Password entry tool";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"blink1" = callPackage
@@ -44050,7 +44139,7 @@ self: {
text
];
description = "BLOSUM generator";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -44085,7 +44174,7 @@ self: {
base blubber-server bytestring cereal containers gloss network unix
];
description = "The blubber client; connects to the blubber server";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -44108,7 +44197,7 @@ self: {
process random scotty text transformers unix
];
description = "The blubber server, serves blubber clients";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -44294,6 +44383,8 @@ self: {
pname = "board-games";
version = "0.3";
sha256 = "1ylwibyl0j1v0bdrpfnjhdm431npagavxzgi2l5sp0scgpkcyyx7";
+ revision = "1";
+ editedCabalFile = "0rb5bqjg6r8p2v2wfdhivsbgbn55acdjsj6hcy6bv5w50qmg1l6c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -44661,7 +44752,7 @@ self: {
sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs";
libraryHaskellDepends = [ base bytestring HUnit ];
description = "convert numbers to binary coded lists";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"boolean-normal-forms" = callPackage
@@ -44754,7 +44845,7 @@ self: {
base containers descrilo directory filepath simtreelo
];
description = "A bookmarks manager with an HTML generator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"boombox" = callPackage
@@ -44775,13 +44866,15 @@ self: {
}) {};
"boomerang" = callPackage
- ({ mkDerivation, base, mtl, semigroups, template-haskell, text }:
+ ({ mkDerivation, base, mtl, semigroups, template-haskell, text
+ , th-abstraction
+ }:
mkDerivation {
pname = "boomerang";
- version = "1.4.6";
- sha256 = "09angcdqf75f03rh7m02rsqz5rr304dw4c5cszj9alpq4qxlsyqc";
+ version = "1.4.7";
+ sha256 = "0ngrzwvzils6pqdgbc7hj4l41r19j2n82z78fqh312lnc1nni94i";
libraryHaskellDepends = [
- base mtl semigroups template-haskell text
+ base mtl semigroups template-haskell text th-abstraction
];
description = "Library for invertible parsing and printing";
license = lib.licenses.bsd3;
@@ -45204,7 +45297,7 @@ self: {
base containers GLUT hosc hsc3 random
];
description = "audio-visual pseudo-physical simulation of colliding circles";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -45475,7 +45568,7 @@ self: {
warp-tls
];
description = "a url shortener";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -45756,7 +45849,7 @@ self: {
yaml
];
description = "Haskell source code formatter";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"broadcast-chan" = callPackage
@@ -45951,7 +46044,7 @@ self: {
base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
];
description = "Brotli (RFC7932) compression and decompression";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) brotli;};
@@ -46797,7 +46890,7 @@ self: {
testHaskellDepends = [ base ];
benchmarkHaskellDepends = [ base criterion ];
description = "Burst detection algorithms";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -46969,11 +47062,41 @@ self: {
base bytestring gl-capture GLUT OpenGLRaw repa repa-devil
];
description = "butterfly tilings";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
+ "buttplug-hs-core" = callPackage
+ ({ mkDerivation, aeson, aeson-casing, aeson-pretty, async, base
+ , bytestring, connection, containers, generic-random, hspec
+ , network, QuickCheck, quickcheck-instances, raw-strings-qq, text
+ , unordered-containers, websockets, wuss
+ }:
+ mkDerivation {
+ pname = "buttplug-hs-core";
+ version = "0.1.0.0";
+ sha256 = "0ayii1hq6p4qnjvyfpv2776ikjh0q4ymxm0lk8q73vk1j6kq1j3y";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-casing base bytestring connection containers network
+ text unordered-containers websockets wuss
+ ];
+ executableHaskellDepends = [
+ aeson aeson-casing async base bytestring connection containers
+ network text unordered-containers websockets wuss
+ ];
+ testHaskellDepends = [
+ aeson aeson-casing aeson-pretty base bytestring connection
+ containers generic-random hspec network QuickCheck
+ quickcheck-instances raw-strings-qq text unordered-containers
+ websockets wuss
+ ];
+ description = "Client library for buttplug.io";
+ license = lib.licenses.bsd3;
+ }) {};
+
"bv" = callPackage
({ mkDerivation, base, ghc-prim, integer-gmp }:
mkDerivation {
@@ -47384,7 +47507,7 @@ self: {
attoparsec attoparsec-varword base bytestring hspec QuickCheck
];
description = "Variable-length integer encoding";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -48056,7 +48179,7 @@ self: {
base HUnit test-framework test-framework-hunit test-framework-th
];
description = "Translate C code into ATS";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -48082,7 +48205,7 @@ self: {
transformers
];
description = "C->Haskell FFI tool that gives some cross-language type safety";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"c2hs-extra" = callPackage
@@ -48196,7 +48319,7 @@ self: {
sha256 = "0hyjb8y4zf7qccyzsms98sd0kgz83q1aqfhgx2f3dq1nprhbg9ld";
libraryHaskellDepends = [ base Cabal filepath ];
description = "Cabal support for creating AppImage applications";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -48298,8 +48421,8 @@ self: {
}:
mkDerivation {
pname = "cabal-cache";
- version = "1.0.2.1";
- sha256 = "0n17ga3namkldd4mfjla58nlg0j7dyjcamap84bdwiglmrg0iwz4";
+ version = "1.0.3.0";
+ sha256 = "0xx0a53z7wj75p8dqypr6ys63cpw8acl49358f42xi5lgblvqnca";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -48796,6 +48919,8 @@ self: {
pname = "cabal-install-parsers";
version = "0.4.1";
sha256 = "1djw4l0z8nsaby2qcm08kvn2p1c35ynzdg25vc815dx2wpw38bh3";
+ revision = "1";
+ editedCabalFile = "1fhjz4hji57sg00nb8jchvm8b13wn9pknnycgcclvxa3s72rqsf5";
libraryHaskellDepends = [
aeson base base16-bytestring binary binary-instances bytestring
Cabal containers cryptohash-sha256 deepseq directory filepath lukko
@@ -48996,7 +49121,7 @@ self: {
simple-cabal simple-cmd simple-cmd-args time unix
];
description = "RPM packaging tool for Haskell Cabal-based packages";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"cabal-scripts" = callPackage
@@ -49274,8 +49399,8 @@ self: {
}:
mkDerivation {
pname = "cabal2nix";
- version = "2.16.0";
- sha256 = "0kxxn218r1r9fia72zv8xzb8yji5y2jbwzqz033ljvwbm3abxp2k";
+ version = "2.17.0";
+ sha256 = "0y91agkhgpzzaf9l7l1h7x516iryj8z2vk1in1h7pyjlxaiak6lm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -49320,7 +49445,7 @@ self: {
];
testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
description = "Convert Cabal files into rpm spec files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ peti ];
}) {};
@@ -50028,7 +50153,7 @@ self: {
base containers gtk parsec plot-gtk-ui QuickCheck
];
description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -50069,7 +50194,7 @@ self: {
base containers cpphs lens mtl parsec transformers
];
description = "a logic programming language based on the calculus of constructions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -50551,21 +50676,22 @@ self: {
"capability" = callPackage
({ mkDerivation, base, constraints, containers, dlist, exceptions
, generic-lens, hspec, lens, monad-control, monad-unlift, mtl
- , mutable-containers, primitive, safe-exceptions, silently
- , streaming, temporary, text, transformers, unliftio, unliftio-core
+ , mutable-containers, primitive, reflection, safe-exceptions
+ , silently, streaming, temporary, text, transformers, unliftio
+ , unliftio-core
}:
mkDerivation {
pname = "capability";
- version = "0.3.0.0";
- sha256 = "1kha2y1x63af43psl708c0iib0ign4jrs2n4s2jl4a0pb7hlcdcz";
+ version = "0.4.0.0";
+ sha256 = "02dnvzfvn81k15qp41fqd3pk4izg8rfbj7d5f6ry0wfa8d8payq0";
libraryHaskellDepends = [
base constraints dlist exceptions generic-lens lens monad-control
- monad-unlift mtl mutable-containers primitive safe-exceptions
- streaming transformers unliftio unliftio-core
+ monad-unlift mtl mutable-containers primitive reflection
+ safe-exceptions streaming transformers unliftio unliftio-core
];
testHaskellDepends = [
- base containers hspec lens mtl silently streaming temporary text
- unliftio
+ base containers dlist hspec lens mtl silently streaming temporary
+ text unliftio
];
description = "Extensional capabilities and deriving combinators";
license = lib.licenses.bsd3;
@@ -50665,6 +50791,22 @@ self: {
broken = true;
}) {};
+ "caps" = callPackage
+ ({ mkDerivation, base, mtl, tasty, tasty-hunit, template-haskell
+ , transformers, typerep-map
+ }:
+ mkDerivation {
+ pname = "caps";
+ version = "0.1";
+ sha256 = "0i6rzgfbl377g4z76rv48c6a1s4yy9h78bjmvkr2vhq5zv8zqzkk";
+ libraryHaskellDepends = [
+ base template-haskell transformers typerep-map
+ ];
+ testHaskellDepends = [ base mtl tasty tasty-hunit ];
+ description = "Monadic capabilities with late binding";
+ license = lib.licenses.bsd3;
+ }) {};
+
"car-pool" = callPackage
({ mkDerivation, base, blaze-html, containers, digestive-functors
, digestive-functors-blaze, digestive-functors-happstack
@@ -50826,7 +50968,7 @@ self: {
highlighting-kate mtl pandoc pango process text time
];
description = "A presentation tool written with Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -50863,7 +51005,7 @@ self: {
time transformers tuple
];
description = "Carte: A commandline pastebin server";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -51003,24 +51145,6 @@ self: {
}) {};
"casa-types" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
- , bytestring, hashable, path-pieces, persistent, text
- }:
- mkDerivation {
- pname = "casa-types";
- version = "0.0.1";
- sha256 = "0f8c4a43rh6zr5cwingxyjfpisipy4x4xc0lpasfjaj4vhjgwqkp";
- revision = "1";
- editedCabalFile = "101hhpwc7nhg2laywv2jnqa3jsjkvbvc30i6cs4srvdv2n87jlcb";
- libraryHaskellDepends = [
- aeson attoparsec base base16-bytestring bytestring hashable
- path-pieces persistent text
- ];
- description = "Types for Casa";
- license = lib.licenses.bsd3;
- }) {};
-
- "casa-types_0_0_2" = callPackage
({ mkDerivation, aeson, attoparsec, base, base16-bytestring
, bytestring, hashable, path-pieces, persistent, text
}:
@@ -51034,7 +51158,6 @@ self: {
];
description = "Types for Casa";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"casadi-bindings" = callPackage
@@ -51058,7 +51181,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 vector
];
description = "mid-level bindings to CasADi";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {casadi = null;};
@@ -51076,7 +51199,7 @@ self: {
];
libraryPkgconfigDepends = [ casadi_control ];
description = "low level bindings to casadi-control";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {casadi_control = null;};
@@ -51094,7 +51217,7 @@ self: {
];
librarySystemDepends = [ casadi ];
description = "autogenerated low level bindings to casadi";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {casadi = null;};
@@ -51108,7 +51231,7 @@ self: {
libraryHaskellDepends = [ base containers vector ];
librarySystemDepends = [ casadi ];
description = "low level bindings to CasADi";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {casadi = null;};
@@ -51126,7 +51249,7 @@ self: {
];
libraryPkgconfigDepends = [ casadi_ipopt_interface ];
description = "low level bindings to casadi-ipopt_interface";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {casadi_ipopt_interface = null;};
@@ -51144,7 +51267,7 @@ self: {
];
libraryPkgconfigDepends = [ casadi_snopt_interface ];
description = "low level bindings to casadi-snopt_interface";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {casadi_snopt_interface = null;};
@@ -52169,7 +52292,7 @@ self: {
];
librarySystemDepends = [ dttools ];
description = "High-level interface to CCTools' WorkQueue library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {dttools = null;};
@@ -52411,7 +52534,7 @@ self: {
sha256 = "04mlg1r2qvrwdzcfbf1aqs4bf9n2gc7cwv73fbhld2ji5naa6fwb";
libraryHaskellDepends = [ base cereal ghc-prim ];
description = "Automatic deriving of Serialize using GHC.Generics";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -52711,7 +52834,7 @@ self: {
unordered-containers utf8-string void
];
description = "Parser for categorial grammars";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -52803,7 +52926,7 @@ self: {
unordered-containers utf8-string yaml
];
description = "Command line tool";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -52817,7 +52940,7 @@ self: {
libraryHaskellDepends = [ base containers JuicyPixels ];
testHaskellDepends = [ base containers hspec JuicyPixels ];
description = "Library decoding chain codes from images";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"chainweb-mining-client" = callPackage
@@ -53345,8 +53468,6 @@ self: {
];
description = "A library of simple NLP algorithms";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"chatty" = callPackage
@@ -53363,7 +53484,7 @@ self: {
template-haskell text time transformers unix
];
description = "Some monad transformers and typeclasses for text in- and output abstraction";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"chatty-text" = callPackage
@@ -53376,7 +53497,7 @@ self: {
editedCabalFile = "11vpzarrbk0jlsnamrnf4xp3gzkgwrbs6x5mr9m5rr4lrw1f9q0v";
libraryHaskellDepends = [ base chatty transformers ];
description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -53389,7 +53510,7 @@ self: {
sha256 = "1pzg0bf73shwl91x4011khw62wgv33y5862gq110q8g913w4jrjw";
libraryHaskellDepends = [ base mtl text transformers ];
description = "Some utilities every serious chatty-based application may need";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"chatwork" = callPackage
@@ -53589,7 +53710,7 @@ self: {
QuickCheck quickcheck-text temporary text
];
description = "Generate checklists relevant to a given patch";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -54327,7 +54448,7 @@ self: {
executableHaskellDepends = [ base binary bytestring text ];
testHaskellDepends = [ base binary bytestring HUnit text ];
description = "Human-readable storage of text/binary objects";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -54422,7 +54543,7 @@ self: {
uuid wreq
];
description = "Cielo API v3 Bindings for Haskell";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -54457,7 +54578,7 @@ self: {
executableHaskellDepends = [ base bytestring groom text ];
testHaskellDepends = [ base hspec ];
description = "Simple C-like programming language";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"cinvoke" = callPackage
@@ -54827,8 +54948,8 @@ self: {
}:
mkDerivation {
pname = "citeproc";
- version = "0.3.0.8";
- sha256 = "0njlb37cxnpikwz9k92d689j477fz9x7chl58s3ljsw9drcgpcvh";
+ version = "0.3.0.9";
+ sha256 = "0ky4j6nbn6yp3mny1m045n40jfvbr1iiylcf51hsi228y4m5za9s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -54881,7 +55002,7 @@ self: {
pandoc pandoc-types parsec tagsoup texmath utf8-string yaml
];
description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -55002,7 +55123,7 @@ self: {
split
];
description = "Simple CLI RPN calculator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -55603,7 +55724,7 @@ self: {
base lifted-base monad-control parallel resourcet transformers
];
description = "Fork of the monad-parallel package using monad-control";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -56555,7 +56676,7 @@ self: {
];
libraryPkgconfigDepends = [ QtCore ];
description = "timer functionality to clock IO commands";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {QtCore = null;};
@@ -56884,7 +57005,7 @@ self: {
sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc";
libraryHaskellDepends = [ base containers tree-fun ];
description = "Calculate the clumpiness of leaf properties in a tree";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"cluss" = callPackage
@@ -57367,7 +57488,7 @@ self: {
parsec StockholmAlignment template-haskell text vector
];
description = "Detailed visualization of CMs, HMMs and their comparisions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -57750,7 +57871,7 @@ self: {
HUnit parsec pretty text
];
description = "A library for manipulating RPM files";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -58254,7 +58375,7 @@ self: {
base bytestring cassava containers lens optparse-generic split
];
description = "Collapse the duplication output into clones and return their frequencies";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -58543,7 +58664,7 @@ self: {
linear linearmap-category manifolds semigroups vector-space
];
description = "Instances of the manifold-classes for colour types";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -58861,21 +58982,22 @@ self: {
"comfort-array" = callPackage
({ mkDerivation, base, ChasingBottoms, containers, deepseq
- , guarded-allocation, non-empty, prelude-compat, primitive
- , QuickCheck, semigroups, storable-record, tagged, transformers
- , utility-ht
+ , doctest-exitcode-stdio, doctest-lib, guarded-allocation
+ , non-empty, prelude-compat, primitive, QuickCheck, semigroups
+ , storable-record, tagged, transformers, utility-ht
}:
mkDerivation {
pname = "comfort-array";
- version = "0.4";
- sha256 = "0jvksvvslvg5wiqin5pd0q0q8a7snhfjh26a98mdakk8dziw1p1m";
+ version = "0.4.1";
+ sha256 = "11nsq6yc3sz259nn9vks49rxq5zzrfwqn9fvi10w3vbnq3wjg9i5";
libraryHaskellDepends = [
base containers deepseq guarded-allocation non-empty prelude-compat
primitive QuickCheck semigroups storable-record tagged transformers
utility-ht
];
testHaskellDepends = [
- base ChasingBottoms containers QuickCheck tagged
+ base ChasingBottoms containers doctest-exitcode-stdio doctest-lib
+ QuickCheck tagged
];
description = "Arrays where the index type is a function of the shape type";
license = lib.licenses.bsd3;
@@ -59622,7 +59744,7 @@ self: {
sha256 = "0a1pp1jafra1agsx2jizdb33afzg02w6jh4a4pyw5w71kzqfrril";
libraryHaskellDepends = [ base MissingH ];
description = "Haskell functionality for quickly assembling simple compilers";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -59739,8 +59861,8 @@ self: {
}:
mkDerivation {
pname = "composable-associations-aeson";
- version = "0.1.0.0";
- sha256 = "0kragi8wfd30yxrndxka5p3bivj1qi8svljcdkqnji32dpnm9myv";
+ version = "0.1.0.1";
+ sha256 = "0fpjirwk9si1v8jsdrcxbwn3rqc058na9z5lhbnkha2zc6l8w8rw";
libraryHaskellDepends = [
aeson base composable-associations text unordered-containers
];
@@ -60507,8 +60629,8 @@ self: {
}:
mkDerivation {
pname = "concurrency";
- version = "1.11.0.0";
- sha256 = "19a4za0c65gi2a5n882nyi26cgxrsry64rkd3qiqhvzf7m34cjxd";
+ version = "1.11.0.1";
+ sha256 = "0ds55wpkxlrw2x5ql34p9b05xlycnc4v7962f27a54nhrjfhb2ah";
libraryHaskellDepends = [
array atomic-primops base exceptions monad-control mtl stm
transformers
@@ -60854,7 +60976,7 @@ self: {
sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp";
libraryHaskellDepends = [ array base containers random stm time ];
description = "a library for live coding and real-time musical applications";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -60867,7 +60989,7 @@ self: {
sha256 = "1plml14h5d31jr3bvjjgaxcdqssxqfwwnbz9c5gvjlds6lla145p";
doHaddock = false;
description = "a library for displaying musical time in a terminal-based clock";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"conductive-hsc3" = callPackage
@@ -60883,7 +61005,7 @@ self: {
hosc hsc3 random
];
description = "a library with examples of using Conductive with hsc3";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -60896,7 +61018,7 @@ self: {
sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi";
libraryHaskellDepends = [ base conductive-base random ];
description = "a library of functions which are useful for composing music";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -61450,6 +61572,8 @@ self: {
pname = "conferer";
version = "1.1.0.0";
sha256 = "1hkdrqxrac1mbzvd29f6ds4cbihdv0j0daai7yc282myv0varh09";
+ revision = "1";
+ editedCabalFile = "0xr6910zn9j07gwc9f9dmlgxiagirmpzjzb9vlaqc0qvpawgq201";
libraryHaskellDepends = [
base bytestring containers directory filepath text
];
@@ -61467,10 +61591,8 @@ self: {
}:
mkDerivation {
pname = "conferer-aeson";
- version = "1.1.0.0";
- sha256 = "0kslxj2wcycygj07x7v06fcx2i47dwp96da9djws6mjdmr1a9i96";
- revision = "1";
- editedCabalFile = "1ic6nichx1c3s7fnr2q90hzm1qykg8rkqfwl2k5yhhwb1fdnhb6q";
+ version = "1.1.0.1";
+ sha256 = "1slz2gbnaca8ydl91rjhpjair90qnybcg6zkxdjrwr9jnxsp95s7";
libraryHaskellDepends = [
aeson base bytestring conferer directory text unordered-containers
vector
@@ -61801,7 +61923,7 @@ self: {
text time unordered-containers
];
description = "Configuration management";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"config-parser" = callPackage
@@ -61850,7 +61972,7 @@ self: {
base directory filepath unix vty-menu
];
description = "A small program for swapping out dot files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -61912,7 +62034,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "parser for config files, shell variables, command line args";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -62206,8 +62328,8 @@ self: {
({ mkDerivation, base, containers, doctest, hedgehog }:
mkDerivation {
pname = "connections";
- version = "0.2.0";
- sha256 = "1hvfqdjcj4mp2iyx0596710z4f8fm0jlgp819xf2s90rz1b360ya";
+ version = "0.3.0";
+ sha256 = "0ias6f5nzd83i2x6823ypzp598d8rgp74wmhd4gk7slcyszgpj6l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers ];
@@ -62265,7 +62387,7 @@ self: {
sha256 = "07s4p41hjsalbaayxq2j973f3wnk8d7aybvl84fww7sz6mj7kvhw";
libraryHaskellDepends = [ base ];
description = "console user prompts";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"console-style" = callPackage
@@ -62340,7 +62462,7 @@ self: {
base contravariant fail semigroups tagged trivial-constraint void
];
description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -62848,7 +62970,7 @@ self: {
hspec memory mtl resourcet temporary
];
description = "Store and retrieve data from an on-disk store";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -63568,7 +63690,7 @@ self: {
pipes-bytestring pipes-csv text vector
];
description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -64645,7 +64767,7 @@ self: {
testHaskellDepends = [ base text ];
testPkgconfigDepends = [ python3 ];
description = "Bindings for libpython";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) python3;};
@@ -64896,7 +65018,7 @@ self: {
base cmdargs directory process shelly text transformers unix
];
description = "Code review tool";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -65590,7 +65712,7 @@ self: {
mersenne-random-pure64 mtl parallel
];
description = "An offline renderer supporting ray tracing and photon mapping";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -66405,28 +66527,6 @@ self: {
}) {};
"cryptonite" = callPackage
- ({ mkDerivation, base, basement, bytestring, deepseq, gauge
- , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
- , tasty-kat, tasty-quickcheck
- }:
- mkDerivation {
- pname = "cryptonite";
- version = "0.27";
- sha256 = "1c68wvn2b49gijq9day2bzi0axcbdz41ip3j0wdahdhcjfl4a9y8";
- libraryHaskellDepends = [
- base basement bytestring deepseq ghc-prim integer-gmp memory
- ];
- testHaskellDepends = [
- base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base bytestring deepseq gauge memory random
- ];
- description = "Cryptography Primitives sink";
- license = lib.licenses.bsd3;
- }) {};
-
- "cryptonite_0_28" = callPackage
({ mkDerivation, base, basement, bytestring, deepseq, gauge
, ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
, tasty-kat, tasty-quickcheck
@@ -66446,7 +66546,6 @@ self: {
];
description = "Cryptography Primitives sink";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"cryptonite-conduit" = callPackage
@@ -66531,7 +66630,7 @@ self: {
unordered-containers vector
];
description = "Bindings for Cryptsy cryptocurrency exchange API";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -66999,7 +67098,7 @@ self: {
libraryHaskellDepends = [ array base chatty-text chatty-utils ];
executableHaskellDepends = [ array base chatty-text chatty-utils ];
description = "A programming language for text modification";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -67817,7 +67916,7 @@ self: {
allocated-processor base HOpenCV vector-space
];
description = "Functional Combinators for Computer Vision";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -67848,7 +67947,7 @@ self: {
test-framework-quickcheck2 test-framework-smallcheck
];
description = "A subfield of the complex numbers for exact calculation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"cypher" = callPackage
@@ -67945,7 +68044,7 @@ self: {
executableHaskellDepends = [ base c-storable-deriving vect Win32 ];
description = "A raw binding for the directX 11";
license = lib.licenses.mit;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {D3DCompiler = null; d3d11 = null; d3dx11 = null;
d3dxof = null; dxgi = null; dxguid = null;};
@@ -67971,7 +68070,7 @@ self: {
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base directory unix ];
description = "Start background daemons by double-forking";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"daemons" = callPackage
@@ -67999,7 +68098,7 @@ self: {
test-framework-hunit unix
];
description = "Daemons in Haskell made fun and easy";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"dag" = callPackage
@@ -68091,7 +68190,7 @@ self: {
utf8-string
];
description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -68435,7 +68534,7 @@ self: {
base binary bytestring criterion transformers
];
description = "Utility and parser for DarkPlaces demo files";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -68453,7 +68552,7 @@ self: {
];
testHaskellDepends = [ base bytestring hspec hspec-core ];
description = "Darkplaces rcon client library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -68484,7 +68583,7 @@ self: {
text
];
description = "Darplaces rcon utility";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -68503,7 +68602,7 @@ self: {
libraryToolDepends = [ alex ];
testHaskellDepends = [ base bytestring hspec QuickCheck ];
description = "Parser for darkplaces colorful text";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -68525,7 +68624,7 @@ self: {
text transformers
];
description = "Convert package Haddock to Dash docsets (IDE docs)";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -69090,7 +69189,7 @@ self: {
test-framework-quickcheck2 vector
];
description = "Space-efficient and privacy-preserving data dispersal algorithms";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -69479,19 +69578,21 @@ self: {
"data-interval" = callPackage
({ mkDerivation, base, ChasingBottoms, containers, deepseq
- , extended-reals, hashable, HUnit, lattices, QuickCheck, syb, tasty
- , tasty-hunit, tasty-quickcheck, tasty-th
+ , extended-reals, hashable, HUnit, lattices, QuickCheck
+ , quickcheck-classes-base, syb, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-th
}:
mkDerivation {
pname = "data-interval";
- version = "2.0.1";
- sha256 = "0vz73vwbr484s0dxg9y0y1mfbni8aky3hyh93pmzb8zb67gy4cak";
+ version = "2.1.0";
+ sha256 = "0f4dgpqmp4y9fidlb3z5dlcmv0qb6pqbxbf57jjjz49r7g6adzlq";
libraryHaskellDepends = [
base containers deepseq extended-reals hashable lattices
];
testHaskellDepends = [
base ChasingBottoms containers deepseq hashable HUnit lattices
- QuickCheck syb tasty tasty-hunit tasty-quickcheck tasty-th
+ QuickCheck quickcheck-classes-base syb tasty tasty-hunit
+ tasty-quickcheck tasty-th
];
description = "Interval datatype, interval arithmetic and interval-based containers";
license = lib.licenses.bsd3;
@@ -69657,7 +69758,7 @@ self: {
sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8";
libraryHaskellDepends = [ base ];
description = "Utilities for working with sequences within lists";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"data-list-zigzag" = callPackage
@@ -71025,7 +71126,7 @@ self: {
base containers dbus-core monads-tf text transformers
];
description = "Monadic and object-oriented interfaces to DBus";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -71044,7 +71145,7 @@ self: {
network parsec text unix vector xml-types
];
description = "Low-level D-Bus protocol implementation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -71184,7 +71285,7 @@ self: {
sha256 = "1mw0qn7c6ag2w6gn6pwpjf979m3p5v3p9a1kal2x8g8ncx98dcn5";
libraryHaskellDepends = [ base dates time ];
description = "Discordian Date Types for Haskell";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -71703,7 +71804,7 @@ self: {
wai-websockets warp websockets
];
description = "secure remote debugging";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -71847,7 +71948,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -72276,8 +72377,8 @@ self: {
}:
mkDerivation {
pname = "dejafu";
- version = "2.4.0.1";
- sha256 = "0zysf0hjfdd5iypllbiyih312kl2hsfwiqf6030i7q432yc3f8vd";
+ version = "2.4.0.2";
+ sha256 = "1hwhyxjjwapk6jgsbs0vh033xbc9b8mr5iqd93vskvvljnb40v9h";
libraryHaskellDepends = [
base concurrency containers contravariant deepseq exceptions
leancheck profunctors random transformers
@@ -72423,7 +72524,7 @@ self: {
];
testHaskellDepends = [ base directory filepath hspec ];
description = "A library for detecting file changes";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -72969,7 +73070,7 @@ self: {
sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp";
libraryHaskellDepends = [ base data-default ];
description = "Generic instances for enumerating complex data types";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -73220,7 +73321,7 @@ self: {
sha256 = "00rk7m54igmrsi8j2fmql7c5wgyg7x5ws8397753470x5k2qv2ap";
libraryHaskellDepends = [ base ];
description = "Loads a list of items with fields";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"descript-lang" = callPackage
@@ -73254,7 +73355,7 @@ self: {
transformers yaml
];
description = "Library, interpreter, and CLI for Descript programming language";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -74093,7 +74194,7 @@ self: {
tasty-hunit text
];
description = "Convert between Dhall and YAML";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"dhcp-lease-parser" = callPackage
@@ -74919,7 +75020,7 @@ self: {
test-framework-quickcheck2 transformers
];
description = "Cryptographically secure n-sided dice via rejection sampling";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {};
"dice2tex" = callPackage
@@ -74932,7 +75033,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "Convert a Diceware wordlist into a printer-ready LaTeX file";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -74947,7 +75048,7 @@ self: {
base binary bytestring pretty safe time
];
description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -75068,7 +75169,7 @@ self: {
libraryHaskellDepends = [ attoparsec base text ];
testHaskellDepends = [ attoparsec base hspec text ];
description = "A parser for diff file formats";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"diff3" = callPackage
@@ -75180,7 +75281,7 @@ self: {
text-show vector
];
description = "Finds out whether an entity comes from different distributions (statuses)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -75352,7 +75453,7 @@ self: {
tasty-hunit text
];
description = "Run digestive-functors forms against JSON";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -75550,7 +75651,7 @@ self: {
base FontyFruity JuicyPixels Rasterific vector
];
description = "ASCII based Diagram drawing in Haskell (Idea based on ditaa)";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"dijkstra-simple" = callPackage
@@ -75725,8 +75826,8 @@ self: {
}:
mkDerivation {
pname = "diohsc";
- version = "0.1.3.1";
- sha256 = "1k44bi5ri63qsps0vh24qc32bclp3nqp2qbs6ylxm9k0q76758iw";
+ version = "0.1.4";
+ sha256 = "09hxy5ac39iqps1bfd1xrwcz9rckywpi99fpx7ikr1lpnvnc5bfb";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -75737,7 +75838,7 @@ self: {
unix x509 x509-store x509-validation
];
description = "Gemini client";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"diophantine" = callPackage
@@ -75749,7 +75850,7 @@ self: {
libraryHaskellDepends = [ array base ];
libraryToolDepends = [ happy ];
description = "A quadratic diophantine equation solving library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -76048,7 +76149,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base directory ];
description = "Deletes a directory and retains its contents in the parent directory";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -76169,7 +76270,7 @@ self: {
sha256 = "0axz9k5j9yfk58icnycr93b6d5fqylgqlxi8v7w5sv1n28hrpvvj";
libraryHaskellDepends = [ base containers ];
description = "DisCoCat implementation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"discord-gateway" = callPackage
@@ -76539,7 +76640,7 @@ self: {
libraryHaskellDepends = [ base Cabal directory filepath process ];
doHaddock = false;
description = "Generate/Upload cabal package to Hackage";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -77206,8 +77307,8 @@ self: {
}:
mkDerivation {
pname = "distribution-nixpkgs";
- version = "1.4.0";
- sha256 = "1935lg05bfzwrvppi11r05nhwa1gkmvv0xqv1kqkbc87bk6pvp5g";
+ version = "1.5.0";
+ sha256 = "07z1dkyzz9sabxda48cy6y2pfyq14sz2m9bv6y6dajn15cy7m3pk";
libraryHaskellDepends = [
aeson base bytestring Cabal containers deepseq language-nix lens
pretty process split
@@ -77315,7 +77416,7 @@ self: {
base containers fasta optparse-applicative pipes semigroups
];
description = "Quantify the diversity of a population";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -77451,7 +77552,7 @@ self: {
time unix xdg-userdirs
];
description = "Fedora image download tool";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -77937,7 +78038,7 @@ self: {
text
];
description = "Checks Haddock comments for pitfalls and version changes";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -78095,8 +78196,8 @@ self: {
}:
mkDerivation {
pname = "doclayout";
- version = "0.3";
- sha256 = "1wmnwq28jcyd6c80srivsnd5znmyl9sgmwwnlk2crwiiwqadbal7";
+ version = "0.3.0.2";
+ sha256 = "1hfqagf5rmdjjx3xzx153d769b2vwarmyx7k7cwh872cgasndb3q";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base mtl safe text ];
testHaskellDepends = [
@@ -78327,6 +78428,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "doctest-extract" = callPackage
+ ({ mkDerivation, base, doctest-lib, non-empty, optparse-applicative
+ , pathtype, semigroups, transformers, utility-ht
+ }:
+ mkDerivation {
+ pname = "doctest-extract";
+ version = "0.1";
+ sha256 = "1ncrq67d6zcqw5al5m2g7q6ys8rxhsq8rrzbj1dlsyl4q63vyrms";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base doctest-lib non-empty optparse-applicative pathtype semigroups
+ transformers utility-ht
+ ];
+ description = "Alternative doctest implementation that extracts comments to modules";
+ license = lib.licenses.bsd3;
+ }) {};
+
"doctest-lib" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -79088,7 +79207,7 @@ self: {
sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l";
libraryHaskellDepends = [ base ];
description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -79289,7 +79408,7 @@ self: {
testSystemDepends = [ dpkg ];
testPkgconfigDepends = [ libdpkg ];
description = "libdpkg bindings";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) dpkg; libdpkg = null;};
@@ -79411,7 +79530,7 @@ self: {
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers hspec QuickCheck ];
description = "A port of asciimoo's drawille to haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -79749,7 +79868,7 @@ self: {
sha256 = "1vv32n736ncjsy4psp8zlqmpp0r7mncjq65zwkhq5i99jx4chb1q";
libraryHaskellDepends = [ base parsec ];
description = "Haskell Doge Serialized Object Notation Parser";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -80084,7 +80203,7 @@ self: {
];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "A computer “algebra” system that knows nothing about algebra, at the core";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -80233,8 +80352,8 @@ self: {
}:
mkDerivation {
pname = "duration";
- version = "0.1.0.0";
- sha256 = "18qjn97njhra7brps58rl44vyc0hmfc83prgm519q7dyf3159cd0";
+ version = "0.2.0.0";
+ sha256 = "1cmgbnri3083gpr16j8yqj5jzbz0q5cxgnrpnbridyyznbp8csvj";
libraryHaskellDepends = [ base parsec template-haskell time ];
testHaskellDepends = [
base doctest hspec parsec template-haskell time
@@ -80319,7 +80438,7 @@ self: {
libraryPkgconfigDepends = [ dvdread ];
libraryToolDepends = [ c2hs ];
description = "A monadic interface to libdvdread";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {dvdread = null;};
@@ -80420,7 +80539,7 @@ self: {
libraryHaskellDepends = [ base Win32 ];
description = "Backend for a binding to the Microsoft DirectX 9 API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"dx9d3d" = callPackage
@@ -80433,7 +80552,7 @@ self: {
librarySystemDepends = [ d3d9 ];
description = "A binding to the Microsoft DirectX 9 API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {d3d9 = null;};
"dx9d3dx" = callPackage
@@ -80446,7 +80565,7 @@ self: {
librarySystemDepends = [ d3dx9 ];
description = "A binding to the Microsoft DirectX 9 D3DX API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {d3dx9 = null;};
"dyckword" = callPackage
@@ -80649,7 +80768,7 @@ self: {
vector-space
];
description = "Interactive diagram windows";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -80688,7 +80807,7 @@ self: {
base binary bytestring hashable unordered-containers
];
description = "Optionally serializable dynamic state keyed by type";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"dynamodb-simple" = callPackage
@@ -80762,7 +80881,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 vector
];
description = "your dynamic optimization buddy";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -80783,6 +80902,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "dyre_0_9_1" = callPackage
+ ({ mkDerivation, base, binary, directory, executable-path, filepath
+ , io-storage, process, time, unix, xdg-basedir
+ }:
+ mkDerivation {
+ pname = "dyre";
+ version = "0.9.1";
+ sha256 = "1lrpjvah57p1ld3spcrgqds3claqkd5a9ay8inihl9wws0ifhfmh";
+ libraryHaskellDepends = [
+ base binary directory executable-path filepath io-storage process
+ time unix xdg-basedir
+ ];
+ testHaskellDepends = [ base directory process ];
+ description = "Dynamic reconfiguration in Haskell";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"dywapitchtrack" = callPackage
({ mkDerivation, base, bytestring, transformers }:
mkDerivation {
@@ -80980,7 +81117,7 @@ self: {
libraryHaskellDepends = [ base hspec ];
testHaskellDepends = [ base hspec ];
description = "Parses command line arguments";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"easy-bitcoin" = callPackage
@@ -81051,7 +81188,7 @@ self: {
sha256 = "0vj9j41706lalxc2sankpnxrn3mg650wfd4rl6yw32pns6bdq86f";
libraryHaskellDepends = [ base bytestring containers mtl zlib ];
description = "User-friendly creation of EPS, PostScript, and PDF files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"easytensor" = callPackage
@@ -81426,7 +81563,7 @@ self: {
ghc-events-parallel gtk mtl text zip-archive
];
description = "A Tool to Visualize Parallel Functional Program Executions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -81457,7 +81594,7 @@ self: {
ALUT base cmdtheline containers gloss OpenAL random wraparound
];
description = "Top view space combat arcade game";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -82028,7 +82165,7 @@ self: {
];
librarySystemDepends = [ eibclient ];
description = "EIBd Client";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {eibclient = null;};
@@ -82449,7 +82586,7 @@ self: {
sha256 = "1am1j05z79prlybq3hg8vr4gwhl354af4dg9y1qr57vpp6gcpfwv";
libraryHaskellDepends = [ base hmatrix safe ];
description = "Find the elbow point";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"electrum-mnemonic" = callPackage
@@ -82461,7 +82598,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base tasty tasty-quickcheck ];
description = "easy to remember mnemonic for a high-entropy value";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"elenco-albero" = callPackage
@@ -82562,6 +82699,25 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "eliminators_0_8" = callPackage
+ ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
+ , singletons-base, template-haskell, th-abstraction, th-desugar
+ }:
+ mkDerivation {
+ pname = "eliminators";
+ version = "0.8";
+ sha256 = "00prqf3qnhsswigcx87nq9dfaq9vjvzgcgbpnxrpgw9k36p9mdh2";
+ libraryHaskellDepends = [
+ base extra singleton-nats singletons-base template-haskell
+ th-abstraction th-desugar
+ ];
+ testHaskellDepends = [ base hspec singleton-nats singletons-base ];
+ testToolDepends = [ hspec-discover ];
+ description = "Dependently typed elimination functions using singletons";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"elision" = callPackage
({ mkDerivation, base, profunctors }:
mkDerivation {
@@ -83366,7 +83522,7 @@ self: {
parallel-io pcre-light tasty tasty-hunit
];
description = "Perform basic syntax and deliverability checks on email addresses";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"emailaddress" = callPackage
@@ -83474,7 +83630,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "support for embroidery formats in haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -84334,7 +84490,7 @@ self: {
sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx";
libraryHaskellDepends = [ base ];
description = "Haskell binding for EPANET";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -84562,6 +84718,8 @@ self: {
pname = "equational-reasoning";
version = "0.7.0.0";
sha256 = "0l6gyq43byh6cy2pblb9a4qjy7w5k9maa97c076dxlsf53myj01h";
+ revision = "1";
+ editedCabalFile = "1a8dw9givg0przqrm33kkmff9r0fdv1ih6ik3dqa99ww71cc8q66";
libraryHaskellDepends = [
base containers template-haskell th-desugar void
];
@@ -84691,6 +84849,25 @@ self: {
broken = true;
}) {};
+ "erlang-ffi" = callPackage
+ ({ mkDerivation, base, binary, bytestring, directory, filepath
+ , hspec, MissingH, network, random
+ }:
+ mkDerivation {
+ pname = "erlang-ffi";
+ version = "1.0.0";
+ sha256 = "1vj0i7r4pr3dhyvlgk0mi31ljcq87y69s2vmh4q41m5q4wxz9c42";
+ libraryHaskellDepends = [
+ base binary bytestring directory filepath MissingH network random
+ ];
+ testHaskellDepends = [
+ base binary bytestring directory filepath hspec MissingH network
+ random
+ ];
+ description = "Send messages to an Erlang node using Haskell";
+ license = "GPL";
+ }) {};
+
"eros" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, text }:
mkDerivation {
@@ -85060,7 +85237,7 @@ self: {
aeson attoparsec base bytestring yaml
];
description = "Easy Runtime Templates";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -85218,7 +85395,7 @@ self: {
yesod-form yesod-static yesod-test
];
description = "Espial is an open-source, web-based bookmarking server";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -85941,8 +86118,8 @@ self: {
({ mkDerivation, base, ghc-prim, primitive }:
mkDerivation {
pname = "eveff";
- version = "0.1.0.0";
- sha256 = "1d0bxg1dg66g1yv291cp4jh3xv3caxrddqrwb0g6g1929dl019fa";
+ version = "1.0.0.1";
+ sha256 = "0668345qdais176w8vbmjklys64ys36m4ppkiyqbad866n0zg7n9";
libraryHaskellDepends = [ base ghc-prim primitive ];
description = "Efficient effect handlers based on evidence translation";
license = lib.licenses.mit;
@@ -86196,8 +86373,8 @@ self: {
}:
mkDerivation {
pname = "eventlog2html";
- version = "0.8.3";
- sha256 = "0xk9s8f20xx1xpbc2kbyfv3hhnrj8arim99lrr6wbv8y33qz0pkr";
+ version = "0.9.0";
+ sha256 = "1cjnkqdnk76839dl4dbpj3vzbkrjwgqryq2j3sgs9mmxfing7ahq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -86914,7 +87091,7 @@ self: {
];
testHaskellDepends = [ base doctest ];
description = "Exheres generator for cabal packages";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -87282,7 +87459,7 @@ self: {
base bimap containers gauge prettyprinter raw-strings-qq
];
description = "Linear programming over exponent pairs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"expand" = callPackage
@@ -87328,8 +87505,8 @@ self: {
}:
mkDerivation {
pname = "experimenter";
- version = "0.1.0.4";
- sha256 = "0pzlmq2rb485x0df4ivw5i9sv8n14svy1vhgjqc69vm1p0md57ms";
+ version = "0.1.0.10";
+ sha256 = "0ys1m510j573f1ydbyilxcmdcizbannn8gm6c6pg0d9lq1avg5aw";
libraryHaskellDepends = [
aeson base bytestring cereal cereal-vector conduit containers
deepseq directory esqueleto filepath HaTeX hostname lens matrix
@@ -87431,7 +87608,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -87444,7 +87621,7 @@ self: {
sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y";
libraryHaskellDepends = [ base ];
description = "explicit computation of determinant of small matrices";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -87531,6 +87708,17 @@ self: {
broken = true;
}) {};
+ "exploring-interpreters" = callPackage
+ ({ mkDerivation, base, containers, fgl, mtl, transformers }:
+ mkDerivation {
+ pname = "exploring-interpreters";
+ version = "0.2.0.0";
+ sha256 = "1q2i68isdyc1fmxz9hcrjy8k3z8ji6xb2xrn4pc3wn0mrlnj1dka";
+ libraryHaskellDepends = [ base containers fgl mtl transformers ];
+ description = "A generic exploring interpreter for exploratory programming";
+ license = lib.licenses.bsd3;
+ }) {};
+
"exposed-containers" = callPackage
({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim
, HUnit, QuickCheck, test-framework, test-framework-hunit
@@ -88699,7 +88887,7 @@ self: {
benchmarkHaskellDepends = [ base digits gauge ];
doHaddock = false;
description = "Integer-to-digits conversion";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -88842,7 +89030,7 @@ self: {
pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
];
description = "A simple, mindless parser for fasta files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -89004,7 +89192,7 @@ self: {
base bytestring cassava hxt network-uri text
];
description = "Utilities for working with DuckDuckHack's FatHead Instant Answers";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -89313,7 +89501,7 @@ self: {
];
doHaddock = false;
description = "Build and create Fedora package repos and branches";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -89331,7 +89519,7 @@ self: {
unordered-containers
];
description = "Algo for Formal Concept Analysis";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -89601,7 +89789,7 @@ self: {
sha256 = "0hynmwic940vmna0czavbp1wx856ad9am7i6r0d2hq8jynrsin5w";
libraryHaskellDepends = [ base ];
description = "Library for Fedora distribution versions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"fedora-haskell-tools" = callPackage
@@ -89620,7 +89808,7 @@ self: {
process simple-cmd simple-cmd-args split time unix
];
description = "Building and maintenance tools for Fedora Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"fedora-img-dl" = callPackage
@@ -89640,7 +89828,7 @@ self: {
xdg-userdirs
];
description = "Fedora image download tool";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -89823,7 +90011,7 @@ self: {
raw-strings-qq scotty text transformers wai warp wreq xml
];
description = "Translate syndication feeds";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -90151,7 +90339,7 @@ self: {
libraryHaskellDepends = [ base ];
doHaddock = false;
description = "To be written";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"fenfire" = callPackage
@@ -90197,7 +90385,7 @@ self: {
tasty-hunit tasty-quickcheck time
];
description = "Generate and verify HMAC-based authentication tokens";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -90833,8 +91021,8 @@ self: {
({ mkDerivation, base, bytestring, filepath, QuickCheck, unix }:
mkDerivation {
pname = "filepath-bytestring";
- version = "1.4.2.1.6";
- sha256 = "11xrrzdkm5i96dazbz0gi1qp8nnj2lwbnxzwy7f4cnahskz4f4g7";
+ version = "1.4.2.1.7";
+ sha256 = "00xayqjq2qvb4yj0ppx838cabg5cx9swh0mzfb8c6njk9y5rc41n";
libraryHaskellDepends = [ base bytestring unix ];
testHaskellDepends = [ base bytestring filepath QuickCheck ];
description = "Library for manipulating RawFilePaths in a cross platform way";
@@ -90870,7 +91058,7 @@ self: {
sha256 = "08rb2nafnh5vx7i6i3ddhq4h1s2ffgz8ailap5knr1xl7izgyywp";
libraryHaskellDepends = [ base base-io-access filepath ];
description = "IO Access for filepath";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -91162,7 +91350,7 @@ self: {
optparse-applicative text tree-fun unordered-containers
];
description = "Find the clumpiness of labels in a tree";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -91231,7 +91419,7 @@ self: {
http-directory simple-cmd-args text
];
description = "List http/html files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -92014,7 +92202,7 @@ self: {
tasty tasty-quickcheck temporary
];
description = "File-backed recursive data structures";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -92040,7 +92228,7 @@ self: {
old-time QuickCheck text
];
description = "FIX (co)parser";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -92213,7 +92401,7 @@ self: {
base binary deepseq HTTP optparse-applicative process
];
description = "Verify FLAC files ripped form CD using AccurateRip™";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"flags-applicative" = callPackage
@@ -92376,7 +92564,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base directory parsec ];
description = "flatten a latex multi-file latex document and remove all comments";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"flatbuffers" = callPackage
@@ -92416,6 +92604,26 @@ self: {
broken = true;
}) {};
+ "flatparse" = callPackage
+ ({ mkDerivation, attoparsec, base, bytesmith, bytestring
+ , containers, gauge, megaparsec, parsec, primitive
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "flatparse";
+ version = "0.1.1.1";
+ sha256 = "19k1336hf23n440bk5fjw296bs7kqccfa4mhl4wsvfvbsyrzlp09";
+ libraryHaskellDepends = [
+ base bytestring containers template-haskell
+ ];
+ benchmarkHaskellDepends = [
+ attoparsec base bytesmith bytestring gauge megaparsec parsec
+ primitive
+ ];
+ description = "High-performance parsing from strict bytestrings";
+ license = lib.licenses.mit;
+ }) {};
+
"flay" = callPackage
({ mkDerivation, base, constraints, tasty, tasty-quickcheck
, transformers
@@ -92941,7 +93149,7 @@ self: {
directory MonadRandom mtl random
];
description = "Simulate 454 pyrosequencing";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -93145,7 +93353,7 @@ self: {
resource-pool text time uuid-types yesod-core yesod-static
];
description = "A simple web application as a online practice website for XDU SE 2017 fall SPM";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"fluffy-parser" = callPackage
@@ -93160,7 +93368,7 @@ self: {
base binary bytestring pandoc parsec postgresql-simple
];
description = "The parser for fluffy to parsec the question bank in .docx type";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -93681,7 +93889,7 @@ self: {
array base containers gloss optparse-applicative xml
];
description = "Toolset for Folger Shakespeare Library's XML annotated plays";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"follow" = callPackage
@@ -93709,7 +93917,7 @@ self: {
text time transformers unordered-containers yaml
];
description = "Haskell library to follow content published on any subject";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -93753,7 +93961,7 @@ self: {
old-locale strict time
];
description = "Follow Tweets anonymously";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -94306,8 +94514,8 @@ self: {
}:
mkDerivation {
pname = "forsyde-shallow";
- version = "3.4.0.1";
- sha256 = "0im5xf8dcalsjk85fyvih042apv3wl54k3jlmdjg7fnm3mgxj1yj";
+ version = "3.5.0.0";
+ sha256 = "16skihnq2kkxdgliv6780s2lyka1bsm0naws6kz1sy3ggsw0qnp9";
libraryHaskellDepends = [ base directory old-time process random ];
testHaskellDepends = [
base directory doctest hspec old-time process QuickCheck random
@@ -94324,7 +94532,7 @@ self: {
sha256 = "1hmcicxnxcl99chidkbg1kspjzpxxcw8qh4lrwvmlpz2knzf11g3";
libraryHaskellDepends = [ array-forth base free mtl ];
description = "A simple eDSL for generating arrayForth code";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -94801,6 +95009,8 @@ self: {
libraryHaskellDepends = [ base frame pandoc ];
description = "A markdown to Frame GUI writer for Pandoc";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"franchise" = callPackage
@@ -94929,8 +95139,8 @@ self: {
}:
mkDerivation {
pname = "free-algebras";
- version = "0.1.0.0";
- sha256 = "0s5gj52b3s1hg92cs12qk7y2zgsl546livdzps2qm4fmjc394qj3";
+ version = "0.1.0.1";
+ sha256 = "13cyy6afp9y3wfv3qihf0ngrvs7rghbx627a88l3yq1l21r0bbj8";
libraryHaskellDepends = [
base containers data-fix dlist free groups kan-extensions mtl
transformers
@@ -95298,7 +95508,9 @@ self: {
libraryPkgconfigDepends = [ libfreenect ];
description = "Interface to the Kinect device";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) freenect; freenect_sync = null;
libfreenect = null;};
@@ -95629,7 +95841,7 @@ self: {
base QuickCheck test-framework test-framework-quickcheck2 vector
];
description = "A functional image processing library for Haskell";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"friday-devil" = callPackage
@@ -95645,7 +95857,7 @@ self: {
];
librarySystemDepends = [ libdevil ];
description = "Uses the DevIL C library to read and write images from and to files and memory buffers";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) libdevil;};
@@ -95827,7 +96039,7 @@ self: {
sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn";
libraryHaskellDepends = [ base containers mtl ];
description = "Arduino programming without the hassle of C";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -95909,7 +96121,7 @@ self: {
libraryHaskellDepends = [ base frpnow vty ];
executableHaskellDepends = [ base containers frpnow vty ];
description = "Program terminal applications with vty and frpnow!";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -96317,8 +96529,6 @@ self: {
];
description = "Simple sentence segmenter";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"funbot" = callPackage
@@ -96412,7 +96622,7 @@ self: {
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base filepath pretty process ];
description = "Functional MetaPost is a Haskell frontend to the MetaPost language";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ peti ];
}) {};
@@ -97127,26 +97337,27 @@ self: {
({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary
, blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm
, containers, directory, directory-tree, dlist, file-embed
- , filepath, free, gitrev, happy, haskeline, language-c-quote
- , mainland-pretty, megaparsec, mtl, neat-interpolation, parallel
- , parser-combinators, pcg-random, process, process-extras
- , QuickCheck, regex-tdfa, sexp-grammar, srcloc, tasty, tasty-hunit
- , tasty-quickcheck, template-haskell, temporary, terminal-size
- , text, time, transformers, unordered-containers, utf8-string
- , vector, vector-binary-instances, versions, zip-archive, zlib
+ , filepath, free, gitrev, happy, hashable, haskeline
+ , language-c-quote, mainland-pretty, megaparsec, mtl
+ , neat-interpolation, parallel, parser-combinators, pcg-random
+ , process, process-extras, QuickCheck, regex-tdfa, srcloc, tasty
+ , tasty-hunit, tasty-quickcheck, template-haskell, temporary
+ , terminal-size, text, time, transformers, unordered-containers
+ , utf8-string, vector, vector-binary-instances, versions
+ , zip-archive, zlib
}:
mkDerivation {
pname = "futhark";
- version = "0.19.1";
- sha256 = "1nhy1pjqy7na7brpkh72yzcglfrwaz7l325fivfq5niaq85832dd";
+ version = "0.19.2";
+ sha256 = "0pkb9yqvfbahmq3lmp7ia0c4sfzx1cghnhk4b7z41xbf20qcakrx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-terminal array base binary blaze-html bmp bytestring
bytestring-to-vector cmark-gfm containers directory directory-tree
- dlist file-embed filepath free gitrev haskeline language-c-quote
- mainland-pretty megaparsec mtl neat-interpolation parallel
- pcg-random process process-extras regex-tdfa sexp-grammar srcloc
+ dlist file-embed filepath free gitrev hashable haskeline
+ language-c-quote mainland-pretty megaparsec mtl neat-interpolation
+ parallel pcg-random process process-extras regex-tdfa srcloc
template-haskell temporary terminal-size text time transformers
unordered-containers utf8-string vector vector-binary-instances
versions zip-archive zlib
@@ -97154,8 +97365,8 @@ self: {
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [ base text ];
testHaskellDepends = [
- base containers megaparsec mtl parser-combinators QuickCheck
- sexp-grammar tasty tasty-hunit tasty-quickcheck text
+ base containers megaparsec mtl parser-combinators QuickCheck tasty
+ tasty-hunit tasty-quickcheck text
];
description = "An optimising compiler for a functional, array-oriented language";
license = lib.licenses.isc;
@@ -97187,7 +97398,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base bytestring network unix ];
description = "Simple IP-over-UDP tunnel using TUNTAP";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -97213,7 +97424,7 @@ self: {
sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv";
libraryHaskellDepends = [ base transformers ];
description = "realtime resource handling with manual concurrency";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"futures" = callPackage
@@ -97350,6 +97561,17 @@ self: {
broken = true;
}) {};
+ "fuzzyfind" = callPackage
+ ({ mkDerivation, array, base, containers }:
+ mkDerivation {
+ pname = "fuzzyfind";
+ version = "0.1.0";
+ sha256 = "0ghv1paisvy4dn3l7vv499a6k6a4r54ks5bn3jl8zhy65xn5c8nv";
+ libraryHaskellDepends = [ array base containers ];
+ description = "Fuzzy text matching";
+ license = lib.licenses.mit;
+ }) {};
+
"fuzzyset" = callPackage
({ mkDerivation, base, data-default, hspec, ieee754, text
, text-metrics, unordered-containers, vector
@@ -97464,6 +97686,17 @@ self: {
license = lib.licenses.mit;
}) {};
+ "fxpak" = callPackage
+ ({ mkDerivation, base, bytestring, serialport }:
+ mkDerivation {
+ pname = "fxpak";
+ version = "0.0.1";
+ sha256 = "07c5za6limzk76if4rnwyq5iawhqp78hlm793y73cxhb65y0g9d0";
+ libraryHaskellDepends = [ base bytestring serialport ];
+ description = "Interface to the FXPak/FXPak Pro USB interface";
+ license = lib.licenses.bsd3;
+ }) {};
+
"g-npm" = callPackage
({ mkDerivation, base, HTTP, json }:
mkDerivation {
@@ -98023,7 +98256,7 @@ self: {
libraryPkgconfigDepends = [ GConf ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the GNOME configuration database system";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs.gnome2) GConf;};
@@ -98160,7 +98393,7 @@ self: {
transformers
];
description = "recursive atomic build system";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"gdp" = callPackage
@@ -98187,7 +98420,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
description = "zooming rotating fractal gears graphics demo";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"gedcom" = callPackage
@@ -98273,7 +98506,7 @@ self: {
librarySystemDepends = [ gegl ];
libraryPkgconfigDepends = [ gegl ];
description = "Haskell bindings to GEGL library";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gegl;};
@@ -98394,6 +98627,8 @@ self: {
pname = "gemini-router";
version = "0.1.1.0";
sha256 = "19aq9ri0ixkg0d5g4ickda75dvpq340lwkdxn0ndcbkis9xrvkv9";
+ revision = "1";
+ editedCabalFile = "07lnx99d3dkjhqcail31zkbmivclzxdj3qjbhijg1cs3fkl57q3q";
libraryHaskellDepends = [
base gemini-server HsOpenSSL network-uri transformers
];
@@ -98407,10 +98642,8 @@ self: {
}:
mkDerivation {
pname = "gemini-server";
- version = "0.2.0.0";
- sha256 = "06sqy3c04s3cjx6p9rzfi23cq34bjs1wbigczcc66i6ahf4x1hz2";
- revision = "1";
- editedCabalFile = "0zw9svhk5wmi56vqmw7630nqhp816xph9ldgc8l3jzspziz350fx";
+ version = "0.3.0.0";
+ sha256 = "0s9h0lzxz5yjvz8rzw9mx9dba21171960waaqikj2qbbja0iq3k3";
libraryHaskellDepends = [
base bytestring hslogger HsOpenSSL network network-run network-uri
text utf8-string
@@ -98527,7 +98760,7 @@ self: {
libraryHaskellDepends = [ attoparsec base text ];
executableHaskellDepends = [ attoparsec base text ];
description = "Identify a persons gender by their first name";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -99431,7 +99664,7 @@ self: {
base bytestring cmdargs directory filepath GenI json text
];
description = "Companion tools for use with the GenI surface realiser";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -100351,7 +100584,7 @@ self: {
libraryHaskellDepends = [ base ieee754 linear QuickCheck ];
testHaskellDepends = [ base ieee754 linear QuickCheck ];
description = "package for geometry in euklidean 2d space";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -100487,7 +100720,7 @@ self: {
enableSeparateDataOutput = true;
executableHaskellDepends = [ base containers parsec ];
description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -100813,25 +101046,6 @@ self: {
}) {};
"ghc-events" = callPackage
- ({ mkDerivation, array, base, binary, bytestring, containers, text
- , vector
- }:
- mkDerivation {
- pname = "ghc-events";
- version = "0.15.1";
- sha256 = "16kh64z60353m6bj9lmv9yzlvydgmi66hm8gc4b22bs69xyh2pxz";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- array base binary bytestring containers text vector
- ];
- executableHaskellDepends = [ base containers ];
- testHaskellDepends = [ base ];
- description = "Library and tool for parsing .eventlog files from GHC";
- license = lib.licenses.bsd3;
- }) {};
-
- "ghc-events_0_16_0" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers, text
, vector
}:
@@ -100848,7 +101062,6 @@ self: {
testHaskellDepends = [ base ];
description = "Library and tool for parsing .eventlog files from GHC";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"ghc-events-analyze" = callPackage
@@ -101124,6 +101337,8 @@ self: {
pname = "ghc-lib-parser";
version = "9.0.1.20210207";
sha256 = "1gikdcgcgw1paxs5igxgxdfvpjp23963f6vn83m0a6vr88n2haah";
+ revision = "1";
+ editedCabalFile = "1fkh3xc2pq4k0mz1x92xhby5sqamfsnfm4rlq38p5shybkan7qgl";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory
@@ -101249,7 +101464,7 @@ self: {
base criterion directory filepath temporary
];
description = "Happy Haskell Hacking";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -101634,8 +101849,8 @@ self: {
}:
mkDerivation {
pname = "ghc-tags-core";
- version = "0.2.4.0";
- sha256 = "1h2khrvykywdddnhpy6yg2adfjlzdy6i6zib8km5j2zakmhq9s9j";
+ version = "0.2.4.1";
+ sha256 = "0d1srd72ajp2csyic6wpj6i7818rimqbcg5c3lxj76cz9zpjr1g8";
libraryHaskellDepends = [
attoparsec base bytestring directory filepath-bytestring ghc mtl
pipes pipes-attoparsec pipes-bytestring text transformers
@@ -101664,8 +101879,8 @@ self: {
}:
mkDerivation {
pname = "ghc-tags-plugin";
- version = "0.2.4.0";
- sha256 = "1cpfh3cvad2avissri0cs7ghamg2q3nyifyzlj3dndmzbpjrvxy7";
+ version = "0.2.4.1";
+ sha256 = "1hzv3s6pys1cqwj3hs1xww52v5yapisw9y3d5fmxzh0s6nawpxf2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -101813,8 +102028,8 @@ self: {
}:
mkDerivation {
pname = "ghc-typelits-presburger";
- version = "0.5.2.0";
- sha256 = "0ny7paq8ykc4ycag1dlb9mlpv17dh9a6csh22abj6bls5rx4iljr";
+ version = "0.6.0.0";
+ sha256 = "08jxp7xnpnlkn8429x25sy1r8xg4b4pv5a41bgw08dl0br4941cx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -102137,6 +102352,70 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "ghcide_1_1_0_0" = callPackage
+ ({ mkDerivation, aeson, array, async, base, base16-bytestring
+ , binary, bytestring, bytestring-encoding, case-insensitive
+ , containers, cryptohash-sha1, data-default, deepseq, dependent-map
+ , dependent-sum, Diff, directory, dlist, extra, filepath
+ , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check
+ , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob
+ , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb
+ , hls-plugin-api, hp2pretty, hslogger, implicit-hie
+ , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl
+ , network-uri, opentelemetry, optparse-applicative, parallel
+ , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck
+ , quickcheck-instances, record-dot-preprocessor, record-hasfield
+ , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions
+ , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty
+ , tasty-expected-failure, tasty-hunit, tasty-quickcheck
+ , tasty-rerun, text, time, transformers, unix, unliftio
+ , unliftio-core, unordered-containers, utf8-string, vector, yaml
+ }:
+ mkDerivation {
+ pname = "ghcide";
+ version = "1.1.0.0";
+ sha256 = "1i2xyp2n4g4cpz50wpwmzmknrzqzxnv3b551ibmhdy41v2fh6y5l";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson array async base base16-bytestring binary bytestring
+ bytestring-encoding case-insensitive containers cryptohash-sha1
+ data-default deepseq dependent-map dependent-sum Diff directory
+ dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th
+ ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable
+ heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger
+ implicit-hie-cradle lens lsp lsp-types mtl network-uri
+ opentelemetry parallel prettyprinter prettyprinter-ansi-terminal
+ regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake
+ sorted-list sqlite-simple stm syb text time transformers unix
+ unliftio unliftio-core unordered-containers utf8-string vector
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring containers data-default directory extra
+ filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api
+ lens lsp lsp-test lsp-types optparse-applicative process
+ safe-exceptions shake text unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base binary bytestring containers data-default directory
+ extra filepath ghc ghc-typelits-knownnat haddock-library
+ hls-plugin-api lens lsp lsp-test lsp-types network-uri
+ optparse-applicative process QuickCheck quickcheck-instances
+ record-dot-preprocessor record-hasfield rope-utf16-splay safe
+ safe-exceptions shake tasty tasty-expected-failure tasty-hunit
+ tasty-quickcheck tasty-rerun text
+ ];
+ testToolDepends = [ implicit-hie ];
+ benchmarkHaskellDepends = [
+ aeson base directory extra filepath optparse-applicative shake
+ shake-bench text yaml
+ ];
+ benchmarkToolDepends = [ hp2pretty implicit-hie ];
+ description = "The core of an IDE";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"ghcjs-ajax" = callPackage
({ mkDerivation, aeson, base, http-types, text }:
mkDerivation {
@@ -102506,7 +102785,7 @@ self: {
];
libraryPkgconfigDepends = [ atk ];
description = "Atk bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) atk;};
"gi-cairo" = callPackage
@@ -102529,7 +102808,7 @@ self: {
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
description = "Cairo bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) cairo;};
"gi-cairo-again" = callPackage
@@ -102561,7 +102840,7 @@ self: {
base gi-cairo gi-cairo-render haskell-gi-base mtl
];
description = "GI friendly Binding to the Cairo library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {};
"gi-cairo-render" = callPackage
@@ -102597,7 +102876,7 @@ self: {
];
libraryPkgconfigDepends = [ libdbusmenu ];
description = "Dbusmenu bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) libdbusmenu;};
"gi-dbusmenugtk3" = callPackage
@@ -102621,7 +102900,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
description = "DbusmenuGtk bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
"gi-gdk" = callPackage
@@ -102645,7 +102924,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk3 ];
description = "Gdk bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gtk3;};
"gi-gdk_4_0_2" = callPackage
@@ -102669,7 +102948,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk4 ];
description = "Gdk bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) gtk4;};
@@ -102691,7 +102970,7 @@ self: {
];
libraryPkgconfigDepends = [ gdk-pixbuf ];
description = "GdkPixbuf bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gdk-pixbuf;};
"gi-gdkx11" = callPackage
@@ -102713,7 +102992,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk3 ];
description = "GdkX11 bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gtk3;};
"gi-gdkx11_4_0_2" = callPackage
@@ -102735,7 +103014,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk4-x11 ];
description = "GdkX11 bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {gtk4-x11 = null;};
@@ -102757,7 +103036,7 @@ self: {
];
libraryPkgconfigDepends = [ libgit2-glib ];
description = "libgit2-glib bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) libgit2-glib;};
"gi-gio" = callPackage
@@ -102776,7 +103055,7 @@ self: {
];
libraryPkgconfigDepends = [ glib ];
description = "Gio bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) glib;};
"gi-girepository" = callPackage
@@ -102795,7 +103074,7 @@ self: {
];
libraryPkgconfigDepends = [ gobject-introspection ];
description = "GIRepository (gobject-introspection) bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gobject-introspection;};
"gi-glib" = callPackage
@@ -102814,7 +103093,7 @@ self: {
];
libraryPkgconfigDepends = [ glib ];
description = "GLib bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) glib;};
"gi-gobject" = callPackage
@@ -102833,7 +103112,7 @@ self: {
];
libraryPkgconfigDepends = [ glib ];
description = "GObject bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) glib;};
"gi-graphene" = callPackage
@@ -102852,7 +103131,7 @@ self: {
];
libraryPkgconfigDepends = [ graphene-gobject ];
description = "Graphene bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {graphene-gobject = null;};
@@ -102878,7 +103157,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk4 ];
description = "Gsk bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtk4;};
@@ -102899,7 +103178,7 @@ self: {
];
libraryPkgconfigDepends = [ gstreamer ];
description = "GStreamer bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs.gst_all_1) gstreamer;};
"gi-gstaudio" = callPackage
@@ -102920,7 +103199,7 @@ self: {
];
libraryPkgconfigDepends = [ gst-plugins-base ];
description = "GStreamerAudio bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
@@ -102943,7 +103222,7 @@ self: {
];
libraryPkgconfigDepends = [ gst-plugins-base ];
description = "GStreamerBase bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
"gi-gstpbutils" = callPackage
@@ -102967,7 +103246,7 @@ self: {
];
libraryPkgconfigDepends = [ gstreamer-pbutils ];
description = "GStreamer Plugins Base Utils bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {gstreamer-pbutils = null;};
@@ -102990,7 +103269,7 @@ self: {
];
libraryPkgconfigDepends = [ gstreamer-tag ];
description = "GStreamer Tag bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {gstreamer-tag = null;};
@@ -103013,7 +103292,7 @@ self: {
];
libraryPkgconfigDepends = [ gst-plugins-base ];
description = "GStreamerVideo bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
"gi-gtk" = callPackage
@@ -103037,7 +103316,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk3 ];
description = "Gtk bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gtk3;};
"gi-gtk_4_0_3" = callPackage
@@ -103061,7 +103340,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk4 ];
description = "Gtk bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) gtk4;};
@@ -103128,7 +103407,7 @@ self: {
gi-gtk haskell-gi-base mtl text transformers
];
description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {};
"gi-gtkosxapplication" = callPackage
@@ -103149,7 +103428,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
description = "GtkosxApplication bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {gtk-mac-integration-gtk3 = null;};
@@ -103175,7 +103454,7 @@ self: {
];
libraryPkgconfigDepends = [ gtksheet ];
description = "GtkSheet bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {gtksheet = null;};
@@ -103201,7 +103480,7 @@ self: {
];
libraryPkgconfigDepends = [ gtksourceview3 ];
description = "GtkSource bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gtksourceview3;};
"gi-handy" = callPackage
@@ -103225,7 +103504,7 @@ self: {
];
libraryPkgconfigDepends = [ libhandy ];
description = "libhandy bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) libhandy;};
@@ -103246,7 +103525,7 @@ self: {
];
libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ];
description = "HarfBuzz bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;};
"gi-ibus" = callPackage
@@ -103267,7 +103546,7 @@ self: {
];
libraryPkgconfigDepends = [ ibus ];
description = "IBus bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) ibus;};
"gi-javascriptcore" = callPackage
@@ -103286,7 +103565,7 @@ self: {
];
libraryPkgconfigDepends = [ webkitgtk ];
description = "JavaScriptCore bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) webkitgtk;};
@@ -103308,7 +103587,7 @@ self: {
];
libraryPkgconfigDepends = [ libnotify ];
description = "Libnotify bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) libnotify;};
"gi-ostree" = callPackage
@@ -103329,8 +103608,10 @@ self: {
];
libraryPkgconfigDepends = [ ostree ];
description = "OSTree bindings";
- license = lib.licenses.lgpl21;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ license = lib.licenses.lgpl21Only;
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) ostree;};
"gi-pango" = callPackage
@@ -103355,7 +103636,7 @@ self: {
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
description = "Pango bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) cairo; inherit (pkgs) pango;};
"gi-pangocairo" = callPackage
@@ -103381,7 +103662,7 @@ self: {
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
description = "PangoCairo bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) cairo; inherit (pkgs) pango;};
"gi-poppler" = callPackage
@@ -103402,7 +103683,7 @@ self: {
];
libraryPkgconfigDepends = [ poppler_gi ];
description = "Poppler bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) poppler_gi;};
@@ -103425,7 +103706,7 @@ self: {
];
libraryPkgconfigDepends = [ libsecret ];
description = "Libsecret bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) libsecret;};
"gi-soup" = callPackage
@@ -103446,7 +103727,7 @@ self: {
];
libraryPkgconfigDepends = [ libsoup ];
description = "Libsoup bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) libsoup;};
"gi-vte" = callPackage
@@ -103470,7 +103751,7 @@ self: {
];
libraryPkgconfigDepends = [ vte_291 ];
description = "Vte bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {vte_291 = pkgs.vte;};
"gi-webkit" = callPackage
@@ -103492,7 +103773,7 @@ self: {
libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
doHaddock = false;
description = "WebKit bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) webkitgtk24x-gtk3;};
@@ -103517,7 +103798,7 @@ self: {
];
libraryPkgconfigDepends = [ webkitgtk ];
description = "WebKit2 bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) webkitgtk;};
@@ -103542,7 +103823,7 @@ self: {
];
libraryPkgconfigDepends = [ webkitgtk ];
description = "WebKit2-WebExtension bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) webkitgtk;};
@@ -103566,7 +103847,7 @@ self: {
];
libraryPkgconfigDepends = [ libwnck ];
description = "Wnck bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) libwnck;};
@@ -103587,7 +103868,7 @@ self: {
];
libraryPkgconfigDepends = [ xlibsWrapper ];
description = "xlib bindings";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) xlibsWrapper;};
"giak" = callPackage
@@ -103715,7 +103996,7 @@ self: {
];
libraryPkgconfigDepends = [ system-glib ];
description = "Binding to GIO";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {system-glib = pkgs.glib;};
"gipeda" = callPackage
@@ -103783,7 +104064,7 @@ self: {
aeson base bytestring conduit http-conduit text
];
description = "A reliable command-line client for gist.github.com";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -103902,7 +104183,7 @@ self: {
checkPhase = ''PATH+=":$PWD" git-annex test'';
enableSharedExecutables = false;
description = "manage files with git, without checking their contents into git";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ peti ];
}) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git;
inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh;
@@ -104010,7 +104291,7 @@ self: {
test-framework-quickcheck2 time utf8-string
];
description = "Bindings to the date parsing from Git";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -104126,7 +104407,7 @@ self: {
http-types network-uri text
];
description = "git-lfs protocol";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"git-mediate" = callPackage
@@ -104144,7 +104425,7 @@ self: {
optparse-applicative process unix-compat
];
description = "Tool to help resolving git conflicts";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"git-monitor" = callPackage
@@ -104248,7 +104529,7 @@ self: {
split text time transformers unix unix-compat utf8-string
];
description = "repairs a damaged git repository";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -104435,7 +104716,7 @@ self: {
];
executableToolDepends = [ git ];
description = "backs up everything github knows about a repository, to the repository";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) git;};
@@ -104490,8 +104771,8 @@ self: {
}:
mkDerivation {
pname = "github-release";
- version = "1.3.6";
- sha256 = "07cxai2h6alyka0bsfch7vfjsvp3s9d48jw4n6z74kmxq3zdrgxh";
+ version = "1.3.7";
+ sha256 = "14dz9ap43m2ws6l4wfrn6wn3g5p2k0fgv639q7nyp4zdd4kn9czh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -104542,7 +104823,7 @@ self: {
http-client-tls monad-parallel tabular tagsoup text time vector
];
description = "Various Github helper utilities";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -105116,7 +105397,7 @@ self: {
libraryHaskellDepends = [ base glib gtk ];
libraryPkgconfigDepends = [ libglade ];
description = "Binding to the glade library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs.gnome2) libglade;};
@@ -105171,7 +105452,7 @@ self: {
base containers GLFW-b lens mtl OpenGL
];
description = "An OpenGL micro framework";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -105348,7 +105629,7 @@ self: {
];
libraryPkgconfigDepends = [ glib ];
description = "Binding to the GLIB library for Gtk2Hs";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) glib;};
"glicko" = callPackage
@@ -105364,7 +105645,7 @@ self: {
];
testHaskellDepends = [ base data-default hspec ];
description = "Glicko-2 implementation in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"glider-nlp" = callPackage
@@ -105603,7 +105884,7 @@ self: {
editedCabalFile = "0nia67zywmxyvcnlk0a906dijh9h7m6w48330n9gs2mjkhkyqb13";
libraryHaskellDepends = [ base gloss reactive-banana ];
description = "An Interface for gloss in terms of a reactive-banana Behavior";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -105751,7 +106032,7 @@ self: {
sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za";
libraryHaskellDepends = [ base gloss sodium ];
description = "A Sodium interface to the Gloss drawing package";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -105984,7 +106265,7 @@ self: {
priority-queue qd reflection Vec
];
description = "Mandelbrot Set explorer using GTK";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -106031,7 +106312,7 @@ self: {
libraryPkgconfigDepends = [ libgnome-keyring ];
libraryToolDepends = [ c2hs ];
description = "Bindings for libgnome-keyring";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs.gnome3) gnome-keyring;
inherit (pkgs) libgnome-keyring;};
@@ -106102,7 +106383,7 @@ self: {
testPkgconfigDepends = [ libidn ];
testToolDepends = [ c2hs ];
description = "Bindings for GNU IDN";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) libidn;};
@@ -106139,7 +106420,7 @@ self: {
librarySystemDepends = [ gnutls ];
libraryPkgconfigDepends = [ gnutls ];
description = "Bindings for GNU libgnutls";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs) gnutls;};
"goa" = callPackage
@@ -106272,7 +106553,7 @@ self: {
];
testHaskellDepends = [ base containers HUnit mtl parsec ];
description = "A monadic take on a 2,500-year-old board game - library";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -106294,7 +106575,7 @@ self: {
executableHaskellDepends = [ base gtk ];
testHaskellDepends = [ base HUnit ];
description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -108625,6 +108906,8 @@ self: {
pname = "goldplate";
version = "0.1.3";
sha256 = "109qhyq0n4w1jdz7y2hd8cjf44pikavv6mfnmf65vyfjangjq610";
+ revision = "1";
+ editedCabalFile = "1chrg7mfs4w4hbc0i1pdsj1350c4h3dhcv7xswn2ygq78337xxqk";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -108844,8 +109127,8 @@ self: {
}:
mkDerivation {
pname = "google-oauth2-jwt";
- version = "0.3.2";
- sha256 = "1njb9j6pb656drchi8qc94pniwph2bplnb667ga719yxmzm4256s";
+ version = "0.3.3";
+ sha256 = "13iy695qpb9yyr1wi3fslj0xd90izgj4wmvs04k5mhf6k53pk9dk";
libraryHaskellDepends = [
base base64-bytestring bytestring HsOpenSSL RSA text unix-time
];
@@ -108988,7 +109271,7 @@ self: {
mime-types network optparse-applicative text wai warp
];
description = "proxy gopher over http";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ sternenseemann ];
}) {};
@@ -109746,7 +110029,7 @@ self: {
sha256 = "0dzkv13w06hkxg2vkbblpskvsq02c2ay06rw2j4vyjpw13hms5bv";
libraryHaskellDepends = [ base containers fgl ];
description = "An implementation of algorithms for matchings in graphs";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -110223,6 +110506,8 @@ self: {
pname = "graphql-client";
version = "1.1.0";
sha256 = "0yk6nfyyynydrgwc1cdy5235121gw5q4iaapbvixpckz2diidxx7";
+ revision = "2";
+ editedCabalFile = "120c5cd9gj407lf3lcvfq0gqlvdpf3ciws9207nh0qqqdrpws9mj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -111358,7 +111643,7 @@ self: {
old-locale OpenGL OpenGLRaw parallel qd qd-vec ruff time Vec
];
description = "fractal explorer GUI using the ruff library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -111378,7 +111663,7 @@ self: {
random ruff Vec
];
description = "Mandelbrot Set examples using ruff and gruff";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -111397,7 +111682,7 @@ self: {
];
libraryPkgconfigDepends = [ gsasl ];
description = "Bindings for GNU libgsasl";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs) gsasl;};
"gsc-weighting" = callPackage
@@ -111425,7 +111710,7 @@ self: {
base feed http-conduit scalpel-core text uri xml-types
];
description = "scrapes google scholar, provides RSS feed";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -111539,7 +111824,7 @@ self: {
libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the GStreamer open source multimedia framework";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {gst-plugins-base = null; gstreamer = null;};
@@ -111611,7 +111896,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk2 ];
description = "Binding to the Gtk+ graphical user interface library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gtk2;};
"gtk-helpers" = callPackage
@@ -111637,7 +111922,7 @@ self: {
sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0";
libraryHaskellDepends = [ base gtk json transformers ];
description = "A simple custom form widget for gtk which allows inputing of JSON values";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"gtk-largeTreeStore" = callPackage
@@ -111653,7 +111938,7 @@ self: {
];
testHaskellDepends = [ base containers gtk3 hspec ];
description = "Large TreeStore support for gtk2hs";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"gtk-mac-integration" = callPackage
@@ -111669,8 +111954,8 @@ self: {
libraryHaskellDepends = [ array base containers glib gtk mtl ];
libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
description = "Bindings for the Gtk/OS X integration library";
- license = lib.licenses.lgpl21;
- platforms = [ "armv7l-linux" "x86_64-darwin" ];
+ license = lib.licenses.lgpl21Only;
+ platforms = [ "x86_64-darwin" ];
}) {inherit (pkgs) gtk-mac-integration-gtk2;};
"gtk-serialized-event" = callPackage
@@ -111687,7 +111972,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk2 ];
description = "GTK+ Serialized event";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtk2;};
@@ -111700,7 +111985,7 @@ self: {
sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws";
libraryHaskellDepends = [ base gtk ];
description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"gtk-sni-tray" = callPackage
@@ -111752,7 +112037,7 @@ self: {
sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706";
libraryHaskellDepends = [ base gtk ];
description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"gtk-toy" = callPackage
@@ -111777,7 +112062,7 @@ self: {
libraryHaskellDepends = [ base glib gtk3 ];
libraryPkgconfigDepends = [ xlibsWrapper ];
description = "A wrapper around the eggtraymanager library for Linux system trays";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) xlibsWrapper;};
"gtk2hs-buildtools" = callPackage
@@ -111798,7 +112083,7 @@ self: {
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [ base ];
description = "Tools to build the Gtk2Hs suite of User Interface libraries";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"gtk2hs-cast-glade" = callPackage
@@ -111951,7 +112236,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk3 ];
description = "Binding to the Gtk+ 3 graphical user interface library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) gtk3;};
"gtk3-helpers" = callPackage
@@ -111982,7 +112267,7 @@ self: {
libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
description = "Bindings for the Gtk/OS X integration library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {gtk-mac-integration-gtk3 = null;};
@@ -112002,7 +112287,7 @@ self: {
libraryPkgconfigDepends = [ gtkglext ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the GTK+ OpenGL Extension";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext;
@@ -112025,7 +112310,7 @@ self: {
libraryPkgconfigDepends = [ gtkimageview ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the GtkImageView library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtkimageview;};
@@ -112066,7 +112351,7 @@ self: {
libraryPkgconfigDepends = [ gtksourceview ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the GtkSourceView library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtksourceview;};
@@ -112087,7 +112372,7 @@ self: {
libraryPkgconfigDepends = [ gtksourceview3 ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the GtkSourceView library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtksourceview3;};
@@ -112152,7 +112437,7 @@ self: {
enableSeparateDataOutput = true;
executableHaskellDepends = [ base cairo containers filepath gtk ];
description = "graphical untyped lambda calculus interactive interpreter";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -112165,7 +112450,7 @@ self: {
sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2";
libraryHaskellDepends = [ base ];
description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"gw" = callPackage
@@ -112241,7 +112526,7 @@ self: {
stm template-haskell transformers utf8-string vinyl
];
description = "Haskell library for retrieving data from various booru image sites";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -112534,7 +112819,7 @@ self: {
libraryHaskellDepends = [ base hOff-parser OpenGL ];
executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ];
description = "The tool to transform the OFF to other image format";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -112547,7 +112832,7 @@ self: {
sha256 = "1vjvn4sr9nb7dd0in57kay6sb49nqzs377v6k9570h5faaj1dyci";
libraryHaskellDepends = [ base parsec ];
description = "The parser to parser the OFF(Object File Format, Princeton ModelNet)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hOpenPGP" = callPackage
@@ -114071,7 +114356,7 @@ self: {
ShellCheck split text
];
description = "Dockerfile Linter JavaScript API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hadoop-formats" = callPackage
@@ -114173,7 +114458,7 @@ self: {
];
testHaskellDepends = [ base doctest filemanip process ];
description = "Confirm delegation of NS and MX records";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"hafar" = callPackage
@@ -114267,7 +114552,7 @@ self: {
];
executableHaskellDepends = [ base time ];
description = "Analytic Hierarchy Process";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -114424,7 +114709,9 @@ self: {
iterio-server mongoDB mtl
];
description = "Dynamic launcher of Hails applications";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"hairy" = callPackage
@@ -114556,18 +114843,16 @@ self: {
, containers, cryptonite, data-default, deepseq, directory
, file-embed, filepath, fsnotify, http-conduit, http-types
, lrucache, memory, mtl, network-uri, optparse-applicative, pandoc
- , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
- , resourcet, scientific, tagsoup, tasty, tasty-hunit
+ , parsec, process, QuickCheck, random, regex-tdfa, resourcet
+ , scientific, tagsoup, tasty, tasty-golden, tasty-hunit
, tasty-quickcheck, template-haskell, text, time
, time-locale-compat, unordered-containers, utillinux, vector, wai
, wai-app-static, warp, yaml
}:
mkDerivation {
pname = "hakyll";
- version = "4.13.4.1";
- sha256 = "1z9k3029bjyxy2aqmqr6gzsva50154y4bfxqkmsjgl38lx3s6kk9";
- revision = "1";
- editedCabalFile = "1hv80gqq50zz791620lgdvkspspii0z59ngj7la69cdw2739cc5g";
+ version = "4.14.0.0";
+ sha256 = "088df9vs5f2p5iiv7rbrisz4z4s38mkr9z41gy3hqdapg4m7mi1c";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -114575,15 +114860,15 @@ self: {
base binary blaze-html blaze-markup bytestring containers
cryptonite data-default deepseq directory file-embed filepath
fsnotify http-conduit http-types lrucache memory mtl network-uri
- optparse-applicative pandoc pandoc-citeproc parsec process random
- regex-tdfa resourcet scientific tagsoup template-haskell text time
+ optparse-applicative pandoc parsec process random regex-tdfa
+ resourcet scientific tagsoup template-haskell text time
time-locale-compat unordered-containers vector wai wai-app-static
warp yaml
];
executableHaskellDepends = [ base directory filepath ];
testHaskellDepends = [
- base bytestring containers filepath QuickCheck tasty tasty-hunit
- tasty-quickcheck text unordered-containers yaml
+ base bytestring containers filepath QuickCheck tasty tasty-golden
+ tasty-hunit tasty-quickcheck text unordered-containers yaml
];
testToolDepends = [ utillinux ];
description = "A static website compiler library";
@@ -114849,6 +115134,8 @@ self: {
];
description = "Hakyll wrapper for the Elm compiler";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"hakyll-favicon" = callPackage
@@ -114999,7 +115286,7 @@ self: {
regex-posix split tasty tasty-hunit tasty-quickcheck
];
description = "A shortcode extension module for Hakyll";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -115277,7 +115564,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base hint process ];
description = "looks for functions given a set of example input/outputs";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"halves" = callPackage
@@ -115430,7 +115717,7 @@ self: {
executableHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -115686,7 +115973,7 @@ self: {
wai-middleware-static yaml
];
description = "Simple Continuous Integration/Deployment System";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -115840,7 +116127,7 @@ self: {
libraryPkgconfigDepends = [ libappindicator-gtk2 ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the appindicator library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) libappindicator-gtk2;};
@@ -115856,7 +116143,7 @@ self: {
libraryHaskellDepends = [ base glib gtk3 ];
libraryPkgconfigDepends = [ libappindicator-gtk3 ];
description = "Binding to the appindicator library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) libappindicator-gtk3;};
@@ -116597,7 +116884,7 @@ self: {
array base clock language-dot transformers xml
];
description = "Parser for dot made with happy";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"happy-hour" = callPackage
@@ -116621,6 +116908,8 @@ self: {
pname = "happy-meta";
version = "0.2.0.11";
sha256 = "1vgv5fx1fya7wfh3zwdgy0hm0lyzp171gnpp6ymfd6kqmqkl3293";
+ revision = "1";
+ editedCabalFile = "1dspifamwsn6lcj2mxjyrbdsfjqfb4p6m0s1c9dkiv08cfkk02p6";
libraryHaskellDepends = [
array base containers fail haskell-src-meta mtl template-haskell
];
@@ -116855,7 +117144,7 @@ self: {
base containers derive hlint hslogger hspec HUnit QuickCheck
];
description = "A web service specification compiler that generates implementation and tests";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -116873,7 +117162,7 @@ self: {
];
libraryPkgconfigDepends = [ groonga ];
description = "Low level bindings for Groonga";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) groonga;};
@@ -116893,7 +117182,7 @@ self: {
scotty text time transformers wai-extra
];
description = "Yet another Groonga http server";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -117066,7 +117355,7 @@ self: {
base bytestring conduit cryptohash hex path
];
description = "Decompress SAPCAR archives";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"hascard" = callPackage
@@ -117511,7 +117800,7 @@ self: {
base bytestring cryptohash directory filepath
];
description = "Rename every file in a directory with his SHA1 hash";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hashring" = callPackage
@@ -117722,7 +118011,7 @@ self: {
base cmdargs containers cpphs directory her-lexer split
];
description = "A dialect of haskell with order of execution based on dependency resolution";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -117813,15 +118102,15 @@ self: {
broken = true;
}) {};
- "haskeline_0_8_1_1" = callPackage
+ "haskeline_0_8_1_2" = callPackage
({ mkDerivation, base, bytestring, containers, directory
, exceptions, filepath, HUnit, process, stm, terminfo, text
, transformers, unix
}:
mkDerivation {
pname = "haskeline";
- version = "0.8.1.1";
- sha256 = "1cg51rbhpa7ism0rg39dw7njz4r3q5h5pnysnbc37dh6gcdiyg2p";
+ version = "0.8.1.2";
+ sha256 = "0axr258a8wrsq37jwx4g343969lycydx9symijnp64a7ki67jrnp";
configureFlags = [ "-fterminfo" ];
isLibrary = true;
isExecutable = true;
@@ -117871,7 +118160,7 @@ self: {
editedCabalFile = "0h900mw5kzd9fvywpbhfd9acnfwp3qk7nfi9yr9ibamjb8s87cm1";
libraryHaskellDepends = [ base containers mtl protolude text ];
description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -118052,29 +118341,33 @@ self: {
}) {};
"haskell-ci" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, base, base-compat
- , bytestring, Cabal, cabal-install-parsers, containers, deepseq
+ ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+ , base-compat, base16-bytestring, binary, bytestring, Cabal
+ , cabal-install-parsers, containers, cryptohash-sha256, deepseq
, Diff, directory, exceptions, filepath, generic-lens-lite, HsYAML
- , lattices, mtl, network-uri, optparse-applicative, parsec, pretty
- , process, ShellCheck, tasty, tasty-golden, temporary, text
- , transformers, unordered-containers
+ , indexed-traversable, indexed-traversable-instances, ini, lattices
+ , mtl, network-uri, optparse-applicative, parsec, pretty, process
+ , ShellCheck, tasty, tasty-golden, temporary, text, transformers
+ , unordered-containers, zinza
}:
mkDerivation {
pname = "haskell-ci";
- version = "0.10.3";
- sha256 = "18qynghm1aj0qr18v6m3md75p2l3kyhki03798jwhi4kc5qdk2vv";
+ version = "0.12";
+ sha256 = "17ccxpsi483fkiyp98m09nzqds9n78y53naii5x18nvdxv9fssam";
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
- aeson base base-compat bytestring Cabal cabal-install-parsers
- containers deepseq directory exceptions filepath generic-lens-lite
- HsYAML lattices mtl network-uri optparse-applicative parsec pretty
- process ShellCheck temporary text transformers unordered-containers
+ aeson attoparsec base base-compat base16-bytestring binary
+ bytestring Cabal cabal-install-parsers containers cryptohash-sha256
+ deepseq directory exceptions filepath generic-lens-lite HsYAML
+ indexed-traversable indexed-traversable-instances ini lattices mtl
+ network-uri optparse-applicative parsec pretty process ShellCheck
+ temporary text transformers unordered-containers zinza
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
- ansi-terminal base base-compat bytestring Diff directory filepath
- tasty tasty-golden transformers
+ ansi-terminal base base-compat bytestring Cabal Diff directory
+ filepath tasty tasty-golden transformers
];
doHaddock = false;
description = "Cabal package script generator for Travis-CI";
@@ -118113,7 +118406,7 @@ self: {
sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7";
libraryHaskellDepends = [ base process ];
description = "Simple CoffeeScript API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -118134,7 +118427,7 @@ self: {
base bimap boolean-list bytestring containers
];
description = "compress files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -118413,7 +118706,7 @@ self: {
libraryPkgconfigDepends = [ glib gobject-introspection ];
testHaskellDepends = [ base doctest process ];
description = "Generate Haskell bindings for GObject Introspection capable libraries";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
"haskell-gi-base" = callPackage
@@ -118425,7 +118718,7 @@ self: {
libraryHaskellDepends = [ base bytestring containers text ];
libraryPkgconfigDepends = [ glib ];
description = "Foundation for libraries generated by haskell-gi";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) glib;};
"haskell-gi-overloading" = callPackage
@@ -118736,7 +119029,7 @@ self: {
base directory haskell-lsp lens process text unix
];
description = "A haskell package to build your own Language Server client";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -118802,7 +119095,7 @@ self: {
sha256 = "18s8g82v3h4b7maz6di43vfym6d3w16j4rbh5sjh4ps26yjnnfy4";
libraryHaskellDepends = [ base containers ];
description = "A simple menu system for Haskell programs";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"haskell-ml" = callPackage
@@ -119003,7 +119296,7 @@ self: {
old-locale poppler template-haskell time zlib
];
description = "Tool for presenting PDF-based presentations";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -119094,7 +119387,7 @@ self: {
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {libpostal = null;};
+ }) {inherit (pkgs) libpostal;};
"haskell-postgis" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, bytestring-lexing
@@ -119189,7 +119482,7 @@ self: {
sha256 = "03d8c1gnxd923f3fqqw06w3ibnd20llfgd7s5jgkscc872i5ghz6";
libraryHaskellDepends = [ base syb ];
description = "A DSL for expressing natural deduction rules in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -119225,7 +119518,7 @@ self: {
base containers lens linear mtl random sdl2 sdl2-ttf text vector
];
description = "Snake game implemetation in Haskell using SDL2";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"haskell-spacegoo" = callPackage
@@ -119258,8 +119551,6 @@ self: {
libraryToolDepends = [ happy ];
description = "Support for manipulating Haskell source code";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"haskell-src-exts" = callPackage
@@ -119926,7 +120217,7 @@ self: {
sha256 = "0fv533nac6dlawgffr1kvn4xpv63hdcb4wgyqbbg2s6dg9a2hw38";
libraryHaskellDepends = [ base process ];
description = "Simple TypeScript API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -120465,7 +120756,7 @@ self: {
test-framework-quickcheck2
];
description = "A scrabble library capturing the core game logic of scrabble";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -120519,6 +120810,8 @@ self: {
];
description = "Elm to Haskell translation";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"haskelzinc" = callPackage
@@ -120913,12 +121206,13 @@ self: {
, http-types, lens, monad-control, monad-logger, mtl, network, nqe
, optparse-applicative, QuickCheck, random, rocksdb-haskell-jprupp
, rocksdb-query, scotty, stm, string-conversions, text, time
- , transformers, unliftio, unordered-containers, wai, warp, wreq
+ , transformers, unliftio, unordered-containers, vault, wai
+ , wai-extra, warp, wreq
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.49.0";
- sha256 = "126krbi29jxi978my3wg8cl2gqpr0xn0fmbz6fxqcbbcwi75fa30";
+ version = "0.51.0";
+ sha256 = "0wgf4j28f3g8anm6xpi0qn1as8lw7b6gwsp92xpc0f2yvv38gm4d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -120927,7 +121221,8 @@ self: {
haskoin-core haskoin-node haskoin-store-data hedis http-types lens
monad-control monad-logger mtl network nqe random
rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions
- text time transformers unliftio unordered-containers wai warp wreq
+ text time transformers unliftio unordered-containers vault wai
+ wai-extra warp wreq
];
executableHaskellDepends = [
aeson aeson-pretty base base16 bytes bytestring cereal conduit
@@ -120936,7 +121231,7 @@ self: {
http-types lens monad-control monad-logger mtl network nqe
optparse-applicative random rocksdb-haskell-jprupp rocksdb-query
scotty stm string-conversions text time transformers unliftio
- unordered-containers wai warp wreq
+ unordered-containers vault wai wai-extra warp wreq
];
testHaskellDepends = [
aeson aeson-pretty base base16 base64 bytes bytestring cereal
@@ -120945,7 +121240,7 @@ self: {
http-types lens monad-control monad-logger mtl network nqe
QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty stm
string-conversions text time transformers unliftio
- unordered-containers wai warp wreq
+ unordered-containers vault wai wai-extra warp wreq
];
testToolDepends = [ hspec-discover ];
description = "Storage and index for Bitcoin and Bitcoin Cash";
@@ -120963,8 +121258,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store-data";
- version = "0.49.0";
- sha256 = "1v9zb3m1pvhbqm6pxzy2w8ipyxnv80gw8xlsr25fj0g2ylifkjb2";
+ version = "0.51.0";
+ sha256 = "12p8caxi77hqy420bix3h3a427m5hq4vwwwgf1g4cmava7c0p7wq";
libraryHaskellDepends = [
aeson base binary bytes bytestring cereal containers data-default
deepseq hashable haskoin-core http-client http-types lens mtl
@@ -122428,7 +122723,7 @@ self: {
sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8";
libraryHaskellDepends = [ base haste-compiler transformers ];
description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
@@ -122569,7 +122864,7 @@ self: {
base cmdargs process split tasty tasty-hunit tasty-quickcheck
];
description = "Hath manipulates network blocks in CIDR notation";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"hats" = callPackage
@@ -122998,7 +123293,7 @@ self: {
base directory ghc ghc-mod ghc-paths libhbb
];
description = "Haskell Busy Bee, a backend for text editors";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -123086,7 +123381,7 @@ self: {
optparse-applicative parsec primitive text transformers vector
];
description = "An optimizing Brainfuck compiler and evaluator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -123339,7 +123634,7 @@ self: {
array attoparsec base containers hlint hspec QuickCheck text
];
description = "Chess library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -123514,8 +123809,10 @@ self: {
libraryHaskellDepends = [ base unix ];
librarySystemDepends = [ bluetooth cwiid ];
description = "Library to interface with the wiimote";
- license = lib.licenses.gpl2;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ license = lib.licenses.gpl2Only;
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {bluetooth = null; inherit (pkgs) cwiid;};
"hdaemonize" = callPackage
@@ -123881,7 +124178,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base directory process unix vty ];
description = "a small display manager";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -124002,7 +124299,7 @@ self: {
];
benchmarkHaskellDepends = [ base criterion deepseq primitive ];
description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -124051,8 +124348,8 @@ self: {
}:
mkDerivation {
pname = "headroom";
- version = "0.4.0.0";
- sha256 = "1xjm84k6wpi7b5w9pjf1siwy4c59rfsgmrg5cbjhznrv8mzvpygw";
+ version = "0.4.1.0";
+ sha256 = "1f98x1qm567wsa58nyavj7lfi2fmm6zrmjc0cwg0dyhvi63n9qp0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -124235,7 +124532,7 @@ self: {
vector
];
description = "Find and annotate ITDs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -124260,7 +124557,7 @@ self: {
pipes pipes-text safe text turtle vector
];
description = "Find and annotate ITDs with assembly or read pair joining";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -124424,30 +124721,6 @@ self: {
}) {};
"hedgehog" = callPackage
- ({ mkDerivation, ansi-terminal, async, base, bytestring
- , concurrent-output, containers, deepseq, directory, erf
- , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show
- , primitive, random, resourcet, stm, template-haskell, text, time
- , transformers, transformers-base, wl-pprint-annotated
- }:
- mkDerivation {
- pname = "hedgehog";
- version = "1.0.4";
- sha256 = "16j60k0xg74861b5a5n9brx1pgwa2yg76v8q8drmhlx46ga5fwdz";
- libraryHaskellDepends = [
- ansi-terminal async base bytestring concurrent-output containers
- deepseq directory erf exceptions lifted-async mmorph monad-control
- mtl pretty-show primitive random resourcet stm template-haskell
- text time transformers transformers-base wl-pprint-annotated
- ];
- testHaskellDepends = [
- base containers mmorph mtl pretty-show text transformers
- ];
- description = "Release with confidence";
- license = lib.licenses.bsd3;
- }) {};
-
- "hedgehog_1_0_5" = callPackage
({ mkDerivation, ansi-terminal, async, base, bytestring
, concurrent-output, containers, deepseq, directory, erf
, exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show
@@ -124469,7 +124742,6 @@ self: {
];
description = "Release with confidence";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"hedgehog-checkers" = callPackage
@@ -124509,8 +124781,8 @@ self: {
}:
mkDerivation {
pname = "hedgehog-classes";
- version = "0.2.5.1";
- sha256 = "0gyq9dr25sz14yw5x8jlb73l2hzv92r1c6cfan7lygq7z0yaiw6b";
+ version = "0.2.5.2";
+ sha256 = "0h9givw1l83l8z59w6y1rjcnply297b2iag3qhy1rmcjyq3d6m0m";
libraryHaskellDepends = [
aeson base binary comonad containers hedgehog pretty-show primitive
semirings silently transformers vector wl-pprint-annotated
@@ -125208,7 +125480,7 @@ self: {
base containers Lucu mtl network regex-posix
];
description = "Simple, distributed, anonymous data sharing network";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -125766,7 +126038,7 @@ self: {
mtl optparse-applicative semigroups split vty
];
description = "A command-line manager for delicious kitchen recipes";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -126324,17 +126596,18 @@ self: {
}) {};
"hexpat-streamparser" = callPackage
- ({ mkDerivation, base, bytestring, hexpat, List, mtl
+ ({ mkDerivation, base, bytestring, hexpat, hspec, List, mtl
, parser-combinators, text, transformers
}:
mkDerivation {
pname = "hexpat-streamparser";
- version = "0.0.2";
- sha256 = "11g78dkr9dp4kgz8zmckgq66587qahdhxyhcn03ajr0b07ab27z3";
+ version = "0.1.1";
+ sha256 = "13wn89aw2fqhirrdshmdh1xqhihx4h5pgmp4x9lspy2jfrpga9f5";
libraryHaskellDepends = [
base bytestring hexpat List mtl parser-combinators text
transformers
];
+ testHaskellDepends = [ base hexpat hspec ];
license = lib.licenses.bsd3;
}) {};
@@ -127175,7 +127448,7 @@ self: {
libraryToolDepends = [ c2hs ];
testHaskellDepends = [ base directory hspec ];
description = "Unofficial bindings for GRIB API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {grib_api = null;};
@@ -127430,8 +127703,8 @@ self: {
}:
mkDerivation {
pname = "hie-bios";
- version = "0.7.4";
- sha256 = "05ad47ll6vxi7say4f7zf13npcjpqbwb42pqs2bmxslif6rl9sdh";
+ version = "0.7.5";
+ sha256 = "0k8g1qkxqqa0ld15s82mvkgsm4icm65dkabsv8sd2mkrhck0lfw8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -127618,7 +127891,7 @@ self: {
filepath hmatrix lens optparse-generic safe text text-show vector
];
description = "Hierarchical spectral clustering of a graph";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -127984,7 +128257,7 @@ self: {
base bytestring directory gtk HTTP http-conduit network temporary
];
description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -128288,8 +128561,8 @@ self: {
}:
mkDerivation {
pname = "hint";
- version = "0.9.0.3";
- sha256 = "0kp2hngmk2sf4ariv02rgrrd190zzb7nlk0pj8fq7rsckcxc87ra";
+ version = "0.9.0.4";
+ sha256 = "0hdhnkldscq3hp5xn5ns79f6cd6bw6ih6k550d5c38sdqypx73ns";
libraryHaskellDepends = [
base directory exceptions filepath ghc ghc-boot ghc-paths random
temporary transformers unix
@@ -128969,7 +129242,7 @@ self: {
tasty-quickcheck text transformers unordered-containers
];
description = "Majority Judgment";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hjugement-cli" = callPackage
@@ -128998,7 +129271,7 @@ self: {
time transformers unix unordered-containers
];
description = "Majority Judgment and Helios-C command line tool";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -129027,7 +129300,7 @@ self: {
transformers
];
description = "A cryptographic protocol for the Majority Judgment";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hkd" = callPackage
@@ -129110,7 +129383,7 @@ self: {
simple-cmd-args typed-process xdg-basedir
];
description = "Simple Hackage release workflow for package maintainers";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hkt" = callPackage
@@ -129254,7 +129527,7 @@ self: {
utility-ht wizards
];
description = "Command-line interface for the hledger accounting system";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ peti ];
}) {};
@@ -129279,7 +129552,7 @@ self: {
wai-extra warp
];
description = "Web API server for the hledger accounting tool";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -129314,7 +129587,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base hledger-lib text time ];
description = "Compares the transactions in two ledger files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hledger-flow" = callPackage
@@ -129339,7 +129612,7 @@ self: {
base containers foldl HUnit path path-io stm text turtle
];
description = "An hledger workflow focusing on automated statement import and classification";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hledger-iadd" = callPackage
@@ -129351,8 +129624,8 @@ self: {
}:
mkDerivation {
pname = "hledger-iadd";
- version = "1.3.13";
- sha256 = "19i5cr11zm4d27x2gddxy4993jgmf4ghgpvx8fw4acadwbvlnjvg";
+ version = "1.3.14";
+ sha256 = "0kcw8yp9g6cj6amc4rh8iwzd4zh5v68ns8sf5rv4hfa4xj928iy5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -129445,7 +129718,7 @@ self: {
unordered-containers utf8-string
];
description = "A reusable library providing the core functionality of hledger";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hledger-makeitso" = callPackage
@@ -129466,7 +129739,7 @@ self: {
base containers foldl HUnit stm text turtle
];
description = "An hledger workflow focusing on automated statement import and classification";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hledger-stockquotes" = callPackage
@@ -129512,7 +129785,7 @@ self: {
split text text-zipper time transformers unix vector vty
];
description = "Curses-style terminal interface for the hledger accounting system";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ peti ];
}) {};
@@ -129567,7 +129840,7 @@ self: {
base hledger hledger-lib hspec text yesod yesod-test
];
description = "Web-based user interface for the hledger accounting system";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ peti ];
}) {};
@@ -129582,7 +129855,7 @@ self: {
libraryPkgconfigDepends = [ libbladeRF ];
testHaskellDepends = [ base hlint ];
description = "Haskell binding to libBladeRF SDR library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) libbladeRF;};
@@ -129684,6 +129957,32 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "hlint_3_3" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
+ , containers, cpphs, data-default, directory, extra, file-embed
+ , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex
+ , hscolour, process, refact, text, transformers, uniplate
+ , unordered-containers, utf8-string, vector, yaml
+ }:
+ mkDerivation {
+ pname = "hlint";
+ version = "3.3";
+ sha256 = "1cbmaw3ikni2fqkzyngc6qwg8k6ighy48979msfs97qg0kxjmbbd";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal base bytestring cmdargs containers cpphs
+ data-default directory extra file-embed filepath filepattern
+ ghc-lib-parser ghc-lib-parser-ex hscolour process refact text
+ transformers uniplate unordered-containers utf8-string vector yaml
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Source code suggestions";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hlint-test" = callPackage
({ mkDerivation, base, hlint }:
mkDerivation {
@@ -129881,6 +130180,8 @@ self: {
pname = "hls-explicit-imports-plugin";
version = "1.0.0.0";
sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w";
+ revision = "1";
+ editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92";
libraryHaskellDepends = [
aeson base containers deepseq ghc ghcide hls-plugin-api lsp
lsp-types shake text unordered-containers
@@ -129963,6 +130264,25 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "hls-retrie-plugin_1_0_0_1" = callPackage
+ ({ mkDerivation, aeson, base, containers, deepseq, directory, extra
+ , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie
+ , safe-exceptions, shake, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "hls-retrie-plugin";
+ version = "1.0.0.1";
+ sha256 = "0vshnnh8x2n0kn7hh04z00mkdmw3130b3mmfrm3z4ygia852hzmq";
+ libraryHaskellDepends = [
+ aeson base containers deepseq directory extra ghc ghcide hashable
+ hls-plugin-api lsp lsp-types retrie safe-exceptions shake text
+ transformers unordered-containers
+ ];
+ description = "Retrie integration plugin for Haskell Language Server";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hls-splice-plugin" = callPackage
({ mkDerivation, aeson, base, containers, dlist, extra, foldl, ghc
, ghc-exactprint, ghcide, hls-plugin-api, lens, lsp, retrie, shake
@@ -130163,7 +130483,7 @@ self: {
libraryHaskellDepends = [ base containers hmatrix ];
librarySystemDepends = [ glpk ];
description = "Linear Programming based on GLPK";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs) glpk;};
"hmatrix-gsl" = callPackage
@@ -130178,7 +130498,7 @@ self: {
];
libraryPkgconfigDepends = [ gsl ];
description = "Numerical computation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs) gsl;};
"hmatrix-gsl-stats" = callPackage
@@ -130240,7 +130560,7 @@ self: {
isExecutable = true;
libraryHaskellDepends = [ base hmatrix ];
description = "NIPALS method for Principal Components Analysis on large data-sets";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -130303,7 +130623,7 @@ self: {
sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz";
libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
description = "Interface to GSL special functions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hmatrix-static" = callPackage
@@ -130381,7 +130701,7 @@ self: {
base haskell-src-exts haskell-src-meta hmatrix template-haskell
];
description = "MATLAB-like syntax for hmatrix vectors and matrices";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -130589,6 +130909,8 @@ self: {
pname = "hmm-lapack";
version = "0.4";
sha256 = "0f0xf1fjsqqfimxx7skdwddw8zbdmas3l31y6921mxzy1syys30w";
+ revision = "1";
+ editedCabalFile = "10dg0s6nrvb93ksyzgappmr28av4k204kmc8lb3vc2ribqhpb177";
libraryHaskellDepends = [
base comfort-array containers deepseq explicit-exception
fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat
@@ -130813,13 +131135,14 @@ self: {
, containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
, cryptohash-sha512, directory, filepath, hashable, lifted-base
, monad-control, mtl, nix-derivation, process, saltine, tasty
- , tasty-golden, tasty-hspec, tasty-hunit, tasty-quickcheck
- , temporary, text, time, unix, unordered-containers, vector
+ , tasty-discover, tasty-golden, tasty-hspec, tasty-hunit
+ , tasty-quickcheck, temporary, text, time, unix
+ , unordered-containers, vector
}:
mkDerivation {
pname = "hnix-store-core";
- version = "0.4.1.0";
- sha256 = "05yblps7x9r4hwszinx2s4rcfr8q1d1y6r29mn6jzydjwvdyhgj0";
+ version = "0.4.2.0";
+ sha256 = "02i7vxhpaqwyjvd6w2raxjz7r0xxs37x5b6pq9rw6l1l0k18nx5i";
libraryHaskellDepends = [
algebraic-graphs attoparsec base base16-bytestring
base64-bytestring bytestring cereal containers cryptohash-md5
@@ -130832,6 +131155,7 @@ self: {
bytestring containers directory filepath process tasty tasty-golden
tasty-hspec tasty-hunit tasty-quickcheck temporary text unix
];
+ testToolDepends = [ tasty-discover ];
description = "Core effects for interacting with the Nix store";
license = lib.licenses.asl20;
}) {};
@@ -130843,8 +131167,8 @@ self: {
}:
mkDerivation {
pname = "hnix-store-remote";
- version = "0.4.1.0";
- sha256 = "1w6x756hh7429ci2kdsl9psxbsq8k829x802dblv652d33wl0fkc";
+ version = "0.4.2.0";
+ sha256 = "17v785dql4rl2yn1qdagvnyx8y9r3bd02npg51mfqhl49knd92fr";
libraryHaskellDepends = [
attoparsec base binary bytestring containers hnix-store-core mtl
network nix-derivation text time unordered-containers
@@ -131022,7 +131346,7 @@ self: {
base containers gtk3 gtksourceview3 hspec mtl text
];
description = "A source code editor aiming for the convenience of use";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -131496,7 +131820,7 @@ self: {
];
description = "DirectSound extension (Windows) for the Hommage sound library";
license = "GPL";
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"homoiconic" = callPackage
@@ -131519,8 +131843,8 @@ self: {
}:
mkDerivation {
pname = "homotuple";
- version = "0.1.2.1";
- sha256 = "1jhw6mby17wz0jiqxjj59qfvcy9dgd8gm5z0ak3qzr1xrd652fa8";
+ version = "0.2.0.0";
+ sha256 = "17vr2g8jv71k2bwv5x973xjjxacr5br4xlngxjpzbq6xk9n37laf";
setupHaskellDepends = [ base Cabal directory ];
libraryHaskellDepends = [ base OneTuple Only single-tuple ];
description = "Homotuple, all whose elements are the same type";
@@ -131672,7 +131996,7 @@ self: {
array astar base containers hfov monad-loops mtl ncurses random
];
description = "A small, toy roguelike";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -131694,7 +132018,7 @@ self: {
];
executableHaskellDepends = [ base cmdargs hoodle-core ];
description = "Executable for hoodle";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -131773,7 +132097,7 @@ self: {
unordered-containers xournal-parser
];
description = "extra hoodle tools";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -132182,9 +132506,7 @@ self: {
base haskell-src hoppy-generator hoppy-runtime
];
description = "C++ FFI generator - Documentation";
- license = lib.licenses.agpl3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licenses.agpl3Only;
}) {};
"hoppy-generator" = callPackage
@@ -132200,9 +132522,7 @@ self: {
process temporary text
];
description = "C++ FFI generator - Code generator";
- license = lib.licenses.agpl3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licenses.agpl3Only;
}) {};
"hoppy-runtime" = callPackage
@@ -132218,8 +132538,6 @@ self: {
];
description = "C++ FFI generator - Runtime support";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"hoppy-std" = callPackage
@@ -132234,8 +132552,6 @@ self: {
];
description = "C++ FFI generator - Standard library bindings";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"hops" = callPackage
@@ -132288,7 +132604,7 @@ self: {
];
executableToolDepends = [ alex happy ];
description = "A language based on homotopy type theory with an interval type";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -132357,7 +132673,7 @@ self: {
time transformers
];
description = "Haskell Open Sound Control";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hosc-json" = callPackage
@@ -132456,7 +132772,7 @@ self: {
attoparsec base bytestring data-default dns iproute network
];
description = "An dns server which is extremely easy to config";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -133448,7 +133764,7 @@ self: {
sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc";
libraryHaskellDepends = [ base vector ];
description = "A nice implementation of the k-Means algorithm";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -133976,7 +134292,7 @@ self: {
base containers directory filepath megaparsec
];
description = "Conllu validating parser and utils";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -134577,6 +134893,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "hs-tags" = callPackage
+ ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
+ , mtl, process, strict
+ }:
+ mkDerivation {
+ pname = "hs-tags";
+ version = "0.1.5";
+ sha256 = "0gy894sr2557a6pmvi99dkn03990r43ycxknryxym62z54bz1q8f";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base Cabal containers directory filepath ghc mtl process strict
+ ];
+ description = "Create tag files (ctags and etags) for Haskell code";
+ license = lib.licenses.mit;
+ }) {};
+
"hs-twitter" = callPackage
({ mkDerivation, base, HTTP, json, mime, network, old-locale
, old-time, random, utf8-string
@@ -134631,8 +134964,8 @@ self: {
}:
mkDerivation {
pname = "hs-watchman";
- version = "0.0.0.3";
- sha256 = "1cqhl4gydk8i003p49cy7dcvhw0rgrc4j2l54271y4cqgkd8pkfi";
+ version = "0.0.1.0";
+ sha256 = "1550rfmvqgm1ak9n9kj1mv1vn7rfdangk8g9a40qwry5s4b0aihi";
libraryHaskellDepends = [
async base binary bytestring containers filepath network process
temporary
@@ -134801,7 +135134,7 @@ self: {
libraryHaskellDepends = [ base lens ];
testHaskellDepends = [ base HUnit lens ];
description = "PID control loop";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"hsSqlite3" = callPackage
@@ -134950,7 +135283,7 @@ self: {
enableSeparateDataOutput = true;
executableHaskellDepends = [ base Hclip HTTP process unix ];
description = "(ab)Use Google Translate as a speech synthesiser";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -135113,7 +135446,7 @@ self: {
transformers vector
];
description = "Haskell SuperCollider";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -135562,7 +135895,7 @@ self: {
natural-transformation profunctors text unordered-containers vector
];
description = "Describe schemas for your Haskell data types";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"hschema-aeson" = callPackage
@@ -135591,7 +135924,7 @@ self: {
scientific text time unordered-containers vector
];
description = "Describe schemas for your Haskell data types";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"hschema-prettyprinter" = callPackage
@@ -135609,7 +135942,7 @@ self: {
vector
];
description = "Describe schemas for your Haskell data types";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"hschema-quickcheck" = callPackage
@@ -135626,7 +135959,7 @@ self: {
quickcheck-instances text unordered-containers vector
];
description = "Describe schemas for your Haskell data types";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"hsclock" = callPackage
@@ -135837,7 +136170,7 @@ self: {
libraryHaskellDepends = [ base containers network ];
librarySystemDepends = [ adns ];
description = "Asynchronous DNS Resolver";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ peti ];
}) {inherit (pkgs) adns;};
@@ -136004,7 +136337,7 @@ self: {
sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q";
libraryHaskellDepends = [ base containers language-puppet text ];
description = "A small and ugly library that emulates the output of the puppet facter program";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -136449,28 +136782,6 @@ self: {
}) {};
"hslua" = callPackage
- ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3
- , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit
- , tasty-quickcheck, text
- }:
- mkDerivation {
- pname = "hslua";
- version = "1.2.0";
- sha256 = "0a295zqpbrv8a2hw7msz5p7brlswag16sg08dyz399ij6b7q5x0h";
- configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
- libraryHaskellDepends = [
- base bytestring containers exceptions mtl text
- ];
- librarySystemDepends = [ lua5_3 ];
- testHaskellDepends = [
- base bytestring containers exceptions mtl QuickCheck
- quickcheck-instances tasty tasty-hunit tasty-quickcheck text
- ];
- description = "Bindings to Lua, an embeddable scripting language";
- license = lib.licenses.mit;
- }) {inherit (pkgs) lua5_3;};
-
- "hslua_1_3_0_1" = callPackage
({ mkDerivation, base, bytestring, containers, exceptions, lua5_3
, mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit
, tasty-quickcheck, text
@@ -136490,7 +136801,6 @@ self: {
];
description = "Bindings to Lua, an embeddable scripting language";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) lua5_3;};
"hslua-aeson" = callPackage
@@ -136611,7 +136921,7 @@ self: {
libraryHaskellDepends = [ base colour ];
testHaskellDepends = [ aeson base bytestring colour containers ];
description = "HSLuv conversion utility";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -136640,9 +136950,10 @@ self: {
hydraPlatforms = lib.platforms.none;
broken = true;
}) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null;
- jasper = null; inherit (pkgs) lcms; inherit (pkgs) libjpeg;
- inherit (pkgs) libpng; inherit (pkgs) libxml2; tiff = null;
- wmflite = null; inherit (pkgs) zlib;};
+ inherit (pkgs) jasper; inherit (pkgs) lcms;
+ inherit (pkgs) libjpeg; inherit (pkgs) libpng;
+ inherit (pkgs) libxml2; tiff = null; wmflite = null;
+ inherit (pkgs) zlib;};
"hsmisc" = callPackage
({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec
@@ -136702,7 +137013,7 @@ self: {
librarySystemDepends = [ libsndfile ];
libraryToolDepends = [ c2hs ];
description = "Haskell bindings for libsndfile";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) libsndfile;};
"hsndfile-storablevector" = callPackage
@@ -136713,7 +137024,7 @@ self: {
sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z";
libraryHaskellDepends = [ base hsndfile storablevector ];
description = "Haskell bindings for libsndfile (Data.StorableVector interface)";
- license = lib.licenses.lgpl2;
+ license = lib.licenses.lgpl2Only;
}) {};
"hsndfile-vector" = callPackage
@@ -136724,7 +137035,7 @@ self: {
sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig";
libraryHaskellDepends = [ base hsndfile vector ];
description = "Haskell bindings for libsndfile (Data.Vector interface)";
- license = lib.licenses.lgpl2;
+ license = lib.licenses.lgpl2Only;
}) {};
"hsnock" = callPackage
@@ -137252,6 +137563,28 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "hspec-golden-aeson_0_9_0_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+ , filepath, hspec, hspec-core, HUnit, QuickCheck
+ , quickcheck-arbitrary-adt, random, silently, transformers
+ }:
+ mkDerivation {
+ pname = "hspec-golden-aeson";
+ version = "0.9.0.0";
+ sha256 = "1mj516xn6an2pkygfzm2418hbvaf8yvgwgvmpgpwrxqss87m3c84";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring directory filepath hspec HUnit
+ QuickCheck quickcheck-arbitrary-adt random transformers
+ ];
+ testHaskellDepends = [
+ aeson base directory hspec hspec-core QuickCheck
+ quickcheck-arbitrary-adt silently transformers
+ ];
+ description = "Use tests to monitor changes in Aeson serialization";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hspec-hashable" = callPackage
({ mkDerivation, base, hashable, hspec, hspec-core, QuickCheck
, silently
@@ -137658,8 +137991,8 @@ self: {
}:
mkDerivation {
pname = "hspec-wai";
- version = "0.10.1";
- sha256 = "05jv0cz8r8bf63ma5byjb2gkj9vwgnls4n9mks99qc525n055ckz";
+ version = "0.11.0";
+ sha256 = "0fk23vrs5apjy11z47mply2kay3n193gnyrbb9fkpwvmxyhxlp0x";
libraryHaskellDepends = [
base base-compat bytestring case-insensitive hspec-core
hspec-expectations http-types QuickCheck text transformers wai
@@ -137699,23 +138032,6 @@ self: {
}) {};
"hspec-wai-json" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, bytestring
- , case-insensitive, hspec, hspec-wai, template-haskell
- }:
- mkDerivation {
- pname = "hspec-wai-json";
- version = "0.10.1";
- sha256 = "04mpqij446ki5l6xwi3bjmlf3ggjia2nzv8j62mdy6ick96dqwk6";
- libraryHaskellDepends = [
- aeson aeson-qq base bytestring case-insensitive hspec-wai
- template-haskell
- ];
- testHaskellDepends = [ base hspec hspec-wai ];
- description = "Testing JSON APIs with hspec-wai";
- license = lib.licenses.mit;
- }) {};
-
- "hspec-wai-json_0_11_0" = callPackage
({ mkDerivation, aeson, aeson-qq, base, bytestring
, case-insensitive, hspec, hspec-wai, template-haskell
}:
@@ -137730,7 +138046,6 @@ self: {
testHaskellDepends = [ base hspec hspec-wai ];
description = "Testing JSON APIs with hspec-wai";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"hspec-webdriver" = callPackage
@@ -137775,7 +138090,7 @@ self: {
sha256 = "0y45jizkf2kfj3yjjkq96kavkfp74vf5dyyjvi9pj3kshf8sx8il";
libraryHaskellDepends = [ base hspec QuickCheckVariant ];
description = "Spec for testing properties for variant types";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -137866,7 +138181,7 @@ self: {
test-framework-hunit
];
description = "The Haskell Stream Processor command line utility";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -138162,18 +138477,6 @@ self: {
}) {};
"hsshellscript" = callPackage
- ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
- mkDerivation {
- pname = "hsshellscript";
- version = "3.4.5";
- sha256 = "0d66gsm7s2j4f60cjca6fsddg4i1m3l6rcyq29ywskifhfaxbgvx";
- libraryHaskellDepends = [ base directory parsec random unix ];
- libraryToolDepends = [ c2hs ];
- description = "Haskell for Unix shell scripting tasks";
- license = "LGPL";
- }) {};
-
- "hsshellscript_3_5_0" = callPackage
({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
mkDerivation {
pname = "hsshellscript";
@@ -138183,7 +138486,6 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Haskell for Unix shell scripting tasks";
license = "LGPL";
- hydraPlatforms = lib.platforms.none;
}) {};
"hssourceinfo" = callPackage
@@ -138368,7 +138670,7 @@ self: {
test-framework-quickcheck2
];
description = "Distributed instant messaging over Tor";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
@@ -138396,7 +138698,7 @@ self: {
executableHaskellDepends = [ base process ];
testHaskellDepends = [ async base ];
description = "A Tox protocol implementation in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -138843,7 +139145,7 @@ self: {
base containers QuickCheck tasty tasty-quickcheck text transformers
];
description = "Equiprobable draw from publicly verifiable random data";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"htlset" = callPackage
@@ -138891,7 +139193,7 @@ self: {
base bytestring doctest doctest-discover hlint QuickCheck
];
description = "Determine character encoding of HTML documents/fragments";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -139262,7 +139564,7 @@ self: {
htsn-common hxt MissingH network process tasty tasty-hunit unix
];
description = "Parse XML files from The Sports Network feed";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -139277,7 +139579,7 @@ self: {
ansi-terminal base hslogger transformers
];
description = "Display/logging facilities used by both htsn and htsn-import";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"htsn-import" = callPackage
@@ -139306,7 +139608,7 @@ self: {
split tasty tasty-hunit time transformers tuple
];
description = "Import XML files from The Sports Network into an RDBMS";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -139340,18 +139642,16 @@ self: {
({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat
, bytestring, containers, cookie, hashable, hspec, hspec-discover
, http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged
- , text, time-compat, unordered-containers, uuid-types
+ , text, time-compat, transformers, unordered-containers, uuid-types
}:
mkDerivation {
pname = "http-api-data";
- version = "0.4.1.1";
- sha256 = "1s93m2vh4c1p073xasvknnj3czbf8xsyg48kyznr4jwfhzi17anh";
- revision = "1";
- editedCabalFile = "1dshqb1140nj4h8d750s97gmzb2rk0ppr1rakvqxy1r79mg3m2wr";
+ version = "0.4.2";
+ sha256 = "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl";
libraryHaskellDepends = [
attoparsec attoparsec-iso8601 base base-compat bytestring
containers cookie hashable http-types tagged text time-compat
- unordered-containers uuid-types
+ transformers unordered-containers uuid-types
];
testHaskellDepends = [
base base-compat bytestring cookie hspec HUnit nats QuickCheck
@@ -140010,30 +140310,6 @@ self: {
}) {};
"http-link-header" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring
- , bytestring-conversion, criterion, directory, errors, hspec
- , hspec-attoparsec, http-api-data, network-uri, QuickCheck, text
- , transformers
- }:
- mkDerivation {
- pname = "http-link-header";
- version = "1.0.3.1";
- sha256 = "0b9a3kax6zvn8aaflys63lanqan65hsv0dr8vwhbpbhyvxrxn9ns";
- libraryHaskellDepends = [
- attoparsec base bytestring bytestring-conversion errors
- http-api-data network-uri text
- ];
- testHaskellDepends = [
- base hspec hspec-attoparsec QuickCheck text
- ];
- benchmarkHaskellDepends = [
- base criterion directory network-uri text transformers
- ];
- description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
- license = lib.licenses.publicDomain;
- }) {};
-
- "http-link-header_1_2_0" = callPackage
({ mkDerivation, attoparsec, base, bytestring, criterion, directory
, errors, hspec, hspec-attoparsec, http-api-data, network-uri
, QuickCheck, text, transformers
@@ -140055,7 +140331,6 @@ self: {
];
description = "A parser and writer for the HTTP Link header per RFC 5988";
license = lib.licenses.publicDomain;
- hydraPlatforms = lib.platforms.none;
}) {};
"http-listen" = callPackage
@@ -140476,39 +140751,6 @@ self: {
}) {};
"http2" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, array, base
- , base16-bytestring, bytestring, case-insensitive, containers
- , directory, doctest, filepath, gauge, Glob, heaps, hspec
- , http-types, mwc-random, network, network-byte-order, psqueues
- , stm, text, time-manager, unordered-containers, vector
- }:
- mkDerivation {
- pname = "http2";
- version = "2.0.5";
- sha256 = "1rg6dnkx2yxcdp87r1vdpyxacqv7jgxiq3bb1hjz45v5jk1xj676";
- revision = "1";
- editedCabalFile = "0xxi7gcldh3fvnh98khw9f2vm5w85sakbb6165s779nkvq7p8ak2";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- array base bytestring case-insensitive containers http-types
- network network-byte-order psqueues stm time-manager
- ];
- testHaskellDepends = [
- aeson aeson-pretty array base base16-bytestring bytestring
- case-insensitive containers directory doctest filepath Glob hspec
- http-types network network-byte-order psqueues stm text
- time-manager unordered-containers vector
- ];
- benchmarkHaskellDepends = [
- array base bytestring case-insensitive containers gauge heaps
- mwc-random network-byte-order psqueues stm
- ];
- description = "HTTP/2 library";
- license = lib.licenses.bsd3;
- }) {};
-
- "http2_2_0_6" = callPackage
({ mkDerivation, aeson, aeson-pretty, array, base
, base16-bytestring, bytestring, case-insensitive, containers
, directory, doctest, filepath, gauge, Glob, heaps, hspec
@@ -140537,7 +140779,6 @@ self: {
];
description = "HTTP/2 library";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"http2-client" = callPackage
@@ -140632,6 +140873,8 @@ self: {
];
description = "Encoders based on `proto3-wire` for gRPC over HTTP2";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"http2-grpc-types" = callPackage
@@ -140697,7 +140940,7 @@ self: {
base directory filepath functor-infix text
];
description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -140760,7 +141003,7 @@ self: {
];
testSystemDepends = [ tvm_runtime ];
description = "Bindings for TVM machine learning framework";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {tvm_runtime = null;};
@@ -141324,7 +141567,7 @@ self: {
];
executableHaskellDepends = [ base directory network-uri ];
description = "Haskell URL resolver";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -141500,7 +141743,7 @@ self: {
sha256 = "0g2h5is0gbr43fn8pbfj2nzh4wlgx6kjayq4lcnbr10z0j3vpqpv";
libraryHaskellDepends = [ base hvega text ];
description = "Theme for hvega";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"hw-aeson" = callPackage
@@ -141511,8 +141754,8 @@ self: {
pname = "hw-aeson";
version = "0.1.1.0";
sha256 = "0d50yghgnxhynbm6w5kgkhgr8xgnghr8g1xn7zf0p9ax8dxkdy00";
- revision = "1";
- editedCabalFile = "0akwsfw024i8i8w8y1h2wdp9vqd7ws5jfyb5v5d9yckjk3sa2wn1";
+ revision = "2";
+ editedCabalFile = "062g7zwbp9csgcbpbbyg6ckb8zhkx1kqk5dsms36fmx95dq4zl5j";
libraryHaskellDepends = [ aeson base text ];
testHaskellDepends = [
aeson base doctest doctest-discover hedgehog hspec
@@ -141580,6 +141823,8 @@ self: {
pname = "hw-balancedparens";
version = "0.4.1.1";
sha256 = "16v36fj5aawnx6glarzljl3yb93zkn06ij5cg40zba5rp8jhpg7z";
+ revision = "1";
+ editedCabalFile = "0jh79y6wl0ml4fc59icbg35nvcz7zi0fqbbg0p6y7nkxnhv4yc0j";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141614,8 +141859,8 @@ self: {
pname = "hw-bits";
version = "0.7.2.1";
sha256 = "18l9r0yhddkzgbc2vvk0qr9brb5ih25zjfga3bddb5j8gpaaq65q";
- revision = "1";
- editedCabalFile = "14y67p3rsj97rzlh2cw7iy04gb6cfa977bjbr35vgkav0skbigbn";
+ revision = "2";
+ editedCabalFile = "1almm4nl56gf99wys1kzalqcz0dkaih0pgxsyqv4q1j1w3ggfmfq";
libraryHaskellDepends = [
base bitvec bytestring deepseq hw-int hw-prim hw-string-parse
vector
@@ -141663,6 +141908,8 @@ self: {
pname = "hw-conduit";
version = "0.2.1.0";
sha256 = "1xnkkpqcgyii7f16jjh2k2qh4ydpsff5q2xnggyg4jf7m69yrih2";
+ revision = "1";
+ editedCabalFile = "1rmdwb4a7ax9yadj4xv63n582vsmk84h03qkr6npj9b9gw4qw6i3";
libraryHaskellDepends = [
array base bytestring conduit conduit-combinators time transformers
unliftio-core word8
@@ -141701,6 +141948,8 @@ self: {
pname = "hw-diagnostics";
version = "0.0.1.0";
sha256 = "111g54c5bhgjii6vbyb116bg3dxywa9l693r8xjjrxpamzvi0avj";
+ revision = "1";
+ editedCabalFile = "04qpkr54wkb99hdfzk6gxhi6ak5lc564jzab1cc7675s7lsj1nji";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest doctest-discover ];
testToolDepends = [ doctest-discover ];
@@ -141720,8 +141969,8 @@ self: {
pname = "hw-dsv";
version = "0.4.1.0";
sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8";
- revision = "2";
- editedCabalFile = "1l7aww6nci05ns7hnk46r20as3xy1j0s5fxsrb5w0x9y2kwvqj61";
+ revision = "3";
+ editedCabalFile = "066vlpy361f6r5k74b3myi6lc2g8lxm7cz23i5hhyi319yjp1jxh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141761,8 +142010,8 @@ self: {
pname = "hw-dump";
version = "0.1.1.0";
sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr";
- revision = "2";
- editedCabalFile = "0p6cbijds7vc8bx9rb8s8bwr9dp4qc91idmd64llgz06d9kmvkcs";
+ revision = "3";
+ editedCabalFile = "16wpfpmxp3r1nrzfmcihzfcfhaiwrlq7x7z9kf68aib5zqmdxzwf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141796,8 +142045,8 @@ self: {
pname = "hw-eliasfano";
version = "0.1.2.0";
sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj";
- revision = "2";
- editedCabalFile = "0l7h7pr6gpq0xnp4w003q3dxw7pmv2d6kpx2iqfc3nzzpa562ivv";
+ revision = "3";
+ editedCabalFile = "1g6w3j4azxvikiycjnb4rjsaw8pyica3m17yhsrxq24pms4n35pl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141833,6 +142082,8 @@ self: {
pname = "hw-excess";
version = "0.2.3.0";
sha256 = "0xiyf3xyg6f4kgkils9ycx6q0qcsbd6rw4m9lizw9295mnp05s3g";
+ revision = "1";
+ editedCabalFile = "0qq8svkn9365vdbb0y3y4m2pdklsrf6z3a1m0kyfmbr0vphza369";
libraryHaskellDepends = [
base hw-bits hw-prim hw-rankselect-base safe vector
];
@@ -141856,6 +142107,8 @@ self: {
pname = "hw-fingertree";
version = "0.1.2.0";
sha256 = "0b1aff5aa9ifapyf2qvqggxfm36x5w7l7c37bfy9qdll264pdh0i";
+ revision = "1";
+ editedCabalFile = "0hg9hnga0d15a5md67q7xl53kgp34hwvl4aw9s8xkjm4fs7a54z9";
libraryHaskellDepends = [ base deepseq hw-prim ];
testHaskellDepends = [
base deepseq doctest doctest-discover hedgehog hspec
@@ -141875,6 +142128,8 @@ self: {
pname = "hw-fingertree-strict";
version = "0.1.2.0";
sha256 = "1zhh694m8hbin7059ys8c6sqjvyfsazcsp0jxqg59w5ypqjznzca";
+ revision = "1";
+ editedCabalFile = "0vr8xqvwihg3j83bqfhcqlnlpdq7k2v6kkx1xly7fdjw2hcwgkhl";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [
base doctest doctest-discover hedgehog hspec HUnit
@@ -141893,6 +142148,8 @@ self: {
pname = "hw-hedgehog";
version = "0.1.1.0";
sha256 = "0a2pic2h983kdkai68wabclzwjbk5i9vz229jlwvs0hyw6b0mzz9";
+ revision = "1";
+ editedCabalFile = "1fwgxwbfz6yfj6xfl9471q7fpsckm2wvpb8wxwb32c3x5122ly5v";
libraryHaskellDepends = [ base hedgehog vector ];
testHaskellDepends = [ base doctest doctest-discover ];
testToolDepends = [ doctest-discover ];
@@ -141908,6 +142165,8 @@ self: {
pname = "hw-hspec-hedgehog";
version = "0.1.1.0";
sha256 = "04r30hb4664yciwfl3kyx0xn6sqc6abwhavb4wxiaas8b4px9kyn";
+ revision = "2";
+ editedCabalFile = "16v3dcpm51m8g2va85jfnbxqyc6dds2nazyd31080fa4804a90wz";
libraryHaskellDepends = [
base call-stack hedgehog hspec HUnit transformers
];
@@ -141927,6 +142186,8 @@ self: {
pname = "hw-int";
version = "0.0.2.0";
sha256 = "13ifa28b12hiibhmwas5hn3dmmiz2rihlc837hhii0z1ng03s360";
+ revision = "1";
+ editedCabalFile = "13vc1hvyil8qql2d6ryi2m4a6snhm2v8vghh8s9hr4qx6dzh4irv";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base doctest doctest-discover hedgehog hspec hw-hedgehog
@@ -141947,8 +142208,8 @@ self: {
pname = "hw-ip";
version = "2.4.2.0";
sha256 = "1bvh4fkg1ffr3y8wink62rgkynlcgjhmra7a4w01h1dmw1vb2vfx";
- revision = "1";
- editedCabalFile = "19jbgqsmc71apmr6z0n0a2hgfhv9r0bsqa2x55r8grpyr91blpmw";
+ revision = "2";
+ editedCabalFile = "19x9s7hdch768annsss3paz7sqxqr3flz01wky1vijf18abakk3l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141982,6 +142243,8 @@ self: {
pname = "hw-json";
version = "1.3.2.2";
sha256 = "03h5zv94ndsz4vh0jql8rg8pl95rbf8xkyzvr3r55i3kpmb85sbg";
+ revision = "1";
+ editedCabalFile = "1ivm89r5kqflpsayl941xq0q3izjklakfqzr2f6nl78wpa3ykkiq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -142025,8 +142288,8 @@ self: {
pname = "hw-json-lens";
version = "0.2.1.0";
sha256 = "1v3ws69pyrw5ja00r326kqlq6hd7r5np119fk2la7f74aqhajjf6";
- revision = "1";
- editedCabalFile = "1gxqds8889dzkfncnlncjb7avw4zm7dzj3063mq4rsb05gyrplhz";
+ revision = "2";
+ editedCabalFile = "0n6cxjr2r7w2i735c1dz2cflgvbgcdspzzzg8w3knhl1kgiyi2ih";
libraryHaskellDepends = [
aeson base bytestring containers hw-json lens scientific text word8
];
@@ -142053,8 +142316,8 @@ self: {
pname = "hw-json-simd";
version = "0.1.1.0";
sha256 = "0bpfyx2bd7pcr8y8bfahcdm30bznqixfawraq3xzy476vy9ppa9n";
- revision = "1";
- editedCabalFile = "047s5clxvi3l9x80lnf7nrv7myxnvqmh8y7syb2ryv3m549lyv2q";
+ revision = "2";
+ editedCabalFile = "1amvva0pqidwcjdd4snywm8m614ygc2zn6036fh4v1ps20pyq2l9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring hw-prim lens vector ];
@@ -142084,8 +142347,8 @@ self: {
pname = "hw-json-simple-cursor";
version = "0.1.1.0";
sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl";
- revision = "3";
- editedCabalFile = "0zmq1gb9znb84d9igppww6295glnhg5b6xlgadr435cddp5zmhpx";
+ revision = "4";
+ editedCabalFile = "0mpjnc99yi474h9qvgg48kjcl3hxxhl58gar72bzcf5rx12pyn9w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -142124,8 +142387,8 @@ self: {
pname = "hw-json-standard-cursor";
version = "0.2.3.1";
sha256 = "1mpsspp6ba2zqv38a0rcv93mbwb1rb8snmxklf32g02djj8b4vir";
- revision = "1";
- editedCabalFile = "0gdvwhj2jmd8dm1yi3kzs0lyw5r4bk7c50s21z1600v36bmzpdm1";
+ revision = "2";
+ editedCabalFile = "1qc0nxcahlc0zn4ycfxhhj1qplxc0r8qh20zmq4m2n7wyghlb3hc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -142239,6 +142502,8 @@ self: {
pname = "hw-mquery";
version = "0.2.1.0";
sha256 = "1qhd8jcwffr57mjraw0g3xj9kb0jd75ybqaj1sbxw31lc2hr9w9j";
+ revision = "1";
+ editedCabalFile = "15jji7wzx2ws58nqd965r6bycdgl09qlp4rrcd81y57mq24h27mb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ ansi-wl-pprint base dlist lens ];
@@ -142262,8 +142527,8 @@ self: {
pname = "hw-packed-vector";
version = "0.2.1.0";
sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38";
- revision = "2";
- editedCabalFile = "0hlmi9w5z7j9ycqjf5avx3b09yglcbx8krypv274j2qrm5fzypr4";
+ revision = "3";
+ editedCabalFile = "1zn1aqkyzsa0mk9b7igvnmxas0907h9if96c9km1gjrndnjvxkyd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -142294,6 +142559,8 @@ self: {
pname = "hw-parser";
version = "0.1.1.0";
sha256 = "1zsbw725mw3fn4814qricqanbvx1kgbnqvgwijqgfv8jz7yf5gxa";
+ revision = "1";
+ editedCabalFile = "0yh06ypgvag83h32czz8dpsrc9a4w0pqy3m4jvds8sbgnj45havs";
libraryHaskellDepends = [
attoparsec base bytestring hw-prim text
];
@@ -142330,6 +142597,8 @@ self: {
pname = "hw-prim";
version = "0.6.3.0";
sha256 = "0gqn7s0ki9x951n5whyh0pkcbbqz4kpcn80xxpsv1c0v34946xv7";
+ revision = "1";
+ editedCabalFile = "1z3fcff42xq0j430q72ncjv6zc0zvzzq94ifh06m342z0x8imv83";
libraryHaskellDepends = [
base bytestring deepseq ghc-prim mmap transformers unliftio-core
vector
@@ -142381,8 +142650,8 @@ self: {
pname = "hw-rankselect";
version = "0.13.4.0";
sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7";
- revision = "2";
- editedCabalFile = "03lc8cgijr4ysz0i9c4pjhas4cd5ifxs400cr0nbasjvmz27hr3c";
+ revision = "3";
+ editedCabalFile = "14awklhpnw53jalxfq0446aidndmanpnwjxp1136imjv7p270pvn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -142418,8 +142687,8 @@ self: {
pname = "hw-rankselect-base";
version = "0.3.4.1";
sha256 = "1s0lqwq0rjmjca6lshfnxqi0c7bzlyflhm45xw1xa9pvqci8439h";
- revision = "1";
- editedCabalFile = "0flhrgqgwgxwk6ik3k7322dn8ybyjzh6g1csg2d9bafldj7akcwv";
+ revision = "2";
+ editedCabalFile = "174a3qhkdam5m5rqwb9qzapg2xkd8vb0lirkz2d0xb4xxc0vzcy7";
libraryHaskellDepends = [
base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse
vector
@@ -142447,6 +142716,8 @@ self: {
pname = "hw-simd";
version = "0.1.2.0";
sha256 = "1r202xzqprb1v8ajd9n6ixckjfdy17mn8jibx4j2xgknx595v24f";
+ revision = "1";
+ editedCabalFile = "0vl82knb53njkp7n6jrwp4fpipfkc7s4lsi2cqd6w2xkgmlc0rxv";
libraryHaskellDepends = [
base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
hw-rankselect-base transformers vector
@@ -142470,6 +142741,36 @@ self: {
broken = true;
}) {};
+ "hw-simd-cli" = callPackage
+ ({ mkDerivation, base, bits-extra, bytestring, containers, deepseq
+ , directory, doctest, doctest-discover, generic-lens, hw-bits
+ , hw-prim, hw-rankselect-base, hw-simd, lens, mmap, mtl
+ , optparse-applicative, resourcet, vector
+ }:
+ mkDerivation {
+ pname = "hw-simd-cli";
+ version = "0.0.0.1";
+ sha256 = "0fqkrhjrflkiacq1qfnfiy4rk6pg47j72d0ni0jwfdn6ajx22y90";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bits-extra bytestring containers deepseq directory
+ generic-lens hw-bits hw-prim hw-rankselect-base hw-simd lens mmap
+ mtl optparse-applicative resourcet vector
+ ];
+ executableHaskellDepends = [
+ base bits-extra bytestring containers deepseq directory
+ generic-lens hw-bits hw-prim hw-rankselect-base hw-simd lens mmap
+ mtl optparse-applicative resourcet vector
+ ];
+ testHaskellDepends = [ base bits-extra doctest doctest-discover ];
+ testToolDepends = [ doctest-discover ];
+ description = "SIMD library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-streams" = callPackage
({ mkDerivation, base, bytestring, criterion, directory, doctest
, doctest-discover, exceptions, ghc-prim, hedgehog, hspec
@@ -142480,6 +142781,8 @@ self: {
pname = "hw-streams";
version = "0.0.1.0";
sha256 = "0hzpx1j06h98y0zcmysklzn3s3mvpbb1nkwg4zkbdxvzzqs5hnm5";
+ revision = "1";
+ editedCabalFile = "0fib78604y6cjchah7zhjsfli820ks51qq7yjv81wwbckjjkpw5v";
libraryHaskellDepends = [
base bytestring ghc-prim hw-bits hw-prim mmap primitive
transformers vector
@@ -142612,8 +142915,8 @@ self: {
pname = "hw-xml";
version = "0.5.1.0";
sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4";
- revision = "3";
- editedCabalFile = "0b1lkhc6qf5vqafn69bid01k1hi043k7yrpl7pbxfrn154w8afpm";
+ revision = "4";
+ editedCabalFile = "1hnbcr376pncgzzrbilffxwz5sk67c4d9hzjix3xa94cja09w1ny";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -142703,7 +143006,7 @@ self: {
executableToolDepends = [ alex happy ];
testHaskellDepends = [ array base Cabal containers mtl ];
description = "An implementation of Neil D. Jones' While language";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -142796,7 +143099,7 @@ self: {
containers hedgehog hspec magic-wormhole protolude saltine text
];
description = "magic-wormhole client";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -143339,7 +143642,7 @@ self: {
];
testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
description = "An alternate Prelude";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -143961,7 +144264,7 @@ self: {
scotty stm stm-conduit text transformers
];
description = "A haskell wrapper for the Zulip API";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -144089,7 +144392,7 @@ self: {
attoparsec base bytestring network unix
];
description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -144122,7 +144425,7 @@ self: {
sha256 = "0yrdh4y0ssldg0lmrbr6yk0zg2sihirp3mnh20dvg3m887kdhrj1";
libraryHaskellDepends = [ base dbus directory unix xdg-basedir ];
description = "A simple uncomplete ibus api";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"ical" = callPackage
@@ -144154,8 +144457,8 @@ self: {
}:
mkDerivation {
pname = "ice40-prim";
- version = "0.2.0.0";
- sha256 = "02dm3zqq24phhxis471gp91figkazpwpz0ndhazp14jajxvka0cd";
+ version = "0.3.0.0";
+ sha256 = "0qrpaqmgas3czhw2ppc1f1m4m7y2hc93za2g0rvfw80ncbrkl83s";
libraryHaskellDepends = [
base Cabal clash-prelude ghc-typelits-extra ghc-typelits-knownnat
ghc-typelits-natnormalise interpolate
@@ -144813,7 +145116,7 @@ self: {
transformers wl-pprint-text
];
description = "An keyboard-driven interactive graph editor";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -144833,7 +145136,7 @@ self: {
libraryPkgconfigDepends = [ ige-mac-integration ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Bindings for the Gtk/OS X integration library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {ige-mac-integration = null;};
@@ -145679,7 +145982,7 @@ self: {
parsec richreports split staticanalysis text uxadt
];
description = "Multi-platform parser analyzer and generator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -145770,7 +146073,7 @@ self: {
testHaskellDepends = [ base hspec parsec ];
benchmarkHaskellDepends = [ base criterion parsec ];
description = "A math-inspired programmatic 2D & 3D CAD system";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"implicit-hie" = callPackage
@@ -145829,7 +146132,7 @@ self: {
editedCabalFile = "02x6cmbxyw26y5azhjrx8461vngsj27l0a255xvhg2pl25zwfbfs";
libraryHaskellDepends = [ base mtl time transformers ];
description = "A logging framework built around implicit parameters";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -146204,7 +146507,7 @@ self: {
base bytestring criterion deepseq monoid-subclasses text
];
description = "Generic parser library capable of providing partial results from partial input";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"incremental-sat-solver" = callPackage
@@ -146614,7 +146917,7 @@ self: {
libraryHaskellDepends = [ array base deepseq vector ];
testHaskellDepends = [ array base deepseq QuickCheck text vector ];
description = "Non-contiguous interval data types with potentially infinite ranges";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -146695,7 +146998,7 @@ self: {
];
executableHaskellDepends = [ base optparse-applicative parsec ];
description = "Type inference and checker for JavaScript (experimental)";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -146775,33 +147078,6 @@ self: {
}) {};
"influxdb" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
- , cabal-doctest, clock, containers, doctest, foldl, http-client
- , http-types, lens, network, optional-args, raw-strings-qq
- , scientific, tagged, tasty, tasty-hunit, template-haskell, text
- , time, unordered-containers, vector
- }:
- mkDerivation {
- pname = "influxdb";
- version = "1.9.1";
- sha256 = "1g8lj56xi61g0vfindiz4lmnypjh2bzp2nm92dmh2d4mlfhrh78y";
- isLibrary = true;
- isExecutable = true;
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- aeson attoparsec base bytestring clock containers foldl http-client
- http-types lens network optional-args scientific tagged text time
- unordered-containers vector
- ];
- testHaskellDepends = [
- base containers doctest lens raw-strings-qq tasty tasty-hunit
- template-haskell time vector
- ];
- description = "InfluxDB client library for Haskell";
- license = lib.licenses.bsd3;
- }) {};
-
- "influxdb_1_9_1_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
, cabal-doctest, clock, containers, doctest, foldl, http-client
, http-types, lens, network, optional-args, raw-strings-qq
@@ -146826,7 +147102,6 @@ self: {
];
description = "InfluxDB client library for Haskell";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"informative" = callPackage
@@ -146854,7 +147129,7 @@ self: {
time-locale-compat yesod yesod-auth yesod-core yesod-form
];
description = "A yesod subsite serving a wiki";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -146973,7 +147248,7 @@ self: {
sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl";
libraryHaskellDepends = [ base ];
description = "Monadic functions with injected parameters";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -147175,7 +147450,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ aether base text ];
description = "Console client for encyclopedias";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {aether = null;};
@@ -147285,8 +147560,8 @@ self: {
}:
mkDerivation {
pname = "instana-haskell-trace-sdk";
- version = "0.6.0.0";
- sha256 = "0b27fvvq1xxici2w33m823xnj7fwq1irjhwrcaav1khz3h93qv85";
+ version = "0.6.2.0";
+ sha256 = "1yvxsz1b9qrhyw6zamqs5254mpba3vijhach1n424mqa6aq1935s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -147449,7 +147724,7 @@ self: {
http-types network scotty text wai wai-extra
];
description = "Basic HTTP gateway to save articles to Instapaper";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -147475,7 +147750,7 @@ self: {
sha256 = "1fc3vgxxzk6rw0y6d40jiyrc66fd1ig7nk4bdmfn1q595q5iwnz3";
libraryHaskellDepends = [ array base containers music-diatonic ];
description = "Render Instrument Chords";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"int-cast" = callPackage
@@ -147640,7 +147915,7 @@ self: {
vector
];
description = "Integrate different assays";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -147915,7 +148190,7 @@ self: {
test-framework-hunit
];
description = "GHC preprocessor and library to enable variable interpolation in strings";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -148101,7 +148376,7 @@ self: {
libraryHaskellDepends = [ base deepseq fingertree ];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Intervals with adherences";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -148173,7 +148448,7 @@ self: {
];
executablePkgconfigDepends = [ ncurses ];
description = "A game of competitive puzzle-design";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs) ncurses;};
"intrinsic-superclasses" = callPackage
@@ -148592,8 +148867,8 @@ self: {
pname = "io-streams";
version = "1.5.2.0";
sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3";
- revision = "1";
- editedCabalFile = "1dcadj5gv1m2yy97zsbq5x67vsblp8gy58a0kl5di9vkbgrcw46n";
+ revision = "2";
+ editedCabalFile = "1mr0y8m6xdkgvvk76n7pn1airqzgdp8kd8x6jd9w97iy5wjp14q7";
configureFlags = [ "-fnointeractivetests" ];
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder network primitive
@@ -148862,7 +149137,7 @@ self: {
unix
];
description = "interactive patch editor";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -148902,23 +149177,23 @@ self: {
"ipfs" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, directory-tree
- , doctest, envy, flow, Glob, http-media, ip, lens, lens-aeson
- , monad-logger, QuickCheck, regex-compat, rio, servant
+ , doctest, envy, flow, Glob, http-media, lens, lens-aeson
+ , monad-logger, network-ip, QuickCheck, regex-compat, rio, servant
, servant-client, servant-multipart, servant-server, swagger2, text
, vector, yaml
}:
mkDerivation {
pname = "ipfs";
- version = "1.3.0.0";
- sha256 = "1ag3rx7p4gp39rhgwap083ny5x00z5p8aks1lwvrsmdlvn83ym6l";
+ version = "1.3.0.3";
+ sha256 = "08g1lvh7w46qsg80h5nm3r333zbhl2q4shnrm5jann4p3g5ii08x";
libraryHaskellDepends = [
- aeson base bytestring envy flow Glob http-media ip lens
- monad-logger regex-compat rio servant servant-client
+ aeson base bytestring envy flow Glob http-media lens monad-logger
+ network-ip regex-compat rio servant servant-client
servant-multipart servant-server swagger2 text vector
];
testHaskellDepends = [
aeson base bytestring directory directory-tree doctest envy flow
- Glob http-media ip lens lens-aeson monad-logger QuickCheck
+ Glob http-media lens lens-aeson monad-logger network-ip QuickCheck
regex-compat rio servant servant-client servant-multipart
servant-server swagger2 text vector yaml
];
@@ -149443,7 +149718,7 @@ self: {
sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr";
libraryHaskellDepends = [ aeson base http-client lens text wreq ];
description = "Iron.IO message queueing client library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -149756,7 +150031,7 @@ self: {
base containers hspec megaparsec QuickCheck
];
description = "Isotopic masses and relative abundances";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -150540,7 +150815,7 @@ self: {
haskell98 hoauth mtl old-locale parsec time utf8-string xml
];
description = "CLI (command line interface) to YQL";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -150637,7 +150912,7 @@ self: {
sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd";
libraryHaskellDepends = [ base hosc ];
description = "control JackMiniMix";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -150768,7 +151043,7 @@ self: {
];
executableHaskellDepends = [ base boxes directory filepath ];
description = "Export sheet music and audio from Windows/Mac app Jammit";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"japanese-calendar" = callPackage
@@ -151115,7 +151390,7 @@ self: {
];
executableHaskellDepends = [ base mtl network ];
description = "Implementation of Java Debug Interface";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -151227,8 +151502,8 @@ self: {
({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
mkDerivation {
pname = "jira-wiki-markup";
- version = "1.3.3";
- sha256 = "0sgm9x2bdwazhj598aix2xyshjy6cvai4sgq5zz8gxv2l6prfbr7";
+ version = "1.3.4";
+ sha256 = "0rrqaibgafbynrlcsp7f7hkzgkp2gix7ji2hkpgpby6fvp6965fh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl parsec text ];
@@ -151572,8 +151847,8 @@ self: {
}:
mkDerivation {
pname = "jose-jwt";
- version = "0.9.0";
- sha256 = "1dnkyzs7kk2lxz2kj3x6v8w1lypsr0rppyn78s7w5sr89y924752";
+ version = "0.9.1";
+ sha256 = "0dy076k7zrg9mn4ll73k5p68r1dwzj9wqm4zn7w22py6wx06xg9p";
libraryHaskellDepends = [
aeson attoparsec base bytestring cereal containers cryptonite
memory mtl text time transformers transformers-compat
@@ -152907,7 +153182,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "JSON-RPC 2.0 server over a Conduit.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -153077,22 +153352,21 @@ self: {
"juandelacosa" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring
- , data-default-class, docopt, entropy, fast-logger, http-types
- , interpolatedstring-perl6, mtl, mysql, mysql-simple, network
- , resource-pool, scotty, text, unix, wai, wai-extra
- , wai-middleware-static, warp
+ , data-default-class, entropy, fast-logger, http-types, mtl, mysql
+ , mysql-simple, network, optparse-applicative, resource-pool
+ , scotty, text, unix, wai, wai-extra, wai-middleware-static, warp
}:
mkDerivation {
pname = "juandelacosa";
- version = "0.1.1";
- sha256 = "060zq739i3xhr7w448p460r7x3jyyzf7pn61abp7f9g8vjn6vqw7";
+ version = "0.1.2";
+ sha256 = "0lrqklpff24cklsdrlfym7ryvszyripjkwsb0m8dn7vab9yqswn2";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
- base base64-bytestring bytestring data-default-class docopt entropy
- fast-logger http-types interpolatedstring-perl6 mtl mysql
- mysql-simple network resource-pool scotty text unix wai wai-extra
+ base base64-bytestring bytestring data-default-class entropy
+ fast-logger http-types mtl mysql mysql-simple network
+ optparse-applicative resource-pool scotty text unix wai wai-extra
wai-middleware-static warp
];
description = "Manage users in MariaDB >= 10.1.1";
@@ -153124,7 +153398,7 @@ self: {
optparse-applicative text unordered-containers yaml
];
description = "Tableau-based theorem prover for justification logic";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -154336,7 +154610,7 @@ self: {
process
];
description = "Build profiles for kdesrc-build";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -154356,7 +154630,7 @@ self: {
process
];
description = "Build profiles for kdesrc-build";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"kdt" = callPackage
@@ -154834,8 +155108,8 @@ self: {
}:
mkDerivation {
pname = "kempe";
- version = "0.1.1.3";
- sha256 = "0p0zm3dxjcmckwif966cnsn8qb667mxd8yh7wx56nl7jsxz90cw1";
+ version = "0.2.0.0";
+ sha256 = "1wgbjk1iyb4njcr957lipxnypk3c08c98v9czk3xld9dqzq9xxf1";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -155122,7 +155396,7 @@ self: {
unix unix-compat utf8-string wai warp zxcvbn-c
];
description = "back up a secret key securely to the cloud";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -155217,7 +155491,7 @@ self: {
parsec text transformers unix unordered-containers yaml
];
description = "Command-line file tagging and organization tool";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -155365,6 +155639,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "kind-generics-th_0_2_2_2" = callPackage
+ ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell
+ , th-abstraction
+ }:
+ mkDerivation {
+ pname = "kind-generics-th";
+ version = "0.2.2.2";
+ sha256 = "1lgz7wvz5jvq65r7zmymcfx3hwskw2b45a3vfwj0pgnddpjmh9n4";
+ libraryHaskellDepends = [
+ base ghc-prim kind-generics template-haskell th-abstraction
+ ];
+ testHaskellDepends = [ base kind-generics template-haskell ];
+ description = "Template Haskell support for generating `GenericK` instances";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"kinds" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -156525,7 +156816,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base parsec ];
description = "Untyped Lambda calculus to JavaScript compiler";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -157125,7 +157416,7 @@ self: {
base clash-prelude Lambdaya template-haskell
];
description = "Fpga bus core and serialization for RedPitaya";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -157202,7 +157493,7 @@ self: {
sha256 = "1nmyirpf07q7lrgfdqxwaspa173a2g3077gy9k7rpviw8pg2az0w";
libraryHaskellDepends = [ base bytestring http-streams Mapping ];
description = "A Lisp";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -157629,7 +157920,7 @@ self: {
megaparsec prettyprinter QuickCheck split text time
];
description = "Dockerfile parser, pretty-printer and embedded DSL";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"language-dockerfile" = callPackage
@@ -157657,7 +157948,7 @@ self: {
transformers unordered-containers yaml
];
description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -158155,7 +158446,7 @@ self: {
grammatical-parsers prettyprinter tasty tasty-hunit text
];
description = "Parser, pretty-printer, and more for the Oberon programming language";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -158673,8 +158964,8 @@ self: {
({ mkDerivation, base, liblapack, netlib-ffi }:
mkDerivation {
pname = "lapack-ffi";
- version = "0.0.2";
- sha256 = "11759avf0kzkqy4s24kn556j93l10x28njpg6h14y915pdl35dyl";
+ version = "0.0.3";
+ sha256 = "1qj7l2maka7z0gnkb59kl9qnyql12g5akmmqwsjvcnhbywgiv1yr";
libraryHaskellDepends = [ base netlib-ffi ];
libraryPkgconfigDepends = [ liblapack ];
description = "Auto-generated interface to Fortran LAPACK";
@@ -158770,7 +159061,7 @@ self: {
HDBC-sqlite3 hsini HTTP mtl old-locale regex-compat tagsoup time
];
description = "Tool to track security alerts on LWN";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -159266,7 +159557,7 @@ self: {
template-haskell vector-space
];
description = "Identifiers for not-yet-computed values";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -159288,7 +159579,7 @@ self: {
temporary
];
description = "Storing computed values for re-use when the same program runs again";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -159332,7 +159623,7 @@ self: {
testHaskellDepends = [ base doctest lens ];
testToolDepends = [ markdown-unlit ];
description = "Lazy-Spined Monadic Priority Queues";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -159580,7 +159871,7 @@ self: {
base blaze-html directory filepath pandoc split
];
description = "A simple portfolio generator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -160658,7 +160949,7 @@ self: {
semigroups terminal-progress-bar text
];
description = "frugal issue tracker";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -160878,7 +161169,7 @@ self: {
libraryHaskellDepends = [ base containers doctest lattices ];
testHaskellDepends = [ base doctest QuickCheck ];
description = "L-Fuzzy Set Theory implementation in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -161217,8 +161508,8 @@ self: {
pname = "libfuse3";
version = "0.1.2.0";
sha256 = "0a59b4xag5vzisrnvf4v1zkdsdzky96h8w2mdj6cip3vgr196frb";
- revision = "1";
- editedCabalFile = "0gnq6aav00xx7dc8am87q2n6xw7cf7jm29g5bq5n1b72gqs91rzf";
+ revision = "2";
+ editedCabalFile = "0fbf1zrw5i3jag6yrzxsxcx82dag7a3mw5rmz6ab6v3gm9w8m9b2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -161283,7 +161574,7 @@ self: {
base bytestring ghc ghc-paths hspec mtl syb
];
description = "Backend for text editors to provide better Haskell editing support";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -161430,7 +161721,7 @@ self: {
test-framework-th text time transformers
];
description = "Prelude based on protolude for GHC 8 and beyond";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -161508,7 +161799,7 @@ self: {
test-framework-th text time transformers
];
description = "Prelude based on protolude for GHC 8 and beyond";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -161551,7 +161842,7 @@ self: {
base directory errors protolude tasty tasty-hunit text
];
description = "Bindings to the nix package manager";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -161605,7 +161896,7 @@ self: {
executableHaskellDepends = [ base bytestring time ];
testHaskellDepends = [ base ];
description = "Bindings to liboath";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {liboath = null; oath = null;};
@@ -161637,7 +161928,7 @@ self: {
librarySystemDepends = [ pafe ];
testHaskellDepends = [ base bytestring iconv transformers ];
description = "Wrapper for libpafe";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {pafe = null;};
@@ -161895,7 +162186,7 @@ self: {
base HUnit network test-framework test-framework-hunit
];
description = "Haskell bindings for libsystemd-daemon";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {libsystemd-daemon = null; systemd-daemon = null;};
@@ -161930,7 +162221,7 @@ self: {
librarySystemDepends = [ taglib ];
libraryPkgconfigDepends = [ taglib ];
description = "Binding to TagLib C library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) taglib;};
@@ -162667,7 +162958,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "Convert newlines in text";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"line-drawing" = callPackage
@@ -162694,7 +162985,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "Display the number of bytes of each line";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"line2pdf" = callPackage
@@ -162850,7 +163141,7 @@ self: {
tasty-smallcheck
];
description = "A simple library for linear codes (coding theory, error correction)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -162909,7 +163200,7 @@ self: {
libraryHaskellDepends = [ base bytestring network ];
testHaskellDepends = [ base hspec network tasty-hspec ];
description = "Typed sockets";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"linear-tests" = callPackage
@@ -162967,7 +163258,7 @@ self: {
semigroups tagged transformers vector vector-space
];
description = "Native, complete, matrix-free linear algebra";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -163323,7 +163614,7 @@ self: {
];
libraryPkgconfigDepends = [ blkid ];
description = "Linux libblkid";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {blkid = null;};
@@ -163555,7 +163846,9 @@ self: {
];
description = "Labeled File System interface for LIO";
license = "GPL";
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {};
"lio-simple" = callPackage
@@ -163579,7 +163872,7 @@ self: {
simple-templates text
];
description = "LIO support for the Simple web framework";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -163994,7 +164287,7 @@ self: {
ansi-terminal base data-default hspec stm terminal-size vty
];
description = "A simple list prompt UI for the terminal";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -164022,7 +164315,7 @@ self: {
MissingH tasty tasty-hunit tasty-quickcheck
];
description = "List all remote forwards for mail accounts stored in a SQL database";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -165236,7 +165529,7 @@ self: {
sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd";
libraryHaskellDepends = [ base containers text transformers ];
description = "Library for localization (l10n)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"localize" = callPackage
@@ -166124,7 +166417,7 @@ self: {
];
testHaskellDepends = [ base test-framework ];
description = "A library for lattice cryptography";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -166146,7 +166439,7 @@ self: {
test-framework time
];
description = "Lattice-based cryptographic applications using .";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -166164,7 +166457,7 @@ self: {
MonadRandom split statistics
];
description = "A library for benchmarking .";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -166187,7 +166480,7 @@ self: {
text-format transformers
];
description = "Calculus for LOL (λω language)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -166208,7 +166501,7 @@ self: {
testHaskellDepends = [ base lol lol-apps test-framework ];
benchmarkHaskellDepends = [ base DRBG lol lol-apps MonadRandom ];
description = "A fast C++ backend for .";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -166229,7 +166522,7 @@ self: {
testHaskellDepends = [ base lol-tests ];
benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
description = "A repa backend for .";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -166250,7 +166543,7 @@ self: {
];
testHaskellDepends = [ base lol test-framework ];
description = "A library for testing .";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -166276,7 +166569,7 @@ self: {
monad-classes tasty tasty-hunit text text-format transformers
];
description = "Type inferencer for LOL (λω language)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -166584,7 +166877,7 @@ self: {
librarySystemDepends = [ loris ];
libraryToolDepends = [ c2hs ];
description = "interface to Loris API";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {loris = null;};
@@ -166703,7 +166996,7 @@ self: {
vector
];
description = "An EDSL for diagrams based based on linear constraints";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"lp-diagrams-svg" = callPackage
@@ -167051,7 +167344,7 @@ self: {
aeson base bytestring file-embed hspec QuickCheck text th-utilities
];
description = "Core functionality for LTI 1.3.";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -167169,7 +167462,7 @@ self: {
text
];
description = "Library functions for reading and writing Lua chunks";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -167595,7 +167888,7 @@ self: {
base exceptions hspec hspec-core random text turtle uuid
];
description = "LXD client written in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -167617,7 +167910,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 text yaml
];
description = "Read the configuration file of the standard LXD client";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"lye" = callPackage
@@ -167755,7 +168048,7 @@ self: {
sha256 = "0ccwckq0gkrnahf224s59gsdd9baay1dfc8fh1kz2r87rbygzsk7";
libraryHaskellDepends = [ base bytestring ];
description = "Lzip compression / Lzlib bindings";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -168076,7 +168369,7 @@ self: {
monad-control mtl resourcet stm stm-containers time transformers
];
description = "Machine transducers for Amazonka calls";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -168089,8 +168382,8 @@ self: {
pname = "machines-attoparsec";
version = "0";
sha256 = "0mxm1gy7kr7czhmfwskl56wnawb2l3axfig22935bliq75mpvbs4";
- revision = "1";
- editedCabalFile = "1n57r25q0aajakkl7r82yw6rs9dqlhmr0qmhs7vb7ycs5i1chyis";
+ revision = "2";
+ editedCabalFile = "16gb0nd9njzz0nb97ii6i8vq0c309m6wl0cdgy08rdbf4cpzfx91";
libraryHaskellDepends = [
attoparsec base bytestring machines text
];
@@ -168621,7 +168914,7 @@ self: {
aeson base bytestring mtl text time xml zip-archive zlib
];
description = "A parser library for DMARC and SMTP TLS reports";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -168647,7 +168940,7 @@ self: {
tasty-hunit
];
description = "Count mailboxes in a SQL database";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"mailchimp" = callPackage
@@ -168933,7 +169226,7 @@ self: {
template-haskell text unix utf8-string
];
description = "The Haskell/Gtk+ Integrated Live Environment";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -168960,7 +169253,7 @@ self: {
];
doHaddock = false;
description = "Virtual package to install all Manatee packages";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
@@ -168981,7 +169274,7 @@ self: {
split stm text unix utf8-string
];
description = "Multithread interactive input/search framework for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169002,7 +169295,7 @@ self: {
mtl stm text utf8-string webkit
];
description = "Browser extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
@@ -169026,7 +169319,7 @@ self: {
template-haskell text time unix utf8-string
];
description = "The core of Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169050,7 +169343,7 @@ self: {
old-time regex-tdfa stm template-haskell text utf8-string
];
description = "Download Manager extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169072,7 +169365,7 @@ self: {
filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
];
description = "Editor extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169094,7 +169387,7 @@ self: {
manatee-core mtl old-locale old-time stm text utf8-string
];
description = "File manager extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169116,7 +169409,7 @@ self: {
gtkimageview manatee-core regex-tdfa stm text utf8-string
];
description = "Image viewer extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169142,7 +169435,7 @@ self: {
regex-posix split stm template-haskell text unix utf8-string
];
description = "IRC client extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169165,7 +169458,7 @@ self: {
text time unix utf8-string
];
description = "Mplayer client extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169187,7 +169480,7 @@ self: {
manatee-core mtl poppler stm text utf8-string
];
description = "PDF viewer extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169208,7 +169501,7 @@ self: {
proc stm text
];
description = "Process manager extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169230,7 +169523,7 @@ self: {
filepath gtk manatee-core stm text utf8-string webkit
];
description = "Feed reader extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
@@ -169250,7 +169543,7 @@ self: {
filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
];
description = "Template code to create Manatee application";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169271,7 +169564,7 @@ self: {
stm text unix vte
];
description = "Terminal Emulator extension for Manatee";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169292,7 +169585,7 @@ self: {
filepath gtk manatee-core regex-tdfa stm text
];
description = "Welcome module to help user play Manatee quickly";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169307,7 +169600,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "Simple mancala game";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"mandrill" = callPackage
@@ -169351,7 +169644,7 @@ self: {
array base bytestring containers directory filepath GLUT hslua time
];
description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169409,7 +169702,7 @@ self: {
semigroups vector-space
];
description = "Sampling random points on general manifolds";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169440,7 +169733,7 @@ self: {
tasty-hunit tasty-quickcheck vector-space
];
description = "Coordinate-free hypersurfaces";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -169453,7 +169746,7 @@ self: {
sha256 = "1bvmr0gcfj7zd0rff0qjlzjy8hqdbh52ljiiazrmqmb9abdsciq3";
libraryHaskellDepends = [ base call-stack tagged vector-space ];
description = "The basic classes for the manifolds hierarchy";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"map-classes" = callPackage
@@ -169863,7 +170156,7 @@ self: {
pandoc temporary text transformers webkit
];
description = "A simple markup document preview (markdown, textile, reStructuredText)";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
}) {};
@@ -169944,7 +170237,7 @@ self: {
array base bytestring colour gloss MonadRandom mtl random
];
description = "Generates mountainous terrain using a random walk algorithm";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -170038,7 +170331,7 @@ self: {
base configurator dlist parsek pretty
];
description = "Markup language preprocessor for Haskell";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"masakazu-bot" = callPackage
@@ -170060,7 +170353,7 @@ self: {
twitter-types
];
description = "@minamiyama1994_bot on haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -170483,7 +170776,7 @@ self: {
sha256 = "1bbi9368zg50xvhn0lkrza1fpfi1cjz21lxyay6qb9v2r7h0mhr3";
libraryHaskellDepends = [ base data-default-class ];
description = "Parse and evaluate math expressions with variables and functions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"mathflow" = callPackage
@@ -170523,7 +170816,7 @@ self: {
graphviz HTTP process safe tagsoup text
];
description = "Discover your (academic) ancestors!";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"mathista" = callPackage
@@ -171134,7 +171427,7 @@ self: {
tagsoup text time xdg-basedir
];
description = "download bugs mailboxes";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -171183,7 +171476,7 @@ self: {
MissingH polyparse process text unix
];
description = "Machine Configuration Manager";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -171256,7 +171549,7 @@ self: {
sha256 = "14z1x9dqnjj391nrlngs9s887yqh3arc7kfgk0m3d89vrkc185vq";
libraryHaskellDepends = [ base MonadRandom ];
description = "MCMC applied to probabilistic program synthesis";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -171486,7 +171779,7 @@ self: {
base bytestring storable-endian transformers utility-ht
];
description = "Parse song module files from Amiga MED and OctaMED";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"medea" = callPackage
@@ -171688,7 +171981,7 @@ self: {
servant-client servant-server text time
];
description = "Haskell SDK for communicating with the Medium API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -172299,8 +172592,8 @@ self: {
pname = "mercury-api";
version = "0.1.0.2";
sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg";
- revision = "5";
- editedCabalFile = "15xgb00cv8srnhfgh7v01b2qijcwapwsbx92jbdss525n3j74d48";
+ revision = "6";
+ editedCabalFile = "03d71mfq8nvqjr7hcpkh1q25fi1avqj35mfrrf7rkm13fr49bi7i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -173059,7 +173352,7 @@ self: {
tasty tasty-quickcheck text unordered-containers vector
];
description = "A tiny JSON library with light dependency footprint";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"microbase" = callPackage
@@ -173171,17 +173464,6 @@ self: {
}) {};
"microlens" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "microlens";
- version = "0.4.11.2";
- sha256 = "1z6zdprpr193a56r5s67q75554rrqyp2kk6srxn1gif7fd54sj2f";
- libraryHaskellDepends = [ base ];
- description = "A tiny lens library with no dependencies";
- license = lib.licenses.bsd3;
- }) {};
-
- "microlens_0_4_12_0" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "microlens";
@@ -173190,7 +173472,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "A tiny lens library with no dependencies";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"microlens-aeson" = callPackage
@@ -173239,21 +173520,6 @@ self: {
}) {};
"microlens-ghc" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, microlens
- , transformers
- }:
- mkDerivation {
- pname = "microlens-ghc";
- version = "0.4.12";
- sha256 = "07qh66alv00jz4l3w80km8grym6sk36c5kx5jfaya20irq91ni1b";
- libraryHaskellDepends = [
- array base bytestring containers microlens transformers
- ];
- description = "microlens + array, bytestring, containers, transformers";
- license = lib.licenses.bsd3;
- }) {};
-
- "microlens-ghc_0_4_13" = callPackage
({ mkDerivation, array, base, bytestring, containers, microlens
, transformers
}:
@@ -173266,7 +173532,6 @@ self: {
];
description = "microlens + array, bytestring, containers, transformers";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"microlens-mtl" = callPackage
@@ -173285,22 +173550,6 @@ self: {
}) {};
"microlens-platform" = callPackage
- ({ mkDerivation, base, hashable, microlens, microlens-ghc
- , microlens-mtl, microlens-th, text, unordered-containers, vector
- }:
- mkDerivation {
- pname = "microlens-platform";
- version = "0.4.1";
- sha256 = "0zlijw6ib9zf15n750qz6jlvj9l6sdf0d29w8nkflr2bspbvxn03";
- libraryHaskellDepends = [
- base hashable microlens microlens-ghc microlens-mtl microlens-th
- text unordered-containers vector
- ];
- description = "microlens + all batteries included (best for apps)";
- license = lib.licenses.bsd3;
- }) {};
-
- "microlens-platform_0_4_2" = callPackage
({ mkDerivation, base, hashable, microlens, microlens-ghc
, microlens-mtl, microlens-th, text, unordered-containers, vector
}:
@@ -173314,7 +173563,6 @@ self: {
];
description = "microlens + all batteries included (best for apps)";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"microlens-process" = callPackage
@@ -173461,7 +173709,7 @@ self: {
tf-random transformers
];
description = "Language for algorithmic generation of MIDI files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -173474,7 +173722,7 @@ self: {
sha256 = "1dkja5arps41wanhv1jnkf99xrc8f5aiimp27myd595lqqdr87s2";
libraryHaskellDepends = [ base containers safe stm ];
description = "Hot-swappable FRP";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"midi" = callPackage
@@ -173510,7 +173758,9 @@ self: {
];
description = "Convert between datatypes of the midi and the alsa packages";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {};
"midi-music-box" = callPackage
@@ -173552,7 +173802,7 @@ self: {
];
benchmarkHaskellDepends = [ base bytestring criterion ];
description = "A simple and fast library for working with MIDI messages";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"midi-util" = callPackage
@@ -173582,7 +173832,7 @@ self: {
base bytestring directory event-list midi parsec process
];
description = "Utilities for working with MIDI data";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -173817,7 +174067,7 @@ self: {
tasty-quickcheck
];
description = "Lambda calculus interpreter";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -174084,7 +174334,7 @@ self: {
sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172";
libraryHaskellDepends = [ base vector ];
description = "Bindings to Miniball, a smallest enclosing ball library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"miniforth" = callPackage
@@ -174122,7 +174372,7 @@ self: {
array base bytestring containers mtl semigroups text transformers
];
description = "A minimalistic lens library, providing only the simplest, most basic lens functionality";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -174456,7 +174706,7 @@ self: {
libraryHaskellDepends = [ base binary bytestring vector ];
testHaskellDepends = [ base binary directory hspec vector ];
description = "Read and write IDX data that is used in e.g. the MINST database.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -174492,7 +174742,7 @@ self: {
base bytestring ghc-prim hspec primitive vector
];
description = "A Minisat-based CDCL SAT solver in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -174512,7 +174762,7 @@ self: {
transformers twitter-conduit
];
description = "Tweet mirror";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -174782,7 +175032,7 @@ self: {
anydbm base Cabal directory HUnit MissingH
];
description = "Haskell interface to Python";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -175019,6 +175269,37 @@ self: {
}) {};
"mmark" = callPackage
+ ({ mkDerivation, aeson, base, case-insensitive, containers
+ , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec
+ , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens
+ , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck
+ , text, text-metrics, unordered-containers, weigh, yaml
+ }:
+ mkDerivation {
+ pname = "mmark";
+ version = "0.0.7.2";
+ sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm";
+ revision = "3";
+ editedCabalFile = "1ffa76pz544pa3s764lnc38rdmfccyn8z6zn1w76pqb01p0f9k9p";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base case-insensitive containers deepseq dlist email-validate
+ foldl hashable html-entity-map lucid megaparsec microlens
+ microlens-th modern-uri mtl parser-combinators text text-metrics
+ unordered-containers yaml
+ ];
+ testHaskellDepends = [
+ aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
+ QuickCheck text
+ ];
+ benchmarkHaskellDepends = [ base criterion text weigh ];
+ description = "Strict markdown processor for writers";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "mmark_0_0_7_3" = callPackage
({ mkDerivation, aeson, base, case-insensitive, containers
, criterion, deepseq, dlist, email-validate, foldl, hashable, hspec
, hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens
@@ -175029,6 +175310,8 @@ self: {
pname = "mmark";
version = "0.0.7.3";
sha256 = "1gfl9jhqm1jaqxi0yxd8r4z3ai5c3f1wv53vjs0ln84qjpcqp30s";
+ revision = "1";
+ editedCabalFile = "19yg41grkliim428x9cqwcynmjvkh83mqfyxiv2dc6fvid6fmcrk";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base case-insensitive containers deepseq dlist email-validate
@@ -175377,7 +175660,7 @@ self: {
libraryHaskellDepends = [ base binary bytestring vector ];
testHaskellDepends = [ base binary directory hspec vector ];
description = "Read and write IDX data that is used in e.g. the MNIST database.";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"moan" = callPackage
@@ -175595,7 +175878,7 @@ self: {
semigroups split text transformers
];
description = "Modify fasta (and CLIP) files in several optional ways";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -175689,7 +175972,7 @@ self: {
base hmatrix sparse-linear-algebra spectral-clustering vector
];
description = "Find the modularity of a network";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -175760,7 +176043,7 @@ self: {
nats pandoc-types parsec prettify process semigroups text
];
description = "Modular C code generator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -175808,22 +176091,23 @@ self: {
"mohws" = callPackage
({ mkDerivation, base, bytestring, containers, data-accessor
- , directory, explicit-exception, filepath, html, HTTP, network
- , network-uri, old-locale, old-time, parsec, process, transformers
- , unix, utility-ht
+ , directory, explicit-exception, fail, filepath, html, HTTP
+ , network, network-uri, old-locale, old-time, parsec, process
+ , transformers, unix, utility-ht
}:
mkDerivation {
pname = "mohws";
- version = "0.2.1.6";
- sha256 = "0rnb6nq99bav0z5dxzc4xkb2ai6ifm5v2ijd76sgzbs2032v6wqs";
+ version = "0.2.1.8";
+ sha256 = "039abcwkqijsw8qp2iid6ilnyg79lvc1m6zik0jc4gadl5g704wh";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers data-accessor directory
- explicit-exception filepath html HTTP network network-uri
+ explicit-exception fail filepath html HTTP network network-uri
old-locale old-time parsec process transformers unix utility-ht
];
+ executableHaskellDepends = [ base bytestring ];
description = "Modular Haskell Web Server";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -176013,7 +176297,7 @@ self: {
base contravariant invariant MonadRandom mtl primitive transformers
];
description = "Monad, monad transformer, and typeclass representing choices";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"monad-chronicle" = callPackage
@@ -177634,7 +177918,7 @@ self: {
base containers directory mtl optparse-applicative process unix
];
description = "A system state collecting library and application";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -178259,7 +178543,7 @@ self: {
tasty-quickcheck template-haskell text unordered-containers yaml
];
description = "A multi-lingual, typed, workflow language";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -178848,7 +179132,7 @@ self: {
simple-ui template-haskell text unix utf8-string vty
];
description = "Music player for linux";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -179049,7 +179333,7 @@ self: {
sha256 = "11c62m19ngap44fv4gnv0ln8iff1b08dg2vclj16jx1fj8pqps9y";
libraryHaskellDepends = [ base containers dbus mtl ];
description = "Interface for MPRIS";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -179135,7 +179419,7 @@ self: {
base directory filepath gtk mtl process template-haskell unix
];
description = "A minimalist mpv GUI written in I/O heavy Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -179183,7 +179467,7 @@ self: {
stm text transformers
];
description = "A MQTT client library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -180177,7 +180461,7 @@ self: {
];
testToolDepends = [ alex happy ];
description = "An intermediate language designed to perform advanced code analysis";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -181258,7 +181542,7 @@ self: {
executableHaskellDepends = [ base ];
executablePkgconfigDepends = [ gtk3 ];
description = "Supply your tunes info without leaving your music player";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtk3;};
@@ -181293,7 +181577,7 @@ self: {
test-framework-smallcheck text time transformers xmlhtml
];
description = "Send an email to all MusicBrainz editors";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -181305,8 +181589,8 @@ self: {
}:
mkDerivation {
pname = "musicw";
- version = "0.3.7";
- sha256 = "0b5wn084ka4xnvimzxd47y4m0ldmfqr7sa30a5bm08g62333h3yr";
+ version = "0.3.8";
+ sha256 = "00hw1ayzcyh9dxrha3kmyi9r69d5bb942ggl020jm3r5jayzs28h";
libraryHaskellDepends = [
array base bytestring containers data-default file-embed ghcjs-base
ghcjs-dom ghcjs-prim json monad-loops mtl safe text time
@@ -181518,7 +181802,7 @@ self: {
process
];
description = "Watches your screensaver and (un)mutes music when you (un)lock the screen";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -181896,7 +182180,7 @@ self: {
http-client-tls network-uri text yaml
];
description = "Export from MyAnimeList";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -181979,21 +182263,6 @@ self: {
}) {};
"mysql" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
- }:
- mkDerivation {
- pname = "mysql";
- version = "0.1.7.3";
- sha256 = "1yf9ni64q19ci6ripcjh0pvpklxyi0fzigb33ss05wswlal385rc";
- setupHaskellDepends = [ base Cabal ];
- libraryHaskellDepends = [ base bytestring containers ];
- librarySystemDepends = [ mysql ];
- testHaskellDepends = [ base bytestring hspec ];
- description = "A low-level MySQL client library";
- license = lib.licenses.bsd3;
- }) {inherit (pkgs) mysql;};
-
- "mysql_0_2" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
}:
mkDerivation {
@@ -182006,7 +182275,6 @@ self: {
testHaskellDepends = [ base bytestring hspec ];
description = "A low-level MySQL client library";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) mysql;};
"mysql-effect" = callPackage
@@ -182355,7 +182623,7 @@ self: {
libraryHaskellDepends = [ base ];
executableHaskellDepends = [ base ];
description = "EDSL to specify Nagios configuration files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"nagios-perfdata" = callPackage
@@ -182452,7 +182720,7 @@ self: {
libraryHaskellDepends = [ aeson attoparsec base lens text wreq ];
executableHaskellDepends = [ base text ];
description = "Tool to keep namecoin names updated and well";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"named" = callPackage
@@ -182839,7 +183107,7 @@ self: {
kanji microlens microlens-aeson optparse-applicative text
];
description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -183156,7 +183424,7 @@ self: {
aeson base iso639 lens lens-aeson network-uri random text wreq
];
description = "Interface to Naver Translate";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -183214,7 +183482,7 @@ self: {
librarySystemDepends = [ ncurses ];
libraryToolDepends = [ c2hs ];
description = "Modernised bindings to GNU ncurses";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs) ncurses;};
"ndjson-conduit" = callPackage
@@ -183295,7 +183563,7 @@ self: {
random transformers
];
description = "A NEAT library for Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -183617,7 +183885,7 @@ self: {
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers hspec ];
description = "Nested set model implementation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"nestedmap" = callPackage
@@ -183854,7 +184122,7 @@ self: {
editedCabalFile = "00wqr9nnjn8hm0r8xa5qrgqva5r0pcf32hlksrqhkzy12yl2kv08";
libraryHaskellDepends = [ base bytestring hosc network ];
description = "Netclock protocol";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -184071,7 +184339,7 @@ self: {
base bytestring tasty tasty-golden tasty-quickcheck
];
description = "Parser for .netrc files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"netrium" = callPackage
@@ -184123,7 +184391,7 @@ self: {
base bytestring enumerator transformers
];
description = "Enumerator-based netstring parsing";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -184739,7 +185007,7 @@ self: {
sha256 = "0hxbzzdjrxnx9pknsbma7iyfr3pxrsff5n9mhbkpaqaizhibq7q7";
libraryHaskellDepends = [ array base containers mtl ];
description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -184955,6 +185223,28 @@ self: {
broken = true;
}) {};
+ "network-packet-linux" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, hspec-discover, HUnit
+ , network, QuickCheck, vendored-network, vendored-network-test
+ }:
+ mkDerivation {
+ pname = "network-packet-linux";
+ version = "0.1.0.0";
+ sha256 = "17096sa20jijq37nr0bn4bcnpilh5yx4pdwqb4c2vk4i0lkwg58m";
+ revision = "2";
+ editedCabalFile = "0w3ca2z3ppj7b8ifafh4y42zv6wpkdd0mmfsvmvcdmfprlsh244b";
+ libraryHaskellDepends = [ base network vendored-network ];
+ testHaskellDepends = [
+ base bytestring hspec HUnit network QuickCheck
+ vendored-network-test
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Types for working with Linux packet sockets";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {vendored-network = null; vendored-network-test = null;};
+
"network-pgi" = callPackage
({ mkDerivation, attoparsec, attoparsec-enumerator, base
, bytestring, enumerator, tnet
@@ -184984,7 +185274,7 @@ self: {
text transformers xml-types
];
description = "Client library for the XMPP protocol";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -185163,7 +185453,7 @@ self: {
transformers
];
description = "ByteString and Text streams for networking";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -185734,7 +186024,7 @@ self: {
libraryHaskellDepends = [ base containers fixedprec random ];
executableHaskellDepends = [ base random time ];
description = "Exact and approximate synthesis of quantum circuits";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"newt" = callPackage
@@ -186114,7 +186404,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -186187,7 +186477,7 @@ self: {
unordered-containers
];
description = "IDL compiler and RPC/distributed object framework for microservices";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -186922,7 +187212,7 @@ self: {
sha256 = "1wd2vd0qn8ln3a5r29gikdcr4c2c2rf43p6kq3wmqm8ww30djgca";
libraryHaskellDepends = [ base containers ];
description = "Binders and alpha-equivalence made easy";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"nomyx-api" = callPackage
@@ -187063,16 +187353,19 @@ self: {
}) {nomyx-auth = null;};
"non-empty" = callPackage
- ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht
+ ({ mkDerivation, base, containers, deepseq, doctest-exitcode-stdio
+ , QuickCheck, utility-ht
}:
mkDerivation {
pname = "non-empty";
- version = "0.3.2";
- sha256 = "0j47d1xaxi2ynsa3wckapjbcvzr66cwca74xpzi554ba70agq40v";
+ version = "0.3.3";
+ sha256 = "01vhkj9xgggml51zmrj3hngxxnzrcd4zs0a7yjg69i6z518mh0pg";
libraryHaskellDepends = [
base containers deepseq QuickCheck utility-ht
];
- testHaskellDepends = [ base containers QuickCheck utility-ht ];
+ testHaskellDepends = [
+ base containers doctest-exitcode-stdio QuickCheck utility-ht
+ ];
description = "List-like structures with static restrictions on the number of elements";
license = lib.licenses.bsd3;
}) {};
@@ -187234,8 +187527,8 @@ self: {
({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }:
mkDerivation {
pname = "nonempty-zipper";
- version = "1.0.0.0";
- sha256 = "0qqdrp1rr1qmgxxzwn21gy1gc9mwdhliyp72d74bndqr3yki46fm";
+ version = "1.0.0.1";
+ sha256 = "17h070rciwbdk36n68dbin1yv2ybrb2vak9azimfv51z6b6a7b4w";
libraryHaskellDepends = [ base comonad deepseq safe ];
testHaskellDepends = [ base comonad deepseq doctest Glob safe ];
description = "A non-empty comonadic list zipper";
@@ -187291,7 +187584,7 @@ self: {
ad base nonlinear-optimization primitive reflection vector
];
description = "Wrapper of nonlinear-optimization package for using with AD package";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"nonlinear-optimization-backprop" = callPackage
@@ -187309,7 +187602,7 @@ self: {
reflection vector
];
description = "Wrapper of nonlinear-optimization package for using with backprop package";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"noodle" = callPackage
@@ -187345,10 +187638,8 @@ self: {
}:
mkDerivation {
pname = "normalization-insensitive";
- version = "2.0.1";
- sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v";
- revision = "4";
- editedCabalFile = "1p0vxvp44nzjn7big9m3wj8gvffaxz05c46jalm73fwm8cj54iqf";
+ version = "2.0.2";
+ sha256 = "1rr12rrij64hi6jkd42h4x2m86k1ra10ykzpzc38n6rfdhyiswpn";
libraryHaskellDepends = [
base bytestring deepseq hashable text unicode-transforms
];
@@ -187381,7 +187672,7 @@ self: {
base bytestring cassava containers optparse-generic text vector
];
description = "Normalize data using a variety of methods";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"normalize-imports" = callPackage
@@ -187522,7 +187813,7 @@ self: {
librarySystemDepends = [ notmuch talloc ];
libraryToolDepends = [ c2hs ];
description = "Haskell binding to Notmuch, the mail indexer";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs) notmuch; inherit (pkgs) talloc;};
"notmuch-haskell" = callPackage
@@ -188021,7 +188312,7 @@ self: {
editedCabalFile = "1lsxi6704g6svw0834haggp6j97kb6r51583lr2a3kn1ni2zh60c";
libraryHaskellDepends = [ base microlens microlens-th ];
description = "Flexible and accurate (for a given precision) numerical->string conversion";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"numbered-semigroups" = callPackage
@@ -188034,7 +188325,7 @@ self: {
editedCabalFile = "04wkhb2r275nax8wh00w6c4pxfaky190g2bsviw39jyi7wr2f33c";
libraryHaskellDepends = [ base call-stack semigroups ];
description = "A sequence of semigroups, for composing stuff in multiple spatial directions";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -188176,20 +188467,24 @@ self: {
}) {};
"numeric-prelude" = callPackage
- ({ mkDerivation, array, base, containers, deepseq, non-negative
- , parsec, QuickCheck, random, semigroups, storable-record
- , utility-ht
+ ({ mkDerivation, array, base, containers, deepseq
+ , doctest-exitcode-stdio, doctest-lib, non-negative, parsec
+ , QuickCheck, random, semigroups, storable-record, utility-ht
}:
mkDerivation {
pname = "numeric-prelude";
- version = "0.4.3.2";
- sha256 = "1vd777ax2yvxknfxp9isgjk7cabjv3q86dgf3hybv78hc4ji5gmq";
+ version = "0.4.3.3";
+ sha256 = "0kqz3xzg0j3cqaidmdzmg47h564ivp4iz5ys8zs5g41k2wd06ild";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
array base containers deepseq non-negative parsec QuickCheck random
semigroups storable-record utility-ht
];
+ testHaskellDepends = [
+ base doctest-exitcode-stdio doctest-lib QuickCheck random
+ utility-ht
+ ];
description = "An experimental alternative hierarchy of numeric type classes";
license = lib.licenses.bsd3;
}) {};
@@ -188817,7 +189112,7 @@ self: {
];
testHaskellDepends = [ base bytestring ];
description = "Fully Automatic Luxury OAuth 1.0a headers";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"oauth2-jwt-bearer" = callPackage
@@ -188895,7 +189190,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Communicate to OBD interfaces over ELM327";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -189201,7 +189496,7 @@ self: {
array base bytestring containers hexpr mtl parsec symbol text
];
description = "Lisp with more dynamism, more power, more simplicity";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -189822,7 +190117,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "memoization for IO actions and functions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"one-line-aeson-text" = callPackage
@@ -190016,7 +190311,7 @@ self: {
sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
libraryHaskellDepends = [ base ];
description = "Support for OO-like prototypes";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"op" = callPackage
@@ -190194,7 +190489,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base basic-prelude text turtle ];
description = "Open haddock HTML documentation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -190673,7 +190968,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {EGL = null; GLESv2 = null;};
@@ -191807,7 +192102,7 @@ self: {
broken = true;
}) {};
- "optparse-applicative" = callPackage
+ "optparse-applicative_0_15_1_0" = callPackage
({ mkDerivation, ansi-wl-pprint, base, bytestring, process
, QuickCheck, transformers, transformers-compat
}:
@@ -191823,9 +192118,10 @@ self: {
testHaskellDepends = [ base bytestring QuickCheck ];
description = "Utilities and combinators for parsing command line options";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
}) {};
- "optparse-applicative_0_16_1_0" = callPackage
+ "optparse-applicative" = callPackage
({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
, transformers, transformers-compat
}:
@@ -191839,7 +192135,6 @@ self: {
testHaskellDepends = [ base QuickCheck ];
description = "Utilities and combinators for parsing command line options";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"optparse-applicative-simple" = callPackage
@@ -191888,22 +192183,6 @@ self: {
}) {};
"optparse-generic" = callPackage
- ({ mkDerivation, base, bytestring, Only, optparse-applicative
- , semigroups, system-filepath, text, time, transformers, void
- }:
- mkDerivation {
- pname = "optparse-generic";
- version = "1.3.1";
- sha256 = "0c2fhy54mn8h7z5qj3mq1qcdb1ab6bxbpiaaqwrmh7iys41zg6q0";
- libraryHaskellDepends = [
- base bytestring Only optparse-applicative semigroups
- system-filepath text time transformers void
- ];
- description = "Auto-generate a command-line parser for your datatype";
- license = lib.licenses.bsd3;
- }) {};
-
- "optparse-generic_1_4_4" = callPackage
({ mkDerivation, base, bytestring, Only, optparse-applicative
, system-filepath, text, time, transformers, void
}:
@@ -191919,7 +192198,6 @@ self: {
];
description = "Auto-generate a command-line parser for your datatype";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"optparse-helper" = callPackage
@@ -192293,7 +192571,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base parsec regex-compat ];
description = "Basic org to anki exporter";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"organize-imports" = callPackage
@@ -192306,7 +192584,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ attoparsec base text ];
description = "Organize scala imports";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -192385,7 +192663,7 @@ self: {
transformers universum
];
description = "Statistics visualizer for org-mode";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -192529,6 +192807,32 @@ self: {
license = lib.licenses.mit;
}) {};
+ "ory-kratos" = callPackage
+ ({ mkDerivation, aeson, base, containers, exceptions, http-api-data
+ , http-client, http-client-tls, http-types, mtl, network-uri
+ , servant, servant-client, servant-client-core, servant-server
+ , swagger2, text, time, transformers, uuid, wai, warp
+ }:
+ mkDerivation {
+ pname = "ory-kratos";
+ version = "0.0.5.9";
+ sha256 = "1c4vn8zyv9lakchiip6w80cfxkz7zsgfiwd5mq5dnc6fcsri3c6h";
+ libraryHaskellDepends = [
+ aeson base containers exceptions http-api-data http-client
+ http-client-tls http-types mtl network-uri servant servant-client
+ servant-client-core servant-server swagger2 text time transformers
+ uuid wai warp
+ ];
+ testHaskellDepends = [
+ aeson base containers exceptions http-api-data http-client
+ http-client-tls http-types mtl network-uri servant servant-client
+ servant-client-core servant-server swagger2 text time transformers
+ uuid wai warp
+ ];
+ description = "API bindings for Ory Kratos";
+ license = lib.licenses.asl20;
+ }) {};
+
"os-release" = callPackage
({ mkDerivation, aeson, base, bytestring, filepath, hspec
, hspec-megaparsec, megaparsec, pretty-simple, safe-exceptions
@@ -192574,7 +192878,7 @@ self: {
sha256 = "1452a2y085xbj5q83g6y8f9vrxmlq804i8kyx6rfwyzfvzq5s3ic";
libraryHaskellDepends = [ base colour gloss random ];
description = "Implements an osculatory packing (kissing circles) algorithm and display";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -192675,7 +192979,7 @@ self: {
process temporary
];
description = "Better conversion of Oxford Scholarship Online material to PDF";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -193050,7 +193354,7 @@ self: {
];
testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
description = "Efficient “spreadsheet table” like maps with multiple marginals";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -193320,7 +193624,7 @@ self: {
optparse-applicative simple-cmd-args text
];
description = "Pagure client";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"pagure-hook-receiver" = callPackage
@@ -193426,7 +193730,9 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Haskell binding for C PAM API";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
hydraPlatforms = lib.platforms.none;
broken = true;
}) {pam = null;};
@@ -193473,63 +193779,6 @@ self: {
}) {};
"pandoc" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
- , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
- , case-insensitive, citeproc, commonmark, commonmark-extensions
- , commonmark-pandoc, connection, containers, criterion
- , data-default, deepseq, Diff, directory, doclayout, doctemplates
- , emojis, exceptions, executable-path, file-embed, filepath, Glob
- , haddock-library, hslua, hslua-module-system, hslua-module-text
- , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb
- , jira-wiki-markup, JuicyPixels, mtl, network, network-uri
- , pandoc-types, parsec, process, QuickCheck, random, safe
- , scientific, SHA, skylighting, skylighting-core, split, syb
- , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua
- , tasty-quickcheck, temporary, texmath, text, text-conversions
- , time, unicode-transforms, unix, unordered-containers, weigh, xml
- , zip-archive, zlib
- }:
- mkDerivation {
- pname = "pandoc";
- version = "2.11.4";
- sha256 = "1x8s6gidcij81vcxhj3pday484dyxn3d5s9sz0rh3nfml80cgkyk";
- configureFlags = [ "-fhttps" "-f-trypandoc" ];
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson aeson-pretty attoparsec base base64-bytestring binary
- blaze-html blaze-markup bytestring case-insensitive citeproc
- commonmark commonmark-extensions commonmark-pandoc connection
- containers data-default deepseq directory doclayout doctemplates
- emojis exceptions file-embed filepath Glob haddock-library hslua
- hslua-module-system hslua-module-text HsYAML HTTP http-client
- http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl
- network network-uri pandoc-types parsec process random safe
- scientific SHA skylighting skylighting-core split syb tagsoup
- temporary texmath text text-conversions time unicode-transforms
- unix unordered-containers xml zip-archive zlib
- ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [
- base base64-bytestring bytestring containers Diff directory
- doctemplates exceptions executable-path filepath Glob hslua mtl
- pandoc-types process QuickCheck tasty tasty-golden tasty-hunit
- tasty-lua tasty-quickcheck temporary text time xml zip-archive
- ];
- benchmarkHaskellDepends = [
- base bytestring containers criterion mtl text time weigh
- ];
- postInstall = ''
- mkdir -p $out/share/man/man1
- mv "man/"*.1 $out/share/man/man1/
- '';
- description = "Conversion between markup formats";
- license = lib.licenses.gpl2Plus;
- maintainers = with lib.maintainers; [ peti ];
- }) {};
-
- "pandoc_2_12" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base
, base64-bytestring, binary, blaze-html, blaze-markup, bytestring
, case-insensitive, citeproc, commonmark, commonmark-extensions
@@ -193584,7 +193833,6 @@ self: {
'';
description = "Conversion between markup formats";
license = lib.licenses.gpl2Plus;
- hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ peti ];
}) {};
@@ -193637,7 +193885,7 @@ self: {
base directory filepath pandoc-types process text-conversions
];
description = "Insert a preamble before pandoc-citeproc's bibliography";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"pandoc-crossref" = callPackage
@@ -193673,15 +193921,15 @@ self: {
utility-ht
];
description = "Pandoc filter for cross-references";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"pandoc-csv2table" = callPackage
({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
mkDerivation {
pname = "pandoc-csv2table";
- version = "1.0.8";
- sha256 = "0sf0af2cx5fi3a2iixkjjdpzp0153hxsjzs5wwqssby39g7s24gb";
+ version = "1.0.9";
+ sha256 = "14ln4i75cpqpjyzhqx0wvsrggvm6ak8rif514r5qwnckjl97v79l";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -193860,7 +194108,7 @@ self: {
pandoc-types shelly system-fileio system-filepath text
];
description = "Japanese-specific markup filters for pandoc";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -193976,8 +194224,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-plot";
- version = "1.1.0";
- sha256 = "1dk9s37z3hah1kiha3q9d1yzl0vfgivdazhdcraivaspzi78iry8";
+ version = "1.1.1";
+ sha256 = "10wwci7p3kphmjxlnpymbnx3cw2l3yfydm29l6k2vakz1pd7zdh0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -194027,7 +194275,7 @@ self: {
mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text
];
description = "A Pandoc filter to include figures generated from Python code blocks";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -194177,7 +194425,7 @@ self: {
transformers Yampa
];
description = "A super-pang clone";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -194198,7 +194446,7 @@ self: {
];
libraryPkgconfigDepends = [ pango ];
description = "Binding to the Pango text rendering engine";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) pango;};
"pangraph" = callPackage
@@ -194781,7 +195029,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base bytestring containers ];
description = "A passphrase generator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -195564,7 +195812,7 @@ self: {
sha256 = "090yhbbh2i5lwfwrfml0n54ziy8mz3mgmwnykr4ab06w1ylc2zh4";
libraryHaskellDepends = [ base ];
description = "Parallel Parsing Processes";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"parsely" = callPackage
@@ -196017,7 +196265,7 @@ self: {
random
];
description = "a simple password manager";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -196039,7 +196287,7 @@ self: {
passman-core resourcet text X11 yaml
];
description = "Deterministic password generator command line interface";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
@@ -196065,34 +196313,11 @@ self: {
];
doHaddock = false;
description = "Deterministic password generator core";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
"password" = callPackage
- ({ mkDerivation, base, base-compat, base64, bytestring, Cabal
- , cabal-doctest, cryptonite, doctest, memory, QuickCheck
- , quickcheck-instances, scrypt, tasty, tasty-hunit
- , tasty-quickcheck, template-haskell, text
- }:
- mkDerivation {
- pname = "password";
- version = "2.1.1.0";
- sha256 = "1x3nv3bn0rp0f6rayrzp7yvw7x1ly7vjygcl6wdq86y0k1ca2wby";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base base64 bytestring cryptonite memory template-haskell text
- ];
- testHaskellDepends = [
- base base-compat bytestring cryptonite doctest memory QuickCheck
- quickcheck-instances scrypt tasty tasty-hunit tasty-quickcheck
- template-haskell text
- ];
- description = "Hashing and checking of passwords";
- license = lib.licenses.bsd3;
- }) {};
-
- "password_3_0_0_0" = callPackage
({ mkDerivation, base, base-compat, base64, bytestring, Cabal
, cabal-doctest, cryptonite, doctest, memory, password-types
, QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit
@@ -196114,33 +196339,9 @@ self: {
];
description = "Hashing and checking of passwords";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"password-instances" = callPackage
- ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest
- , doctest, http-api-data, password, persistent, QuickCheck
- , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
- , template-haskell, text
- }:
- mkDerivation {
- pname = "password-instances";
- version = "2.0.0.2";
- sha256 = "03dl3b530m02y7mv2lvssamhakswa3d9bj2r2ndvg78wi0vm5xp1";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- aeson base http-api-data password persistent text
- ];
- testHaskellDepends = [
- aeson base base-compat doctest http-api-data password persistent
- QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck
- template-haskell text
- ];
- description = "typeclass instances for password package";
- license = lib.licenses.bsd3;
- }) {};
-
- "password-instances_3_0_0_0" = callPackage
({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest
, doctest, http-api-data, password, password-types, persistent
, QuickCheck, quickcheck-instances, tasty, tasty-hunit
@@ -196161,7 +196362,6 @@ self: {
];
description = "typeclass instances for password package";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"password-types" = callPackage
@@ -196248,26 +196448,27 @@ self: {
, filepath, mtl, network, network-uri, optparse-applicative, pandoc
, pandoc-types, process, QuickCheck, skylighting, tasty
, tasty-hunit, tasty-quickcheck, terminal-size, text, time
- , unordered-containers, yaml
+ , unordered-containers, wcwidth, yaml
}:
mkDerivation {
pname = "patat";
- version = "0.8.6.1";
- sha256 = "1n9qw4wmh7aqmnkqdc6v12rs80vipnszr4744nlkasq6jlzijw0c";
+ version = "0.8.7.0";
+ sha256 = "05bg36lbhqlh80w952hrpy88n99qddv86hiqqbc6p3bc89rlzg1w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint async base base64-bytestring
bytestring colour containers directory filepath mtl network
network-uri optparse-applicative pandoc pandoc-types process
- skylighting terminal-size text time unordered-containers yaml
+ skylighting terminal-size text time unordered-containers wcwidth
+ yaml
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
base directory QuickCheck tasty tasty-hunit tasty-quickcheck text
];
description = "Terminal-based presentations using Pandoc";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -197411,7 +197612,7 @@ self: {
base directory filepath ghc ghc-paths old-time process
];
description = "pdynload is polymorphic dynamic linking library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -197549,7 +197750,7 @@ self: {
base containers filepath haskeline logict mtl parsec
];
description = "a lazy non-deterministic concatenative programming language";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -198313,7 +198514,7 @@ self: {
base optparse-applicative persistent text
];
description = "Transforms persist's quasi-quoted syntax into ER format";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -198386,6 +198587,35 @@ self: {
maintainers = with lib.maintainers; [ psibi ];
}) {};
+ "persistent_2_11_0_4" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+ , blaze-html, bytestring, conduit, containers, fast-logger, hspec
+ , http-api-data, monad-logger, mtl, path-pieces, resource-pool
+ , resourcet, scientific, shakespeare, silently, text, time
+ , transformers, unliftio, unliftio-core, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "persistent";
+ version = "2.11.0.4";
+ sha256 = "1n5wkhfvyqq6p57nkf9yx73kap6spyzam5w12ni8pmd1m6pk77xn";
+ libraryHaskellDepends = [
+ aeson attoparsec base base64-bytestring blaze-html bytestring
+ conduit containers fast-logger http-api-data monad-logger mtl
+ path-pieces resource-pool resourcet scientific silently text time
+ transformers unliftio unliftio-core unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson attoparsec base base64-bytestring blaze-html bytestring
+ containers hspec http-api-data path-pieces scientific shakespeare
+ text time transformers unordered-containers vector
+ ];
+ description = "Type-safe, multi-backend data serialization";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = with lib.maintainers; [ psibi ];
+ }) {};
+
"persistent-audit" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring
, getopt-generics, hashable, hspec, mongoDB, persistent
@@ -198638,6 +198868,32 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "persistent-mtl_0_2_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, containers
+ , monad-logger, mtl, persistent, persistent-postgresql
+ , persistent-sqlite, persistent-template, resource-pool, resourcet
+ , tasty, tasty-golden, tasty-hunit, text, transformers, unliftio
+ , unliftio-core, unliftio-pool
+ }:
+ mkDerivation {
+ pname = "persistent-mtl";
+ version = "0.2.1.0";
+ sha256 = "1lwzkxb55bb4ldcwxkkfjfly39bnjjdg01yihl6znx8y3c461yrx";
+ libraryHaskellDepends = [
+ base conduit containers mtl persistent resource-pool resourcet text
+ transformers unliftio unliftio-core unliftio-pool
+ ];
+ testHaskellDepends = [
+ base bytestring conduit containers monad-logger persistent
+ persistent-postgresql persistent-sqlite persistent-template
+ resource-pool resourcet tasty tasty-golden tasty-hunit text
+ unliftio
+ ];
+ description = "Monad transformer for the persistent API";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"persistent-mysql" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
, containers, fast-logger, hspec, HUnit, monad-logger, mysql
@@ -199113,7 +199369,7 @@ self: {
unordered-containers
];
description = "Persona (BrowserID) library";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -199136,7 +199392,7 @@ self: {
pem persona scotty shakespeare text time transformers unix wai x509
];
description = "Persona (BrowserID) Identity Provider";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -199256,7 +199512,7 @@ self: {
async base ini postgresql-simple random scotty text transformers
];
description = "REST service and library for creating/consuming temporary PostgreSQL databases";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -199288,7 +199544,7 @@ self: {
warp
];
description = "REST service for creating temporary PostgreSQL databases";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -199404,7 +199660,7 @@ self: {
libraryHaskellDepends = [ base containers pretty ];
librarySystemDepends = [ gu pgf ];
description = "Bindings to the C version of the PGF runtime";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {gu = null; inherit (pkgs) pgf;};
@@ -199543,7 +199799,7 @@ self: {
];
testSystemDepends = [ pHash ];
description = "Haskell bindings to pHash, the open source perceptual hash library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {pHash = null;};
"phizzle" = callPackage
@@ -199559,7 +199815,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Library for checking if a given link is in a phishtank json file";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"phoityne" = callPackage
@@ -200114,7 +200370,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base mtl SDL transformers ];
description = "A fractal viewer";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -200181,7 +200437,7 @@ self: {
io-streams mtl network parsec RSA transformers
];
description = "Applied pi-calculus interpreter";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -200233,7 +200489,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Lightweight access control solution for the pijul vcs";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -200276,7 +200532,7 @@ self: {
xdg-basedir
];
description = "Set up port forwarding with the Private Internet Access VPN service";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -200316,7 +200572,7 @@ self: {
libraryHaskellDepends = [ base hmatrix JuicyPixels vector ];
executableHaskellDepends = [ base cli hmatrix ];
description = "simple image manipulation functions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -200414,7 +200670,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base matrix transformers xml ];
description = "Converts a svg image to tikz code";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -200579,7 +200835,7 @@ self: {
transformers
];
description = "Back up the notes you've saved to Pinboard";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"pinch" = callPackage
@@ -202065,7 +202321,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A program for turning pixel art into 3D prints";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -202244,7 +202500,7 @@ self: {
http-directory simple-cmd simple-cmd-args text
];
description = "Package tree diff tool";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -202311,7 +202567,7 @@ self: {
sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i";
libraryHaskellDepends = [ base bytestring mtl time unix ];
description = "plaimi's prelude";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -202702,7 +202958,7 @@ self: {
base cairo colour fixed-vector gtk hmatrix plot text vector
];
description = "A quick way to use Mathematica like Manipulation abilities";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -202735,7 +202991,7 @@ self: {
base colour gtk hmatrix plot text vector
];
description = "A plotting tool with Mathematica like Manipulation abilities";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -203574,7 +203830,7 @@ self: {
sha256 = "1csi81i0j3hk2gsc3c0rx939i67b0mj2pi064giw20yspqqjrp27";
libraryHaskellDepends = [ base requirements ];
description = "Polykinded extensible records";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"polyToMonoid" = callPackage
@@ -204237,7 +204493,7 @@ self: {
process time unix wx wxcore
];
description = "pomodoro timer";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -204523,7 +204779,7 @@ self: {
libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler_gi ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the Poppler";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2;
@@ -205396,17 +205652,15 @@ self: {
}) {};
"postgresql-placeholder-converter" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, hspec
+ ({ mkDerivation, attoparsec, base, bytestring, either-result, hspec
, hspec-discover, mtl, utf8-string
}:
mkDerivation {
pname = "postgresql-placeholder-converter";
- version = "0.1.0.0";
- sha256 = "1dprqv0r00nrx6m0byqfzpb91h5kz3nxd0w0m21150l68sj2d8ys";
- revision = "1";
- editedCabalFile = "0mla1cibyc13bz7gvv5b31il8nyp0vjfi8xqgpynbjfq7d4fjnnc";
+ version = "0.2.0.0";
+ sha256 = "0jpsa6c2m0m8d9abki585krf9pvj5p4rsayg1qs963r4vg1m8p23";
libraryHaskellDepends = [
- attoparsec base bytestring mtl utf8-string
+ attoparsec base bytestring either-result mtl utf8-string
];
testHaskellDepends = [ base hspec ];
testToolDepends = [ hspec-discover ];
@@ -206082,7 +206336,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base binary bytestring split ];
description = "Command line Dreamcast VMU filesystem toolset";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -206222,7 +206476,7 @@ self: {
JuicyPixels vector
];
description = "Trace bitmap images to paths using potrace";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"potrace-diagrams" = callPackage
@@ -206235,7 +206489,7 @@ self: {
editedCabalFile = "1iwsxi5zkqqjf9wr460bqjpghcvjhpgqgk27a11ji6bpdf6gnhga";
libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
description = "Potrace bindings for the diagrams library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -206487,7 +206741,7 @@ self: {
base tasty tasty-hunit tasty-quickcheck vector-space
];
description = "Alternative Show class that gives shorter view if possible";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"prairie" = callPackage
@@ -207710,7 +207964,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
description = "prime number tools";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"primes" = callPackage
@@ -208336,7 +208590,7 @@ self: {
xformat
];
description = "Parse process information for Linux";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -208961,7 +209215,7 @@ self: {
editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1";
libraryHaskellDepends = [ base deepseq mtl time ];
description = "Functionality for reporting function progress";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -209178,8 +209432,8 @@ self: {
}:
mkDerivation {
pname = "prolens";
- version = "0.0.0.0";
- sha256 = "1p4cl83knkvfa11ijw9qb2akz9n8lv9ixawgxwynypygg7vdg9j2";
+ version = "0.0.0.1";
+ sha256 = "0sf9s363gdyhs4qs6z2zqf1ha49qhfx9b1rldj28cgljrxy8jkws";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base doctest hedgehog hspec hspec-hedgehog inspection-testing
@@ -209986,29 +210240,6 @@ self: {
}) {};
"proto3-wire" = callPackage
- ({ mkDerivation, base, bytestring, cereal, containers, deepseq
- , doctest, hashable, QuickCheck, safe, tasty, tasty-hunit
- , tasty-quickcheck, text, unordered-containers
- }:
- mkDerivation {
- pname = "proto3-wire";
- version = "1.1.0";
- sha256 = "1f8vllbysz6d7njkqd6f52k4nixjj4wf2k4nh4gb4b7dihdzhnmg";
- revision = "1";
- editedCabalFile = "1ws072947d8lmchknyhrzpg9mh6dacya872a4b9dw0cdgkn13zm8";
- libraryHaskellDepends = [
- base bytestring cereal containers deepseq hashable QuickCheck safe
- text unordered-containers
- ];
- testHaskellDepends = [
- base bytestring cereal doctest QuickCheck tasty tasty-hunit
- tasty-quickcheck text
- ];
- description = "A low-level implementation of the Protocol Buffers (version 3) wire format";
- license = lib.licenses.asl20;
- }) {};
-
- "proto3-wire_1_2_0" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, deepseq
, doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck
, safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers
@@ -210032,6 +210263,7 @@ self: {
description = "A low-level implementation of the Protocol Buffers (version 3) wire format";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"protobuf" = callPackage
@@ -210344,7 +210576,7 @@ self: {
time
];
description = "Computations that automatically track data dependencies";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -210948,7 +211180,7 @@ self: {
libraryHaskellDepends = [ base containers stm unix ];
librarySystemDepends = [ libpulseaudio ];
description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {inherit (pkgs) libpulseaudio;};
"punkt" = callPackage
@@ -211002,7 +211234,7 @@ self: {
mtl text
];
description = "A program that displays the puppet resources associated to a node given .pp files.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -211157,8 +211389,8 @@ self: {
}:
mkDerivation {
pname = "purebred-email";
- version = "0.4.2";
- sha256 = "18cjifncnxi4c3xxkgvvvay56h2a0zs83505xf1a9fkz5n8iwqby";
+ version = "0.4.3";
+ sha256 = "00jl1n200nfn8iaqqdpa9h77b14r0fd6amsh46h16ad4ky3p2nkj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -211172,7 +211404,7 @@ self: {
tasty-hedgehog tasty-hunit tasty-quickcheck text time
];
description = "types and parser for email messages (including MIME)";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Plus;
}) {};
"purescheme-wai-routing-core" = callPackage
@@ -211829,7 +212061,7 @@ self: {
test-framework-hunit
];
description = "Command line interface for the pwstore library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"pwstore-fast" = callPackage
@@ -212309,9 +212541,7 @@ self: {
libraryHaskellDepends = [ base process qtah-generator ];
librarySystemDepends = [ qtbase ];
description = "Qt bindings for Haskell - C++ library";
- license = lib.licenses.lgpl3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licenses.lgpl3Only;
}) {inherit (pkgs.qt5) qtbase;};
"qtah-examples" = callPackage
@@ -212328,9 +212558,7 @@ self: {
base binary bytestring containers filepath hoppy-runtime qtah-qt5
];
description = "Example programs for Qtah Qt bindings";
- license = lib.licenses.lgpl3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licenses.lgpl3Only;
}) {};
"qtah-generator" = callPackage
@@ -212350,9 +212578,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Generator for Qtah Qt bindings";
- license = lib.licenses.lgpl3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licenses.lgpl3Only;
}) {};
"qtah-qt5" = callPackage
@@ -212373,9 +212599,7 @@ self: {
libraryToolDepends = [ qtbase ];
testHaskellDepends = [ base hoppy-runtime HUnit ];
description = "Qt bindings for Haskell";
- license = lib.licenses.lgpl3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licenses.lgpl3Only;
}) {inherit (pkgs.qt5) qtbase;};
"quack" = callPackage
@@ -212562,7 +212786,7 @@ self: {
];
executableToolDepends = [ alex happy ];
description = "Quite Useless DB";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -212586,7 +212810,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Quenya verb conjugator";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -212870,7 +213094,7 @@ self: {
libraryHaskellDepends = [ base ieee754 pretty-show QuickCheck ];
testHaskellDepends = [ base hspec ieee754 QuickCheck ];
description = "HUnit like assertions for QuickCheck";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"quickcheck-classes" = callPackage
@@ -213321,7 +213545,7 @@ self: {
test-framework-quickcheck2
];
description = "QuickLZ compression for ByteStrings";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"quickpull" = callPackage
@@ -213414,7 +213638,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "An interface for describing and executing terminal applications";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"quicktest" = callPackage
@@ -213449,7 +213673,7 @@ self: {
servant-server text warp
];
description = "A quick webapp generator for any file processing tool";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -214568,7 +214792,7 @@ self: {
base containers microspec tf-random vector
];
description = "Easy-to-use randomness for livecoding";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -214911,7 +215135,7 @@ self: {
transformers tree-fun
];
description = "Create random trees";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"random-variates" = callPackage
@@ -215085,7 +215309,7 @@ self: {
base bytestring cassava containers lens optparse-generic vector
];
description = "Find the rank product of a data set";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"rank1dynamic" = callPackage
@@ -215180,7 +215404,7 @@ self: {
base eve hspec lens QuickCheck quickcheck-instances text yi-rope
];
description = "A modular text editor";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215201,7 +215425,7 @@ self: {
rasa-ext-logger rasa-ext-slate rasa-ext-views rasa-ext-vim yi-rope
];
description = "Example user config for Rasa";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215233,7 +215457,7 @@ self: {
base containers data-default lens rasa text
];
description = "Rasa Ext for running commands";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215250,7 +215474,7 @@ self: {
base data-default lens mtl rasa text text-lens yi-rope
];
description = "Rasa Ext adding cursor(s)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215268,7 +215492,7 @@ self: {
yi-rope
];
description = "Rasa Ext for filesystem actions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215281,7 +215505,7 @@ self: {
sha256 = "1wv3bkfq92h7b91x88mzqcijbpb2kh7zkgg4ljxdx59qi4lb7hry";
libraryHaskellDepends = [ base lens mtl rasa ];
description = "Rasa Ext for logging state/actions";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215299,7 +215523,7 @@ self: {
text vty yi-rope
];
description = "Rasa extension for rendering to terminal with vty";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215312,7 +215536,7 @@ self: {
sha256 = "0grfj3qxlmk63x5cxrbibkhrrgij077f7sr0kj6vcl0np7a5dl98";
libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
description = "Rasa Ext for populating status-bar";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215325,7 +215549,7 @@ self: {
sha256 = "198phwvsndsk149rj744znjzw8w2n0238pbv07d7rfs2c1987s04";
libraryHaskellDepends = [ base data-default lens rasa ];
description = "Rasa Ext managing rendering styles";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215343,7 +215567,7 @@ self: {
yi-rope
];
description = "Rasa Ext managing rendering views";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215363,7 +215587,7 @@ self: {
];
testHaskellDepends = [ base hspec ];
description = "Rasa Ext for vim bindings";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -215443,8 +215667,8 @@ self: {
}:
mkDerivation {
pname = "ratel";
- version = "1.0.13";
- sha256 = "0ydg5xlf10g1wp18bwpr3mg9x29fyc1c5g22rn4szy0cs6hvqx6m";
+ version = "1.0.14";
+ sha256 = "0yjr8hj5c5i2l4p9zinwvzf33vhn6s9lipndqwx0km4ry0rylwwx";
libraryHaskellDepends = [
aeson base bytestring case-insensitive containers http-client
http-client-tls http-types text uuid
@@ -215460,8 +215684,8 @@ self: {
}:
mkDerivation {
pname = "ratel-wai";
- version = "1.1.4";
- sha256 = "1b2d5agip0zw10nmkr45gwhzpaga9nsdqv62xil11gadhaqji2f7";
+ version = "1.1.5";
+ sha256 = "0afrsnj1sjcr99sw7cpv2l4pn2is9y6qck4lq1vc33h8kk4hr25y";
libraryHaskellDepends = [
base bytestring case-insensitive containers http-client ratel wai
];
@@ -215593,19 +215817,19 @@ self: {
}) {};
"rattletrap" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, array, base, binary
- , bytestring, caerbannog, containers, filepath, http-client
- , http-client-tls, HUnit, text, transformers
+ ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+ , containers, filepath, http-client, http-client-tls, HUnit, text
+ , transformers
}:
mkDerivation {
pname = "rattletrap";
- version = "10.0.7";
- sha256 = "1wpxysd23gz2lga6bzg3cx21yxjvcprqgk9xqlg3b5gmj22h2mdg";
+ version = "11.0.0";
+ sha256 = "10xr9fv0xdiz173i5apz29sh66bvya3ris2c7ig2qs8dfbqi165s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty array base binary bytestring caerbannog
- containers filepath http-client http-client-tls text transformers
+ aeson aeson-pretty array base bytestring containers filepath
+ http-client http-client-tls text transformers
];
executableHaskellDepends = [ base ];
testHaskellDepends = [ base bytestring filepath HUnit ];
@@ -216069,7 +216293,7 @@ self: {
aeson aeson-pretty base bytestring scotty time transformers
];
description = "react-tutorial web server";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -216181,7 +216405,7 @@ self: {
];
testHaskellDepends = [ base doctest ];
description = "home (etc) automation using reactive-banana";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -216234,7 +216458,7 @@ self: {
SDL-ttf
];
description = "Reactive Banana bindings for SDL";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -216421,7 +216645,7 @@ self: {
];
description = "An alternate implementation of push-pull FRP";
license = "GPL";
- platforms = [ "armv7l-linux" ];
+ platforms = lib.platforms.none;
}) {};
"reactor" = callPackage
@@ -217103,18 +217327,20 @@ self: {
"recover-rtti" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, ghc-heap
, ghc-prim, mtl, QuickCheck, sop-core, stm, tasty, tasty-quickcheck
- , text, vector
+ , text, unordered-containers, vector
}:
mkDerivation {
pname = "recover-rtti";
- version = "0.1.0.0";
- sha256 = "19bf4279nfq8sv20v56sah30mv2g10zy2yxcylhc33w85d9jkisl";
+ version = "0.3.0.0";
+ sha256 = "0zk08jzsww8sv3q9h1mnc6a8ckqlf3lvc5cxwfbni7rb9giz6zia";
libraryHaskellDepends = [
aeson base bytestring containers ghc-heap mtl sop-core stm text
+ unordered-containers vector
];
testHaskellDepends = [
aeson base bytestring containers ghc-heap ghc-prim mtl QuickCheck
- sop-core stm tasty tasty-quickcheck text vector
+ sop-core stm tasty tasty-quickcheck text unordered-containers
+ vector
];
description = "Recover run-time type information from the GHC heap";
license = lib.licenses.bsd3;
@@ -217545,7 +217771,7 @@ self: {
version = "0.1.0.0";
sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9";
libraryHaskellDepends = [ base crypto-api ];
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"ref" = callPackage
@@ -218579,7 +218805,7 @@ self: {
sha256 = "1cvffbx2vhv18k4p95p0ddcxzyn8f10hg2bxa2da60fy9zkjg3am";
libraryHaskellDepends = [ base parsec ];
description = "The parser and render to parsec and render the string";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -218988,21 +219214,6 @@ self: {
}) {inherit (pkgs) pcre;};
"regex-pcre-builtin" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, regex-base
- , text
- }:
- mkDerivation {
- pname = "regex-pcre-builtin";
- version = "0.95.1.3.8.43";
- sha256 = "0n1sbsjch0n5cgv2lhw2yfaxb611mckyg0jpz2kcbyj5hcrvzv3c";
- libraryHaskellDepends = [
- array base bytestring containers regex-base text
- ];
- description = "PCRE Backend for \"Text.Regex\" (regex-base)";
- license = lib.licenses.bsd3;
- }) {};
-
- "regex-pcre-builtin_0_95_2_3_8_43" = callPackage
({ mkDerivation, array, base, bytestring, containers, regex-base
, text
}:
@@ -219015,7 +219226,6 @@ self: {
];
description = "PCRE Backend for \"Text.Regex\" (regex-base)";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"regex-pcre-text" = callPackage
@@ -219077,7 +219287,7 @@ self: {
sha256 = "1y4vmiq1xksxxd84yvyark6axsz51ywb6slswbddlxbdpcpfday7";
doHaddock = false;
description = "\"Regex for Windows\" C library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {};
"regex-posix-unittest" = callPackage
@@ -219768,6 +219978,8 @@ self: {
pname = "relation";
version = "0.5.2.0";
sha256 = "1sinb0rw2jq1xjy80rsxnjf5va33n2i67km55hxfls9w15wsg2yw";
+ revision = "1";
+ editedCabalFile = "18nh56qp1cjpg28sagwiy4h44v5dvm5rhm3wqyyz4mw3k78x71kh";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [
base containers doctest doctest-discover hedgehog hspec
@@ -220059,6 +220271,28 @@ self: {
license = lib.licenses.mit;
}) {};
+ "relude_1_0_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+ , doctest, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "relude";
+ version = "1.0.0.1";
+ sha256 = "0cw9a1gfvias4hr36ywdizhysnzbzxy20fb3jwmqmgjy40lzxp2g";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq ghc-prim hashable mtl stm text
+ transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring containers doctest Glob hedgehog text
+ ];
+ benchmarkHaskellDepends = [ base criterion unordered-containers ];
+ description = "Safe, performant, user-friendly and lightweight Haskell Standard Library";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"remark" = callPackage
({ mkDerivation, base, GenericPretty, tasty, tasty-golden
, tasty-hunit
@@ -221082,7 +221316,7 @@ self: {
sha256 = "1s0s3p0dy07222ks83w3spfw9df33q5lggqv3dw4m9hd5x16a6zi";
libraryHaskellDepends = [ base ];
description = "Abstraction to manage user defined Type Errors";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"rere" = callPackage
@@ -221168,8 +221402,8 @@ self: {
}:
mkDerivation {
pname = "rescue";
- version = "0.4.0";
- sha256 = "0hv2q8mkd94ksxgvijn83bkxf9lgnqn92g6k4ryl05z21sc8wl8d";
+ version = "0.4.2.1";
+ sha256 = "096wlxiz8bjvjpnp68qzmkplddm3nh5417b3amn9x6kj7wvbf1ky";
libraryHaskellDepends = [
base exceptions ghc mtl text transformers transformers-base
world-peace
@@ -221272,7 +221506,7 @@ self: {
base bytestring directory filepath tasty tasty-hunit
];
description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
}) {};
@@ -221330,7 +221564,7 @@ self: {
optparse-applicative process unix
];
description = "Remove trivial conflict markers in a git repository";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -221746,7 +221980,7 @@ self: {
base bytestring containers tasty tasty-hunit temporary text
];
description = "Easy Git repository serialization";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"restricted-workers" = callPackage
@@ -222041,7 +222275,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ array base process ];
description = "Text-only reversi (aka othelo) game";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -222393,7 +222627,7 @@ self: {
];
testHaskellDepends = [ base simple-cmd ];
description = "Bugzilla query tool";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -223256,7 +223490,7 @@ self: {
];
executableHaskellDepends = [ ansi-terminal base options time ];
description = "Ring-LWE/LWR challenges using Lol";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -223365,7 +223599,7 @@ self: {
monad-control mtl process resourcet text time unix
];
description = "A build daemon for Haskell development";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -223825,7 +224059,7 @@ self: {
base optparse-applicative random regex-applicative
];
description = "Playing with applicatives and dice!";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -224005,7 +224239,7 @@ self: {
wreq
];
description = "Query the namecoin blockchain";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"rose" = callPackage
@@ -224064,7 +224298,7 @@ self: {
base containers deepseq minilens mtl transformers
];
description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -224825,7 +225059,9 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Bindings to librtlsdr";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) rtl-sdr;};
"rtnetlink" = callPackage
@@ -224887,7 +225123,7 @@ self: {
QuickCheck temporary utf8-string
];
description = "Parsing and manipulation of rtorrent state file contents";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"rts-loader" = callPackage
@@ -224906,7 +225142,7 @@ self: {
];
executableHaskellDepends = [ base Cabal process ];
description = "Dynamically load Haskell libraries";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -224925,8 +225161,10 @@ self: {
libraryToolDepends = [ c2hs ];
testHaskellDepends = [ base ];
description = "Binding to the C++ audio stretching library Rubber Band";
- license = lib.licenses.gpl3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ license = lib.licenses.gpl3Only;
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) rubberband;};
"ruby-marshal" = callPackage
@@ -225093,7 +225331,7 @@ self: {
base cmdargs directory filepath old-time process
];
description = "runghc replacement for fast repeated runs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"runhs" = callPackage
@@ -226682,7 +226920,7 @@ self: {
];
testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
description = "SwiftNav's SBP Library";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"sbp2udp" = callPackage
@@ -226987,7 +227225,7 @@ self: {
base hspec scalpel scalpel-core tagsoup text uri
];
description = "scalpel scrapers for search engines";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -227229,7 +227467,7 @@ self: {
options text text-icu transformers wai warp
];
description = "Find the ideal lesson layout";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -227278,7 +227516,7 @@ self: {
base groom hspec msgpack-binary QuickCheck
];
description = "Encoding-independent schemas for Haskell data types";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -227858,7 +228096,7 @@ self: {
base ditto ditto-lucid lucid scotty text
];
description = "Html form validation using `ditto`";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -228167,7 +228405,7 @@ self: {
test-framework-quickcheck2 text validation
];
description = "Scrape websites for changes";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -228241,7 +228479,7 @@ self: {
vector
];
description = "scroll(6), a roguelike game";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"scrypt" = callPackage
@@ -228464,7 +228702,7 @@ self: {
base Cabal hspec hspec-core lrucache QuickCheck stm
];
description = "image compositing with sdl2 - declarative style";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -228548,7 +228786,9 @@ self: {
libraryPkgconfigDepends = [ SDL2_mixer ];
description = "Bindings to SDL2_mixer";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) SDL2_mixer;};
"sdl2-sprite" = callPackage
@@ -228588,7 +228828,9 @@ self: {
libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
description = "Bindings to SDL2_ttf";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
"sdnv" = callPackage
@@ -229069,7 +229311,7 @@ self: {
base containers diagrams-cairo diagrams-lib haskell-qrencode random
];
description = "Secret Santa game assigner using QR-Codes";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -229091,7 +229333,7 @@ self: {
test-framework test-framework-quickcheck2 vector
];
description = "Information-theoretic secure secret sharing";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {};
"secrm" = callPackage
@@ -229165,7 +229407,7 @@ self: {
];
librarySystemDepends = [ sedna ];
description = "Sedna C API XML Binding";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {sedna = null;};
@@ -229286,8 +229528,8 @@ self: {
}:
mkDerivation {
pname = "selective";
- version = "0.4.1.1";
- sha256 = "1ix9080g4qcs3w89bmilr6f84kg6vw9hyx5cs5hiw9xnp7dh4sdc";
+ version = "0.4.2";
+ sha256 = "1mg5hnr3f4zjh3ajy16jkxj630rnfa9iqnnmpjqd9gkjdxpssd5l";
libraryHaskellDepends = [ base containers transformers ];
testHaskellDepends = [
base containers mtl QuickCheck tasty tasty-expected-failure
@@ -229456,7 +229698,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Evaluate code snippets in Literate Haskell";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -230023,7 +230265,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "SmartyPants for Korean language";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -230198,7 +230440,7 @@ self: {
tasty-hunit transformers vector
];
description = "A package with basic parsing utilities for several Bioinformatic data formats";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"sequenceTools" = callPackage
@@ -230226,7 +230468,7 @@ self: {
base bytestring hspec pipes sequence-formats vector
];
description = "A package with tools for processing DNA sequencing data";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"sequent-core" = callPackage
@@ -232073,7 +232315,7 @@ self: {
];
testHaskellDepends = [ base hspec QuickCheck servant-server text ];
description = "Type-safe pagination for Servant APIs";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -232316,8 +232558,8 @@ self: {
({ mkDerivation, base, servant-client-core, servant-rawm }:
mkDerivation {
pname = "servant-rawm-client";
- version = "1.0.0.1";
- sha256 = "0ldjhmmfdh0jpfaz4sg1b9n5l23wza3w0m8bvvf80gvl7p6fk0fj";
+ version = "1.0.0.2";
+ sha256 = "08b52fzg1q2p8r58cwbjfc2ixrsxhv1hpzh99wb276s6bka4m9lr";
libraryHaskellDepends = [ base servant-client-core servant-rawm ];
description = "The client implementation of servant-rawm";
license = lib.licenses.bsd3;
@@ -233500,7 +233742,7 @@ self: {
executableHaskellDepends = [ base ];
testHaskellDepends = [ base directory exceptions hspec ];
description = "Session types library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -233524,7 +233766,7 @@ self: {
base distributed-process hspec network-transport-tcp sessiontypes
];
description = "Session types distributed";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -233807,7 +234049,7 @@ self: {
test-framework-hunit test-framework-quickcheck2
];
description = "S-Expression parsing/printing made fun and easy";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -234270,8 +234512,7 @@ self: {
];
description = "Build rules for historical benchmarking";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ maintainers = with lib.maintainers; [ maralorn ];
}) {};
"shake-bindist" = callPackage
@@ -234528,7 +234769,7 @@ self: {
];
executableHaskellDepends = [ base shake ];
description = "Shake build system on-disk caching";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -235799,7 +236040,7 @@ self: {
hmatrix JuicyPixels random random-shuffle split vector
];
description = "Machine Learning algorithms";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -235812,7 +236053,7 @@ self: {
sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m";
libraryHaskellDepends = [ base ];
description = "Sieve is an implementation of the Sieve abstract data type";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"sifflet" = callPackage
@@ -235936,8 +236177,8 @@ self: {
}:
mkDerivation {
pname = "signable";
- version = "0.3";
- sha256 = "1bh4i93333s3yldn4nnl4xv4gb92ggdwap6im9f259cfg1v22d2q";
+ version = "0.4";
+ sha256 = "0fzf3zijr61ifqbxkmkzii8vbl5h04ydpzc24z5ixvcq94yfzlgx";
libraryHaskellDepends = [
asn1-encoding asn1-types base binary bytestring casing cryptonite
memory microlens pem proto-lens proto-lens-runtime
@@ -236144,7 +236385,7 @@ self: {
unordered-containers vector wai wai-extra
];
description = "A minimalist web framework for the WAI server interface";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"simple-actors" = callPackage
@@ -236398,7 +236639,7 @@ self: {
libraryHaskellDepends = [ base parsec text transformers ];
executableHaskellDepends = [ base text ];
description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -236699,7 +236940,7 @@ self: {
resource-pool simple transformers
];
description = "Connector package for integrating postgresql-orm with the Simple web framework";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"simple-reflect" = callPackage
@@ -236775,7 +237016,7 @@ self: {
cookie cryptohash http-types simple transformers wai wai-extra
];
description = "Cookie-based session management for the Simple web framework";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"simple-sessions" = callPackage
@@ -236893,7 +237134,7 @@ self: {
aeson attoparsec base hspec HUnit scientific vector
];
description = "A basic template language for the Simple web framework";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"simple-text-format" = callPackage
@@ -236926,7 +237167,7 @@ self: {
transformers vector vty
];
description = "UI library for terminal";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -237163,7 +237404,7 @@ self: {
base directory filepath mtl process random regex-compat split time
];
description = "A simple markup language that translates to LaTeX";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"simplex-basic" = callPackage
@@ -237226,7 +237467,7 @@ self: {
sha256 = "0a8414006gdya8b4dw38251kim3x2i5g7m03ga479ialghralrc8";
libraryHaskellDepends = [ base containers ];
description = "Load data organized in a tree";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"since" = callPackage
@@ -237329,6 +237570,18 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "singleton-nats_0_4_6" = callPackage
+ ({ mkDerivation, base, singletons, singletons-base }:
+ mkDerivation {
+ pname = "singleton-nats";
+ version = "0.4.6";
+ sha256 = "1drjwwkpszgifhnd7p4qqz92z85nh7w81w1hpdqv9a6vc5hfbv7r";
+ libraryHaskellDepends = [ base singletons singletons-base ];
+ description = "Unary natural numbers relying on the singletons infrastructure";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"singleton-typelits" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -237367,23 +237620,74 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "singletons_3_0" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "singletons";
+ version = "3.0";
+ sha256 = "1zrnmdv00i9lyrqvbvljx24lvi49p11m5gbvh1xc2ygnhgb6xmx5";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ description = "Basic singleton types and definitions";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "singletons-base" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, deepseq, directory
+ , filepath, pretty, process, singletons, singletons-th, tasty
+ , tasty-golden, template-haskell, text, th-desugar, turtle
+ }:
+ mkDerivation {
+ pname = "singletons-base";
+ version = "3.0";
+ sha256 = "0syrh4f9rs4g643c90md1vqrpr6p8h8g8sh4x3j2dld12yvrw4wn";
+ setupHaskellDepends = [ base Cabal directory filepath ];
+ libraryHaskellDepends = [
+ base pretty singletons singletons-th template-haskell text
+ th-desugar
+ ];
+ testHaskellDepends = [
+ base bytestring deepseq filepath process tasty tasty-golden text
+ turtle
+ ];
+ description = "A promoted and singled version of the base library";
+ license = lib.licenses.bsd3;
+ }) {};
+
"singletons-presburger" = callPackage
- ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl
- , reflection, singletons
+ ({ mkDerivation, base, ghc-typelits-presburger, mtl, reflection
+ , singletons
}:
mkDerivation {
pname = "singletons-presburger";
- version = "0.5.0.0";
- sha256 = "0pc95rg9vbcgzw6bzsj41vbz3h85p4lhf1ry8ik6l8c2nz3ga6bb";
+ version = "0.6.0.0";
+ sha256 = "1yg1l770c2817yhm569ij5rb8l15c69p5f68i0vrdd8kwpv1ka63";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base ghc ghc-typelits-presburger mtl reflection singletons
+ base ghc-typelits-presburger mtl reflection singletons
];
description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
license = lib.licenses.bsd3;
}) {};
+ "singletons-th" = callPackage
+ ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons
+ , syb, template-haskell, th-desugar, th-orphans, transformers
+ }:
+ mkDerivation {
+ pname = "singletons-th";
+ version = "3.0";
+ sha256 = "1c0w7sg0lbpizrzns4g55wxsk5jm8wlqw0w9rz4jzqwy15byb572";
+ libraryHaskellDepends = [
+ base containers ghc-boot-th mtl singletons syb template-haskell
+ th-desugar th-orphans transformers
+ ];
+ description = "A framework for generating singleton types";
+ license = lib.licenses.bsd3;
+ }) {};
+
"singnal" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -237392,7 +237696,7 @@ self: {
sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj";
libraryHaskellDepends = [ base ];
description = "Singnal";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -237972,38 +238276,59 @@ self: {
"skylighting" = callPackage
({ mkDerivation, base, binary, blaze-html, bytestring, containers
- , directory, filepath, pretty-show, skylighting-core, text
+ , pretty-show, skylighting-core, text
}:
mkDerivation {
pname = "skylighting";
- version = "0.10.4";
- sha256 = "057nrlm714r78rfdrqyy4zjl50npvz5qaprrb9nfwdiyb50nyz2j";
+ version = "0.10.4.1";
+ sha256 = "1a1s0fvfbq9q4fy72192mh9sdxz81cpl2z6ghsbh7prfl2kbqsiv";
configureFlags = [ "-fexecutable" ];
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base binary bytestring containers skylighting-core
+ base binary containers skylighting-core
];
executableHaskellDepends = [
- base blaze-html bytestring containers directory filepath
- pretty-show text
+ base blaze-html bytestring containers pretty-show text
];
description = "syntax highlighting library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
+ }) {};
+
+ "skylighting_0_10_5" = callPackage
+ ({ mkDerivation, base, binary, blaze-html, bytestring, containers
+ , pretty-show, skylighting-core, text
+ }:
+ mkDerivation {
+ pname = "skylighting";
+ version = "0.10.5";
+ sha256 = "09f21wkw8n5bjdn5bbrqphq4f44gipd1cb9b0ikjn9zrggglfnx9";
+ configureFlags = [ "-fexecutable" ];
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary containers skylighting-core
+ ];
+ executableHaskellDepends = [
+ base blaze-html bytestring containers pretty-show text
+ ];
+ description = "syntax highlighting library";
+ license = lib.licenses.gpl2Only;
+ hydraPlatforms = lib.platforms.none;
}) {};
"skylighting-core" = callPackage
({ mkDerivation, aeson, ansi-terminal, attoparsec, base
, base64-bytestring, binary, blaze-html, bytestring
, case-insensitive, colour, containers, criterion, Diff, directory
- , filepath, HUnit, mtl, pretty-show, QuickCheck, random, safe
- , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text
- , transformers, utf8-string, xml-conduit
+ , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden
+ , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string
+ , xml-conduit
}:
mkDerivation {
pname = "skylighting-core";
- version = "0.10.4";
- sha256 = "0b5cbwsr5mnl4wppxw8rwy4a14pk6s804c4qwf1cd2vzz9j64dag";
+ version = "0.10.4.1";
+ sha256 = "07pnwixyi4v24412j6fs2j5kip2j2rx5fakpdiczffwma4jagv73";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -238012,9 +238337,9 @@ self: {
filepath mtl safe text transformers utf8-string xml-conduit
];
testHaskellDepends = [
- aeson base bytestring containers Diff directory filepath HUnit
- pretty-show QuickCheck random tasty tasty-golden tasty-hunit
- tasty-quickcheck text utf8-string
+ aeson base bytestring containers Diff directory filepath
+ pretty-show QuickCheck tasty tasty-golden tasty-hunit
+ tasty-quickcheck text
];
benchmarkHaskellDepends = [
base containers criterion directory filepath text
@@ -238023,6 +238348,38 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "skylighting-core_0_10_5" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+ , base64-bytestring, binary, blaze-html, bytestring
+ , case-insensitive, colour, containers, criterion, Diff, directory
+ , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden
+ , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string
+ , xml-conduit
+ }:
+ mkDerivation {
+ pname = "skylighting-core";
+ version = "0.10.5";
+ sha256 = "1iaisswfg8ab6rd11002390jfxr309qyvlm85h57mi8svwxk09x2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal attoparsec base base64-bytestring binary
+ blaze-html bytestring case-insensitive colour containers directory
+ filepath mtl safe text transformers utf8-string xml-conduit
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers Diff directory filepath
+ pretty-show QuickCheck tasty tasty-golden tasty-hunit
+ tasty-quickcheck text
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion directory filepath text
+ ];
+ description = "syntax highlighting library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"skylighting-extensions" = callPackage
({ mkDerivation, base, containers, skylighting, skylighting-modding
, text
@@ -238297,7 +238654,7 @@ self: {
libraryHaskellDepends = [ base time ];
executableHaskellDepends = [ base time ];
description = "zZzzZz";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"slice-cpp-gen" = callPackage
@@ -238431,6 +238788,23 @@ self: {
license = lib.licenses.mpl20;
}) {};
+ "slist_0_2_0_0" = callPackage
+ ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec
+ , hspec-hedgehog
+ }:
+ mkDerivation {
+ pname = "slist";
+ version = "0.2.0.0";
+ sha256 = "1aiswwh33rxp49adhjygyjrhivsflafz5z0kyv3wfnb0wk15jv96";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [
+ base doctest Glob hedgehog hspec hspec-hedgehog
+ ];
+ description = "Sized list";
+ license = lib.licenses.mpl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"sloane" = callPackage
({ mkDerivation, aeson, ansi-terminal, attoparsec, base
, bloomfilter, bytestring, conduit, conduit-extra, containers
@@ -238469,7 +238843,7 @@ self: {
base Chart Chart-cairo colour data-default-class lens
];
description = "Visualize mathematical function's slope fields";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"slot-lambda" = callPackage
@@ -238969,7 +239343,7 @@ self: {
testHaskellDepends = [ base containers hspec QuickCheck ];
benchmarkHaskellDepends = [ base criterion time ];
description = "Symbolic Model Checking for Dynamic Epistemic Logic";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -239179,7 +239553,7 @@ self: {
template-haskell
];
description = "A type-safe interface to communicate with an SMT solver";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -239197,7 +239571,7 @@ self: {
mtl smtlib2 smtlib2-pipe text
];
description = "Dump the communication with an SMT solver for debugging purposes";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -239220,7 +239594,7 @@ self: {
base Cabal cabal-test-quickcheck smtlib2 smtlib2-quickcheck
];
description = "A type-safe interface to communicate with an SMT solver";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -239237,7 +239611,7 @@ self: {
base containers dependent-map dependent-sum mtl QuickCheck smtlib2
];
description = "Helper functions to create SMTLib expressions in QuickCheck";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -239250,7 +239624,7 @@ self: {
sha256 = "12828gfip43pwjwnhd0smvkz1ar71gbp4lkv3njli6yp5dbcwfi5";
libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ];
description = "Get timing informations for SMT queries";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -239590,6 +239964,8 @@ self: {
];
description = "Serve Elm files through the Snap web framework";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"snap-error-collector" = callPackage
@@ -239967,7 +240343,7 @@ self: {
snap snap-core
];
description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -240203,6 +240579,8 @@ self: {
testHaskellDepends = [ base hspec-snap hspec2 lens snap text ];
description = "Lexical Style Sheets - Snap Web Framework adaptor";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"snaplet-mandrill" = callPackage
@@ -240544,7 +240922,7 @@ self: {
sednaDBXML snap
];
description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -240806,7 +241184,7 @@ self: {
base classy-prelude containers lens linear mtl ncurses transformers
];
description = "Tiny, declarative wrapper around ncurses";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -240867,7 +241245,7 @@ self: {
base containers directory filepath HsSyck parsec safe spoonutil
];
description = "The Simple Nice-Looking Manual Generator";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -240911,7 +241289,7 @@ self: {
optparse-applicative parsec random
];
description = "Strategic board game of medium complexity";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -241013,7 +241391,7 @@ self: {
base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random
];
description = "randomized fractal snowflakes demo";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"snowtify" = callPackage
@@ -241388,7 +241766,7 @@ self: {
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base cairo gtk old-time stm ];
description = "GUI functions as used in the book \"The Haskell School of Expression\"";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -241632,7 +242010,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec HUnit QuickCheck ];
description = "Generate string for sort key";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"sorting" = callPackage
@@ -241906,26 +242284,33 @@ self: {
}) {};
"spacecookie" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
- , directory, fast-logger, filepath, hxt-unicode, mtl, socket
- , systemd, transformers, unix
+ ({ mkDerivation, aeson, async, attoparsec, base, bytestring
+ , containers, directory, download-curl, fast-logger
+ , filepath-bytestring, hxt-unicode, mtl, process, socket, systemd
+ , tasty, tasty-expected-failure, tasty-hunit, text, transformers
+ , unix
}:
mkDerivation {
pname = "spacecookie";
- version = "0.2.1.2";
- sha256 = "0cb51kji78vfg17mcnz3a5jlfbnyavh880x09b18y9syqwx4in7l";
+ version = "1.0.0.0";
+ sha256 = "0v61n5afcrfmj7dd51h4wi7d5hzl4r86wvaymhsi3h4jday58ln0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- attoparsec base bytestring containers directory fast-logger
- filepath hxt-unicode mtl socket transformers unix
+ async attoparsec base bytestring containers directory
+ filepath-bytestring hxt-unicode mtl socket text transformers unix
];
executableHaskellDepends = [
- aeson attoparsec base bytestring containers directory filepath mtl
- socket systemd transformers unix
+ aeson attoparsec base bytestring containers directory fast-logger
+ filepath-bytestring mtl socket systemd text transformers unix
];
- description = "Gopher Library and Server Daemon";
- license = lib.licenses.gpl3;
+ testHaskellDepends = [
+ attoparsec base bytestring containers directory download-curl
+ filepath-bytestring process tasty tasty-expected-failure
+ tasty-hunit
+ ];
+ description = "Gopher server library and daemon";
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ sternenseemann ];
}) {};
@@ -242060,7 +242445,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "An SPARQL 1.1 Protocol client library.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"sparrow" = callPackage
@@ -242173,7 +242558,7 @@ self: {
mwc-random primitive QuickCheck scientific
];
description = "Numerical computing in native Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"sparse-tensor" = callPackage
@@ -242293,7 +242678,7 @@ self: {
tasty-quickcheck vector-space
];
description = "Rotate about any suitable axis";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"spawn" = callPackage
@@ -242461,7 +242846,7 @@ self: {
sparse-linear-algebra statistics vector
];
description = "Library for spectral clustering";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -242815,7 +243200,7 @@ self: {
tasty tasty-hunit tasty-quickcheck vector
];
description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -243019,7 +243404,7 @@ self: {
base directory extensible-exceptions filepath parsec
];
description = "Spoon's utilities. Simple testing and nice looking error reporting.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -243686,7 +244071,7 @@ self: {
temporary text time vty
];
description = "text UI for scanning with SANE";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -245443,7 +245828,7 @@ self: {
sha256 = "0b6y8yi0cfisi58pxxx1gnd1vab2i8f5wb3gzv1dfsxx5hl6jlwf";
libraryHaskellDepends = [ base MissingH ];
description = "Reusable static analysis interfaces and modules";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"statistics" = callPackage
@@ -245569,7 +245954,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base statistics text vector ];
description = "command line statistics";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -245586,7 +245971,7 @@ self: {
base bytestring monad-control mtl network random
];
description = "StatsD API";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -245843,7 +246228,7 @@ self: {
aeson base base64-bytestring binary bytestring split text
];
description = "Parse Structured Test Data Format (STDF)";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -246322,7 +246707,7 @@ self: {
libraryHaskellDepends = [ base mtl process stm unix ];
testHaskellDepends = [ base QuickCheck stm ];
description = "Simple STM Promises for IO computations and external processes";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -246442,7 +246827,7 @@ self: {
base Chart Chart-cairo containers mtl random
];
description = "Monadic composition of probabilistic functions and sampling";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -246694,8 +247079,8 @@ self: {
}:
mkDerivation {
pname = "store";
- version = "0.7.9";
- sha256 = "189ygrm1ycyyklh77a9vhdvw86gbhjba0kl8kj7z1b79sw8q4v4g";
+ version = "0.7.10";
+ sha256 = "0026bjff7nsw23i1l5427qnvw69ncbii5s2q1nshkrs1nrspb0i2";
libraryHaskellDepends = [
array async base base-orphans base64-bytestring bifunctors
bytestring containers contravariant cryptohash deepseq directory
@@ -246840,7 +247225,7 @@ self: {
unordered-containers vector
];
description = "Client for Stratum protocol";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -247569,6 +247954,8 @@ self: {
pname = "streamly";
version = "0.7.3";
sha256 = "11bjyyqc745igw7122284fjph0922l56jddnhfy5h7w84nj35ck3";
+ revision = "1";
+ editedCabalFile = "1fbhk59p5hjkxf4dnghs8wb70pyv0kx6br5sf4csf4vk1rkqyljw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -248686,8 +249073,8 @@ self: {
}:
mkDerivation {
pname = "strive";
- version = "5.0.13";
- sha256 = "137kqb3lvqyzvarcgvc8ifphj2927z01pcl752sna9vcvj7q7wp6";
+ version = "5.0.14";
+ sha256 = "0a9hnrl7ww92ki1z4qa8m2smxlc0gq2a856w706ayzzfkma5dxil";
libraryHaskellDepends = [
aeson base bytestring data-default gpolyline http-client
http-client-tls http-types template-haskell text time transformers
@@ -248776,7 +249163,7 @@ self: {
testing-feat
];
description = "Instantiate structural induction schemas for algebraic data types";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -248815,26 +249202,6 @@ self: {
}) {};
"structured-cli" = callPackage
- ({ mkDerivation, base, data-default, exceptions, haskeline, mtl
- , split, transformers
- }:
- mkDerivation {
- pname = "structured-cli";
- version = "2.6.0.0";
- sha256 = "1g0yq5kxidmh4x0izvspafhhir64krw986s0a5rkbvkjk7ahvm7y";
- revision = "1";
- editedCabalFile = "0gmviyrihzpm27s91ygs5fzdawk33aqw74dyasn354kfczq5vza7";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base data-default exceptions haskeline mtl split transformers
- ];
- executableHaskellDepends = [ base data-default mtl split ];
- description = "Application library for building interactive console CLIs";
- license = lib.licenses.bsd3;
- }) {};
-
- "structured-cli_2_7_0_1" = callPackage
({ mkDerivation, base, data-default, exceptions, haskeline, mtl
, split, transformers
}:
@@ -248850,7 +249217,6 @@ self: {
executableHaskellDepends = [ base data-default mtl split ];
description = "Application library for building interactive console CLIs";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"structured-haskell-mode" = callPackage
@@ -249208,8 +249574,8 @@ self: {
}:
mkDerivation {
pname = "subcategories";
- version = "0.1.0.0";
- sha256 = "0rrvlwfyjmv4wpvm9dbr4vxbmlr24pzdfwvz3hkshgxnrc58gslw";
+ version = "0.1.1.0";
+ sha256 = "09ri226jxcig4f3jxcjh63skvv48myis58ffj7zrmr12sfzkb279";
libraryHaskellDepends = [
base containers data-default foldl hashable mono-traversable
pointed primitive reflection semialign template-haskell text these
@@ -249273,7 +249639,7 @@ self: {
base containers lens mtl parsec pretty template-haskell
];
description = "Toolchain of subleq computer";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -249307,7 +249673,7 @@ self: {
base cmark hlint hspec template-haskell text
];
description = "Extract a part from CommonMark/Markdown docs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -249338,7 +249704,7 @@ self: {
base bytestring cassava containers optparse-generic text vector
];
description = "Subsample data";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -249410,7 +249776,7 @@ self: {
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers hspec ];
description = "Helps when going \"seed values\" -> alternatives and optional -> answers";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"success" = callPackage
@@ -249474,7 +249840,7 @@ self: {
libraryHaskellDepends = [ base vector ];
executableHaskellDepends = [ base HUnit ];
description = "n log n implementation of suffix array";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -250288,7 +250654,7 @@ self: {
sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz";
libraryHaskellDepends = [ array base ];
description = "A support vector machine written in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"svm-light-utils" = callPackage
@@ -250490,7 +250856,7 @@ self: {
random-shuffle readline system-fileio system-filepath text
];
description = "Clojure without alphanumerics";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -250571,7 +250937,7 @@ self: {
test-framework test-framework-hunit text time
];
description = "A semantic web toolkit";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
}) {};
"swiss-ephemeris" = callPackage
@@ -250579,13 +250945,13 @@ self: {
}:
mkDerivation {
pname = "swiss-ephemeris";
- version = "1.2.1.0";
- sha256 = "0mbq3mzplxnnpr1zqbgg6k1ggh0fw4xlzvyg74rid863dxcldjpm";
+ version = "1.2.1.1";
+ sha256 = "1k584gv36xgj87qbrvcl5w9v8z2k7y4csmz737d5r2a8mvf8sf33";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base directory hspec QuickCheck ];
testToolDepends = [ hspec-discover ];
description = "Haskell bindings for the Swiss Ephemeris C library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -250929,7 +251295,7 @@ self: {
text transformers
];
description = "Library for Typed Tagless-Final Higher-Order Composable DSL";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -250952,7 +251318,7 @@ self: {
tasty tasty-golden text time transformers treeseq
];
description = "Library for reading and writing Atom";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -250965,7 +251331,7 @@ self: {
sha256 = "1yvlvsr38b1ydplpz1jldy816sngmic273iajcmhr73rlyzk5y3d";
libraryHaskellDepends = [ base ];
description = "Basic symantics for writing Embedded Domain-Specific Languages (EDSL)";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"symantic-cli" = callPackage
@@ -250981,7 +251347,7 @@ self: {
transformers
];
description = "Symantics for parsing and documenting a CLI";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -250999,7 +251365,7 @@ self: {
base containers tasty tasty-hunit text transformers
];
description = "Document symantics";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"symantic-grammar" = callPackage
@@ -251015,7 +251381,7 @@ self: {
base megaparsec tasty tasty-hunit text transformers
];
description = "Library for symantic grammars";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"symantic-http" = callPackage
@@ -251031,7 +251397,7 @@ self: {
text transformers
];
description = "Symantic combinators for deriving clients or a server from an HTTP API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -251051,7 +251417,7 @@ self: {
symantic-http text time transformers word8
];
description = "symantic-http applied to the derivation of HTTP clients";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -251079,7 +251445,7 @@ self: {
time transformers wai wai-extra warp
];
description = "Demo for symantic-http and its companion libraries";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -251102,7 +251468,7 @@ self: {
symantic-http text time transformers word8
];
description = "Streaming support through pipes for symantic-http";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -251122,7 +251488,7 @@ self: {
text time transformers wai warp word8
];
description = "symantic-http applied to the derivation of HTTP servers";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -251151,7 +251517,7 @@ self: {
transformers wai wai-extra warp
];
description = "Test symantic-http and its companion libraries";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -251175,7 +251541,7 @@ self: {
tasty-hunit text transformers
];
description = "Symantics for common types";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -251225,7 +251591,7 @@ self: {
symantic-base tasty tasty-golden text transformers treeseq
];
description = "Library for reading, validating and writing XML";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -251381,7 +251747,7 @@ self: {
ansi-terminal base monad-loops random
];
description = "Minimal implementation(s) of the classic electronic memory game";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"sync" = callPackage
@@ -253658,23 +254024,6 @@ self: {
}) {};
"tasty" = callPackage
- ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
- , optparse-applicative, stm, tagged, unbounded-delays, unix
- , wcwidth
- }:
- mkDerivation {
- pname = "tasty";
- version = "1.2.3";
- sha256 = "0qpn0avpw4w1qq5r2gwh2piipj0llqq6ylagr3xnqiraq6mhg8cc";
- libraryHaskellDepends = [
- ansi-terminal async base clock containers mtl optparse-applicative
- stm tagged unbounded-delays unix wcwidth
- ];
- description = "Modern and extensible testing framework";
- license = lib.licenses.mit;
- }) {};
-
- "tasty_1_4_1" = callPackage
({ mkDerivation, ansi-terminal, base, clock, containers, mtl
, optparse-applicative, stm, tagged, unbounded-delays, unix
, wcwidth
@@ -253689,27 +254038,9 @@ self: {
];
description = "Modern and extensible testing framework";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"tasty-ant-xml" = callPackage
- ({ mkDerivation, base, containers, directory, filepath
- , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
- , xml
- }:
- mkDerivation {
- pname = "tasty-ant-xml";
- version = "1.1.7";
- sha256 = "01br1jqmin3kislw59rdsgl4pggdf8miwddifj654dllfgg148vg";
- libraryHaskellDepends = [
- base containers directory filepath generic-deriving ghc-prim mtl
- stm tagged tasty transformers xml
- ];
- description = "Render tasty output to XML for Jenkins";
- license = lib.licenses.bsd3;
- }) {};
-
- "tasty-ant-xml_1_1_8" = callPackage
({ mkDerivation, base, containers, directory, filepath
, generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
, xml
@@ -253724,7 +254055,6 @@ self: {
];
description = "Render tasty output to XML for Jenkins";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"tasty-auto" = callPackage
@@ -253787,6 +254117,18 @@ self: {
license = lib.licenses.mit;
}) {};
+ "tasty-bench_0_2_3" = callPackage
+ ({ mkDerivation, base, containers, deepseq, tasty }:
+ mkDerivation {
+ pname = "tasty-bench";
+ version = "0.2.3";
+ sha256 = "16273rxlvjh960mdlhkpggx8rbza1n18fxl9m9yi8dhkli4g0w6a";
+ libraryHaskellDepends = [ base containers deepseq tasty ];
+ description = "Featherlight benchmark framework";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"tasty-dejafu" = callPackage
({ mkDerivation, base, dejafu, random, tagged, tasty }:
mkDerivation {
@@ -253875,28 +254217,6 @@ self: {
}) {};
"tasty-golden" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, deepseq
- , directory, filepath, mtl, optparse-applicative, process, tagged
- , tasty, tasty-hunit, temporary, text
- }:
- mkDerivation {
- pname = "tasty-golden";
- version = "2.3.3.2";
- sha256 = "19dif84p71hks8czmaff6nlylsz34bqy0nki7mclr4ysawz1hdm9";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- async base bytestring containers deepseq directory filepath mtl
- optparse-applicative process tagged tasty temporary text
- ];
- testHaskellDepends = [
- base directory filepath process tasty tasty-hunit temporary
- ];
- description = "Golden tests support for tasty";
- license = lib.licenses.mit;
- }) {};
-
- "tasty-golden_2_3_4" = callPackage
({ mkDerivation, async, base, bytestring, containers, deepseq
, directory, filepath, mtl, optparse-applicative, process, tagged
, tasty, tasty-hunit, temporary, text, unix-compat
@@ -253917,7 +254237,25 @@ self: {
];
description = "Golden tests support for tasty";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "tasty-grading-system" = callPackage
+ ({ mkDerivation, aeson, base, containers, directory, filepath
+ , generic-deriving, mtl, stm, tagged, tasty, tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "tasty-grading-system";
+ version = "0.1.0.0";
+ sha256 = "1r72gbylmv466naxkqsf56wlkp5kzhvyq0w3k7g47hs1rlslllmp";
+ revision = "2";
+ editedCabalFile = "1kr1113k6a0d8yd51lvl1689wdbq2lb2fp44rl6jzdaizxvj360f";
+ libraryHaskellDepends = [
+ aeson base containers directory filepath generic-deriving mtl stm
+ tagged tasty text
+ ];
+ testHaskellDepends = [ aeson base tasty tasty-hunit ];
+ description = "Grade your tasty-testsuite";
+ license = lib.licenses.bsd3;
}) {};
"tasty-groundhog-converters" = callPackage
@@ -253948,6 +254286,8 @@ self: {
pname = "tasty-hedgehog";
version = "1.0.1.0";
sha256 = "0vkmhqfydyxbvjjbwvwn0q1f1a2dl9wmhz0s7020frpzwqcjwm5b";
+ revision = "1";
+ editedCabalFile = "1yhj5jpgsr1mflsadf1fgaj8hh7y3dnfsg95m6bni7xprdnw6nf9";
libraryHaskellDepends = [ base hedgehog tagged tasty ];
testHaskellDepends = [
base hedgehog tasty tasty-expected-failure
@@ -253988,6 +254328,8 @@ self: {
pname = "tasty-hspec";
version = "1.1.6";
sha256 = "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl";
+ revision = "1";
+ editedCabalFile = "0za15rg0szacxq9yfxxjzddr77ai7ng5827a20pj9dr5anjlnajj";
libraryHaskellDepends = [
base hspec hspec-core QuickCheck tasty tasty-quickcheck
tasty-smallcheck
@@ -254291,33 +254633,6 @@ self: {
}) {};
"tasty-silver" = callPackage
- ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
- , deepseq, directory, filepath, mtl, optparse-applicative, process
- , process-extras, regex-tdfa, semigroups, stm, tagged, tasty
- , tasty-hunit, temporary, text, transformers
- }:
- mkDerivation {
- pname = "tasty-silver";
- version = "3.1.15";
- sha256 = "07iiaw5q5jb6bxm5ys1s6bliw0qxsqp100awzxwkwfia03i1iz8z";
- revision = "1";
- editedCabalFile = "1pxwixy274w0z99zsx0aywcxcajnpgan3qri81mr1wb6afxrq8d6";
- libraryHaskellDepends = [
- ansi-terminal async base bytestring containers deepseq directory
- filepath mtl optparse-applicative process process-extras regex-tdfa
- semigroups stm tagged tasty temporary text
- ];
- testHaskellDepends = [
- base directory filepath process tasty tasty-hunit temporary
- transformers
- ];
- description = "A fancy test runner, including support for golden tests";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "tasty-silver_3_2_1" = callPackage
({ mkDerivation, ansi-terminal, async, base, bytestring, containers
, deepseq, directory, filepath, mtl, optparse-applicative, process
, process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
@@ -254474,7 +254789,7 @@ self: {
typed-process
];
description = "Terminal user acceptance testing (UAT) via tmux";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"tasty-travis" = callPackage
@@ -254547,7 +254862,7 @@ self: {
base dollaridoos profunctors semigroups
];
description = "Types and combinators for taxes";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"tbox" = callPackage
@@ -255029,7 +255344,7 @@ self: {
aeson base bytestring data-default http-conduit url utf8-string
];
description = "Telegram API client";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -255249,7 +255564,7 @@ self: {
regex-pcre split tagsoup text time transformers
];
description = "IRC tellbot";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -255401,7 +255716,7 @@ self: {
unordered-containers uri-encode
];
description = "Template Toolkit implementation for Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"template-yj" = callPackage
@@ -255427,7 +255742,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base mtl tagsoup uniplate ];
description = "Make template from website";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -255661,7 +255976,7 @@ self: {
executableHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Programmers' time tracker";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"tensor" = callPackage
@@ -255673,7 +255988,7 @@ self: {
libraryHaskellDepends = [ base ghc-prim random vector ];
testHaskellDepends = [ base QuickCheck random ];
description = "A completely type-safe library for linear algebra";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -256022,7 +256337,7 @@ self: {
libraryHaskellDepends = [ base ];
executableHaskellDepends = [ base cli ];
description = "Composable terminal colors";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"terminal" = callPackage
@@ -256278,7 +256593,7 @@ self: {
base containers mtl process syb transformers
];
description = "A semantic parser for lojban";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -257008,7 +257323,7 @@ self: {
base optparse-generic system-filepath text
];
description = "Compile separate tex files with the same bibliography";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"tex2txt" = callPackage
@@ -257022,7 +257337,7 @@ self: {
libraryHaskellDepends = [ base containers deepseq parsec ];
executableHaskellDepends = [ base containers deepseq parsec ];
description = "LaTeX to plain-text conversion";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -257044,7 +257359,7 @@ self: {
temporary unix
];
description = "View your latex output while editing";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -257056,8 +257371,8 @@ self: {
}:
mkDerivation {
pname = "texmath";
- version = "0.12.1.1";
- sha256 = "04clgbbzva9yxzkn9nf176mqj1lrv64h13awk86l4lrcfbb7kgh1";
+ version = "0.12.2";
+ sha256 = "0lqib59cnvxvgj6k8wk74g5xbamf63q3z7wnwc8r2d56z05djvxy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -257068,7 +257383,7 @@ self: {
utf8-string xml
];
description = "Conversion between formats used to represent mathematics";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"texrunner" = callPackage
@@ -257230,7 +257545,7 @@ self: {
tasty-quickcheck text text-short vector
];
description = "Memory-efficient string-indexed container types";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -257383,7 +257698,7 @@ self: {
test-framework-quickcheck2 test-framework-th text text-icu
];
description = "Dealing with Strict Text in NFC normalization";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -257513,20 +257828,6 @@ self: {
}) {};
"text-manipulate" = callPackage
- ({ mkDerivation, base, criterion, tasty, tasty-hunit, text }:
- mkDerivation {
- pname = "text-manipulate";
- version = "0.2.0.1";
- sha256 = "0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0";
- libraryHaskellDepends = [ base text ];
- testHaskellDepends = [ base tasty tasty-hunit text ];
- benchmarkHaskellDepends = [ base criterion text ];
- description = "Case conversion, word boundary manipulation, and textual subjugation";
- license = "unknown";
- hydraPlatforms = lib.platforms.none;
- }) {};
-
- "text-manipulate_0_3_0_0" = callPackage
({ mkDerivation, base, criterion, tasty, tasty-hunit, text }:
mkDerivation {
pname = "text-manipulate";
@@ -257537,7 +257838,6 @@ self: {
benchmarkHaskellDepends = [ base criterion text ];
description = "Case conversion, word boundary manipulation, and textual subjugation";
license = lib.licenses.mpl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"text-markup" = callPackage
@@ -257826,8 +258126,8 @@ self: {
pname = "text-show-instances";
version = "3.8.4";
sha256 = "1vsrf4vjq4z759srnzvyk3hn90ck4k91vy8cn625m8hy1zddqj2q";
- revision = "1";
- editedCabalFile = "1z7kgnxm9r9dgnqn4fyrfv3k8k2dac7g2hsf649jaxhh898z6dm6";
+ revision = "2";
+ editedCabalFile = "1k5q21j0276jafyy4icgncz45r5gab2mj8964xayhh548rzj5cm6";
libraryHaskellDepends = [
base base-compat-batteries bifunctors binary containers directory
ghc-boot-th haskeline hpc old-locale old-time pretty random
@@ -258134,8 +258434,8 @@ self: {
({ mkDerivation, base, QuickCheck, utility-ht }:
mkDerivation {
pname = "tfp";
- version = "1.0.1.1";
- sha256 = "1qkcm4l09qpxy9996lnfn79c1wn1ca45s3i2iz2x3kvp0f999d3i";
+ version = "1.0.2";
+ sha256 = "02rm06cscj470ab6pla3050l1iygak69yfhsy0wc6cvavz181plf";
libraryHaskellDepends = [ base utility-ht ];
testHaskellDepends = [ base QuickCheck ];
description = "Type-level integers, booleans, lists using type families";
@@ -258266,23 +258566,6 @@ self: {
}) {};
"th-compat" = callPackage
- ({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl
- , template-haskell
- }:
- mkDerivation {
- pname = "th-compat";
- version = "0.1.1";
- sha256 = "1y83yq5ac067a631bd4kg0d14yp8hc23a0dsqsgbqdn279c21ylm";
- libraryHaskellDepends = [ base template-haskell ];
- testHaskellDepends = [
- base base-compat hspec mtl template-haskell
- ];
- testToolDepends = [ hspec-discover ];
- description = "Backward- (and forward-)compatible Quote and Code types";
- license = lib.licenses.bsd3;
- }) {};
-
- "th-compat_0_1_2" = callPackage
({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl
, template-haskell
}:
@@ -258297,7 +258580,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Backward- (and forward-)compatible Quote and Code types";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"th-constraint-compat" = callPackage
@@ -258369,6 +258651,29 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "th-desugar_1_12" = callPackage
+ ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl
+ , ordered-containers, syb, template-haskell, th-abstraction
+ , th-lift, th-orphans, transformers-compat
+ }:
+ mkDerivation {
+ pname = "th-desugar";
+ version = "1.12";
+ sha256 = "1bp47jpif299kbm27zhjaw1nhl12daa09vsc8f0jracq0jhxi3iv";
+ libraryHaskellDepends = [
+ base containers ghc-prim mtl ordered-containers syb
+ template-haskell th-abstraction th-lift th-orphans
+ transformers-compat
+ ];
+ testHaskellDepends = [
+ base containers hspec HUnit mtl syb template-haskell th-abstraction
+ th-lift th-orphans
+ ];
+ description = "Functions to desugar Template Haskell";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"th-dict-discovery" = callPackage
({ mkDerivation, base, constraints, template-haskell }:
mkDerivation {
@@ -258396,32 +258701,21 @@ self: {
}) {};
"th-expand-syns" = callPackage
- ({ mkDerivation, base, containers, syb, template-haskell }:
+ ({ mkDerivation, base, containers, syb, template-haskell
+ , th-abstraction
+ }:
mkDerivation {
pname = "th-expand-syns";
- version = "0.4.6.0";
- sha256 = "1dz8bl4yb6sis74knmvqxa21y9yws9l8gafzsi0chaqx15b5asxj";
- libraryHaskellDepends = [ base containers syb template-haskell ];
- testHaskellDepends = [ base template-haskell ];
+ version = "0.4.8.0";
+ sha256 = "1mw0yxfbmicv0irfrcz4s6pn39za7yjd7zz09ialwym1b46624si";
+ libraryHaskellDepends = [
+ base containers syb template-haskell th-abstraction
+ ];
+ testHaskellDepends = [ base template-haskell th-abstraction ];
description = "Expands type synonyms in Template Haskell ASTs";
license = lib.licenses.bsd3;
}) {};
- "th-expand-syns_0_4_7_0" = callPackage
- ({ mkDerivation, base, containers, syb, template-haskell }:
- mkDerivation {
- pname = "th-expand-syns";
- version = "0.4.7.0";
- sha256 = "1gmb89pgy3i0jpd760xmzx254xpg8pczfa8glgw9z1wak09kwv54";
- revision = "1";
- editedCabalFile = "0zh77kg86qmr285sn0xhhi2hbn8b9dx2pgmf2fipij8zj32k9ny4";
- libraryHaskellDepends = [ base containers syb template-haskell ];
- testHaskellDepends = [ base template-haskell ];
- description = "Expands type synonyms in Template Haskell ASTs";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }) {};
-
"th-extras" = callPackage
({ mkDerivation, base, syb, template-haskell }:
mkDerivation {
@@ -259732,7 +260026,7 @@ self: {
sha256 = "0xpfcabhlpnp883jb23sjcilan1cwwykvvlqvc6qzhda63fcyqp1";
libraryHaskellDepends = [ base tuples-homogenous-h98 vector ];
description = "3D Tic-Tac-Toe game";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -259756,7 +260050,7 @@ self: {
];
benchmarkHaskellDepends = [ base criterion weigh ];
description = "Pattern language for improvised music";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"tidal-midi" = callPackage
@@ -259773,7 +260067,7 @@ self: {
base containers PortMidi tidal time transformers
];
description = "MIDI support for tidal";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -259788,7 +260082,7 @@ self: {
base bytestring containers serialport tidal
];
description = "Serial support for tidal";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -259810,7 +260104,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Visual rendering for Tidal patterns and osc messages";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -260085,7 +260379,7 @@ self: {
sha256 = "0n05lw6zpcfr3lwy2qn7v0j3ym1la9x0mak8szaxc2nbkyc8drrb";
libraryHaskellDepends = [ base base-io-access time ];
description = "IO Access for time";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -260226,7 +260520,7 @@ self: {
base doctest doctest-discover template-haskell time
];
description = "Quasi-quoters for dates and times";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -260245,7 +260539,7 @@ self: {
test-framework-hunit time
];
description = "Generate recurring dates";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -260261,7 +260555,7 @@ self: {
libraryHaskellDepends = [ array base containers mtl ];
executableHaskellDepends = [ base ];
description = "Time series analysis";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -260370,7 +260664,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base process time ];
description = "time each line of terminal output";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"timeit" = callPackage
@@ -260737,28 +261031,28 @@ self: {
executableHaskellDepends = [ base brick microlens time vty ];
testHaskellDepends = [ base hspec microlens time ];
description = "Time utilities";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"timezone-detect" = callPackage
- ({ mkDerivation, base, directory, hspec, hspec-discover, time
- , timezone-olson, timezone-series
+ ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck
+ , time, timezone-olson, timezone-series
}:
mkDerivation {
pname = "timezone-detect";
- version = "0.3.0.0";
- sha256 = "10pv88wmz8zqr1h3zh66skbkma2zz3gvwjaalnpfz5ii2dgl27yy";
+ version = "0.3.0.1";
+ sha256 = "1n4jmx0196zzq092b66kcrwpk00xsm7sj4s29ij5cl05sdaqalqx";
libraryHaskellDepends = [
base time timezone-olson timezone-series
];
testHaskellDepends = [
- base directory hspec time timezone-olson timezone-series
+ base directory hspec QuickCheck time timezone-olson timezone-series
];
testToolDepends = [ hspec-discover ];
description = "Haskell bindings for the zone-detect C library; plus tz-aware utils";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -261071,7 +261365,7 @@ self: {
keera-hails-reactivevalues mtl network network-bsd template-haskell
];
description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -261090,7 +261384,7 @@ self: {
base IfElse network network-bsd stm transformers Yampa
];
description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -261103,7 +261397,7 @@ self: {
sha256 = "0h7d4152nd8mx4slyjss4kf7n1xn99vc5hnk072apqfv301vpbx3";
libraryHaskellDepends = [ base Yampa ];
description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -261497,7 +261791,7 @@ self: {
base bytestring directory template text
];
description = "simple executable for templating";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"tn" = callPackage
@@ -261709,7 +262003,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base time ];
description = "Rate limiter using lazy bucket algorithm";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"token-limiter" = callPackage
@@ -261799,7 +262093,7 @@ self: {
sha256 = "0n8w923m8c803zcphims51q2xm6a0374zzh00d62mg92zbdsh9vn";
libraryHaskellDepends = [ base bytestring text ];
description = "An efficient and easy-to-use tokenizer monad";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"tokenizer-streaming" = callPackage
@@ -261815,7 +262109,7 @@ self: {
streaming-commons text tokenizer-monad
];
description = "A variant of tokenizer-monad that supports streaming";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -261841,7 +262135,7 @@ self: {
];
testHaskellDepends = [ base hspec ];
description = "TokTok C code style checker";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -261893,7 +262187,9 @@ self: {
librarySystemDepends = [ tokyocabinet tokyotyrant ];
description = "FFI bindings to libtokyotyrant";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
@@ -261919,8 +262215,8 @@ self: {
pname = "toml";
version = "0.1.3";
sha256 = "0wby1jas854niwyac95n39liqc874xcd1ahqpw6ksi2nhv2ld6f2";
- revision = "1";
- editedCabalFile = "086a2dsv3nn04ak78c0q0by9kqdw92idfl1iyzp1qihfdi8mxb2f";
+ revision = "2";
+ editedCabalFile = "1qzlsicdd7qdys69iy838y2v4dkaq4d4ar664l338y5y7fg3axxv";
libraryHaskellDepends = [
attoparsec base bytestring containers old-locale time
];
@@ -261974,6 +262270,37 @@ self: {
license = lib.licenses.mpl20;
}) {};
+ "tomland_1_3_3_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, directory
+ , hashable, hedgehog, hspec, hspec-hedgehog, hspec-megaparsec
+ , markdown-unlit, megaparsec, mtl, parser-combinators, text, time
+ , transformers, unordered-containers, validation-selective
+ }:
+ mkDerivation {
+ pname = "tomland";
+ version = "1.3.3.0";
+ sha256 = "1masnbr5x75727k2rmgcmxqm91139v9wy434ml5a4c3dsry7xyhv";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring containers deepseq hashable megaparsec mtl
+ parser-combinators text time transformers unordered-containers
+ validation-selective
+ ];
+ executableHaskellDepends = [
+ base bytestring containers hashable text time unordered-containers
+ ];
+ executableToolDepends = [ markdown-unlit ];
+ testHaskellDepends = [
+ base bytestring containers directory hashable hedgehog hspec
+ hspec-hedgehog hspec-megaparsec megaparsec text time
+ unordered-containers
+ ];
+ description = "Bidirectional TOML serialization";
+ license = lib.licenses.mpl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"tomlcheck" = callPackage
({ mkDerivation, base, htoml-megaparsec, megaparsec
, optparse-applicative, text
@@ -262174,7 +262501,7 @@ self: {
];
executableHaskellDepends = [ base optparse-generic ];
description = "Cluster single cells and analyze cell clade relationships";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -262456,7 +262783,7 @@ self: {
saltine text
];
description = "A Tox protocol implementation in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -262483,7 +262810,7 @@ self: {
data-default-class hspec QuickCheck saltine
];
description = "Haskell bindings to the C reference implementation of Tox";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {toxcore = null;};
@@ -262626,7 +262953,7 @@ self: {
wai warp websockets wuss
];
description = "Applications for interacting with the Pushbullet API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -263104,7 +263431,7 @@ self: {
base containers criterion mtl multirec parsec QuickCheck
];
description = "Generic representation of tree transformations";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -263729,27 +264056,27 @@ self: {
"tree-diff" = callPackage
({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
- , base-compat, bytestring, bytestring-builder, containers, hashable
- , parsec, parsers, pretty, QuickCheck, scientific, tagged, tasty
- , tasty-golden, tasty-quickcheck, text, time, trifecta
- , unordered-containers, uuid-types, vector
+ , base-compat, bytestring, bytestring-builder, containers
+ , criterion, deepseq, Diff, hashable, parsec, parsers, pretty
+ , primitive, QuickCheck, scientific, semialign, strict, tagged
+ , tasty, tasty-golden, tasty-quickcheck, text, these, time
+ , trifecta, unordered-containers, uuid-types, vector
}:
mkDerivation {
pname = "tree-diff";
- version = "0.1";
- sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3";
- revision = "6";
- editedCabalFile = "1wqfac660m9ggv6r85a7y29mk947hki9iydy124vdwcqzichja0d";
+ version = "0.2";
+ sha256 = "1ny7mi0n8cyb65q9ihbnm2gxiyya888dw2c4y0hjy8k882wdhf0x";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
- bytestring-builder containers hashable parsec parsers pretty
- QuickCheck scientific tagged text time unordered-containers
- uuid-types vector
+ bytestring-builder containers deepseq hashable parsec parsers
+ pretty primitive QuickCheck scientific semialign strict tagged text
+ these time unordered-containers uuid-types vector
];
testHaskellDepends = [
- ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck
- tagged tasty tasty-golden tasty-quickcheck trifecta
+ ansi-terminal ansi-wl-pprint base base-compat parsec primitive
+ QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta
];
+ benchmarkHaskellDepends = [ base criterion deepseq Diff ];
description = "Diffing of (expression) trees";
license = lib.licenses.gpl2Plus;
}) {};
@@ -263762,7 +264089,7 @@ self: {
sha256 = "07vgsps4kjld75ndnjjaigsk5vvg11vjp740pznhsw79k3qjbs9a";
libraryHaskellDepends = [ base containers mtl ];
description = "Library for functions pertaining to tree exploration and manipulation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"tree-monad" = callPackage
@@ -263996,7 +264323,7 @@ self: {
tasty-hunit text transformers
];
description = "A tree of Data.Map.";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -264059,7 +264386,7 @@ self: {
sha256 = "105gj9s8gp4xc4i7ank8m6pjc80kywl7vn53qdxfrndaljv4kark";
libraryHaskellDepends = [ base containers ];
description = "Library for a multi-way tree (rose tree), using Seq (finger tree) for forests";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"treeviz" = callPackage
@@ -264169,7 +264496,7 @@ self: {
attoparsec base bytestring containers deepseq mtl network
];
description = "Library for polling Tremulous servers";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -264427,7 +264754,7 @@ self: {
sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5";
libraryHaskellDepends = [ base ];
description = "Constraints that any type, resp. no type fulfills";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -264466,7 +264793,7 @@ self: {
];
benchmarkHaskellDepends = [ base criterion ];
description = "A Tropical Geometry package for Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -264945,7 +265272,7 @@ self: {
transformers
];
description = "Write stream processing computations with side effects in a series of tubes";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -265091,7 +265418,7 @@ self: {
libraryHaskellDepends = [ base generics-sop ];
testHaskellDepends = [ base generics-sop ];
description = "functions on n-ary tuples using generics-sop";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"tuple-th" = callPackage
@@ -265198,7 +265525,7 @@ self: {
base containers hspec hspecVariant QuickCheck QuickCheckVariant
];
description = "An implementation of Turing Machine and Automaton";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -265243,29 +265570,6 @@ self: {
}) {};
"turtle" = callPackage
- ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
- , containers, criterion, directory, doctest, exceptions, foldl
- , hostname, managed, optional-args, optparse-applicative, process
- , stm, streaming-commons, system-fileio, system-filepath, temporary
- , text, time, transformers, unix, unix-compat
- }:
- mkDerivation {
- pname = "turtle";
- version = "1.5.20";
- sha256 = "1dk8ddp1p77l7gbg81ryqrkaxhrj3an24mx572b5wmhmjmbjfk9l";
- libraryHaskellDepends = [
- ansi-wl-pprint async base bytestring clock containers directory
- exceptions foldl hostname managed optional-args
- optparse-applicative process stm streaming-commons system-fileio
- system-filepath temporary text time transformers unix unix-compat
- ];
- testHaskellDepends = [ base doctest system-filepath temporary ];
- benchmarkHaskellDepends = [ base criterion text ];
- description = "Shell programming, Haskell-style";
- license = lib.licenses.bsd3;
- }) {};
-
- "turtle_1_5_21" = callPackage
({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
, containers, criterion, directory, doctest, exceptions, foldl
, hostname, managed, optional-args, optparse-applicative, process
@@ -265286,7 +265590,6 @@ self: {
benchmarkHaskellDepends = [ base criterion text ];
description = "Shell programming, Haskell-style";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"turtle-options" = callPackage
@@ -266213,8 +266516,8 @@ self: {
pname = "type-errors";
version = "0.2.0.0";
sha256 = "1d1fi4ij18q39rpibc056mgvly75zqixkba4l8bn307c62f50k8p";
- revision = "1";
- editedCabalFile = "157fjnr98fn5943siqwk1rd2wwnzd7nlbkbkzvdqv7d723cmh126";
+ revision = "2";
+ editedCabalFile = "1rlhswrkyvhaqhgk2yr9xk49yp196p5fy37hmyni9g7rx1d07qyj";
libraryHaskellDepends = [
base first-class-families syb template-haskell th-abstraction
];
@@ -267040,7 +267343,7 @@ self: {
base ghc-typelits-knownnat mtl pretty-compact
];
description = "Typed frontend to TensorFlow and higher-order deep learning";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -267154,13 +267457,14 @@ self: {
}) {};
"typenums" = callPackage
- ({ mkDerivation, base, hspec, QuickCheck }:
+ ({ mkDerivation, base, hspec, hspec-discover, QuickCheck }:
mkDerivation {
pname = "typenums";
- version = "0.1.2.1";
- sha256 = "06wrsvbddv2ga7k39954697jnclb5r6g4m95pr0fmv34ws1y1d66";
+ version = "0.1.3";
+ sha256 = "0ampchndx0z8bhdqgp14smv270pizjvlr54ns3x79hwjpg9m01rc";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec QuickCheck ];
+ testToolDepends = [ hspec-discover ];
description = "Type level numbers using existing Nat functionality";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -267341,7 +267645,7 @@ self: {
base containers parallel polynomials-bernstein vector
];
description = "Drawings for printed text documents";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"typson-beam" = callPackage
@@ -267776,7 +268080,9 @@ self: {
libraryPkgconfigDepends = [ systemd ];
description = "libudev bindings";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) systemd;};
"udp-conduit" = callPackage
@@ -267908,7 +268214,7 @@ self: {
optparse-applicative
];
description = "Minimal HTTP client library optimized for benchmarking";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"ui-command" = callPackage
@@ -268277,7 +268583,7 @@ self: {
];
executableHaskellDepends = [ base bytestring cmdargs ];
description = "Secure and resilient remote file storage utility";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -268330,8 +268636,8 @@ self: {
pname = "unescaping-print";
version = "0.1";
sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5";
- revision = "2";
- editedCabalFile = "113p28z74lvsc7c6v93ilvbyp2fn5h1qsymksn3mi2ndxwq3vz3f";
+ revision = "3";
+ editedCabalFile = "0r2ggyy2qla75jxdhd3izqqkqb3ar6538jczfwlbbxrj4w1xkd47";
libraryHaskellDepends = [ base ];
description = "Tiny package providing unescaping versions of show and print";
license = lib.licenses.bsd3;
@@ -269186,7 +269492,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "An extendable library for type-safe computations including units";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -269670,6 +269976,20 @@ self: {
license = "GPL";
}) {};
+ "unlift-stm" = callPackage
+ ({ mkDerivation, base, stm, transformers, unliftio, unliftio-core
+ }:
+ mkDerivation {
+ pname = "unlift-stm";
+ version = "0.1.0.0";
+ sha256 = "1580vrv09f0w7ipzv89pq8xsz5labf3vprxxicy29q0nwnnc6y3l";
+ libraryHaskellDepends = [
+ base stm transformers unliftio unliftio-core
+ ];
+ description = "(un)lifted classes and functions for the STM monad";
+ license = lib.licenses.bsd2;
+ }) {};
+
"unlifted-list" = callPackage
({ mkDerivation, base, ghc-prim, semigroups }:
mkDerivation {
@@ -269838,7 +270158,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base storable-endian utility-ht ];
description = "Extract useful information from Amiga MED files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"unordered-containers" = callPackage
@@ -271370,13 +271690,17 @@ self: {
}) {};
"utility-ht" = callPackage
- ({ mkDerivation, base, QuickCheck }:
+ ({ mkDerivation, base, doctest-exitcode-stdio, doctest-lib
+ , QuickCheck
+ }:
mkDerivation {
pname = "utility-ht";
- version = "0.0.15";
- sha256 = "148gdz6pbl1i5qjvjrq5576pg58anmh18xha37n9fncjy36pjp44";
+ version = "0.0.16";
+ sha256 = "10dvmfhhhj5w4wz5drhvs6i0yv35kbbcbzhy6ci34r3ppcik5rdw";
libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base QuickCheck ];
+ testHaskellDepends = [
+ base doctest-exitcode-stdio doctest-lib QuickCheck
+ ];
description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
license = lib.licenses.bsd3;
}) {};
@@ -271781,7 +272105,7 @@ self: {
sha256 = "0qmp5k4wg5ja2382cwarf8fwjval2a5wdwvz32f965hvwgc9cd43";
libraryHaskellDepends = [ base json MissingH mtl ];
description = "Cross-language extensible representation for algebraic data type instances";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -271794,7 +272118,7 @@ self: {
sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la";
libraryHaskellDepends = [ base process ];
description = "Utility function for reading a source of loaded uzbl pages";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"v4l2" = callPackage
@@ -271848,7 +272172,7 @@ self: {
];
testHaskellDepends = [ base process ];
description = "the cabal companion";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -271880,7 +272204,7 @@ self: {
sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
libraryHaskellDepends = [ array base containers ghc-prim ];
description = "Graph representation of the GHC heap";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -271911,7 +272235,7 @@ self: {
sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
libraryHaskellDepends = [ base filepath graphviz vacuum ];
description = "A library for transforming vacuum graphs into GraphViz output";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -272082,10 +272406,8 @@ self: {
}:
mkDerivation {
pname = "validation-selective";
- version = "0.1.0.0";
- sha256 = "0ia3g2c1137pa0ns97yf8vbfvwmjhqnqhzn9lzgxvxwzchvwpnf7";
- revision = "1";
- editedCabalFile = "19pcv1i7xcrgg248dbgyl83zx3gn9zilrxqs3arlmkwdi0jdj4nv";
+ version = "0.1.0.1";
+ sha256 = "005j45rm0bqjlyh3w67zi62hjv3fp0np7szz80s9nm203i8p6wzb";
libraryHaskellDepends = [ base deepseq selective ];
testHaskellDepends = [
base doctest hedgehog hspec hspec-hedgehog selective text
@@ -272348,7 +272670,7 @@ self: {
optparse-applicative process uniplate
];
description = "Analyze and visualize expression trees";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -272996,7 +273318,7 @@ self: {
test-framework-hunit test-framework-quickcheck2
];
description = "Vector clocks for versioning message flows";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -273595,7 +273917,7 @@ self: {
];
benchmarkHaskellDepends = [ base criterion lens ];
description = "Random verilog generation and simulator testing";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -274227,7 +274549,7 @@ self: {
xmms2-client xmms2-client-glib
];
description = "An XMMS2 client";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -274640,7 +274962,7 @@ self: {
libraryPkgconfigDepends = [ vte ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the VTE library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) vte;};
@@ -274659,7 +274981,7 @@ self: {
libraryPkgconfigDepends = [ vte ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the VTE library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) vte;};
@@ -274733,7 +275055,7 @@ self: {
isExecutable = true;
libraryHaskellDepends = [ base vty ];
description = "A lib for displaying a menu and getting a selection using VTY";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -274784,7 +275106,7 @@ self: {
libraryPkgconfigDepends = [ vulkan ];
description = "Bindings to the Vulkan graphics API";
license = lib.licenses.bsd3;
- platforms = [ "x86_64-darwin" "x86_64-linux" ];
+ platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
}) {vulkan = null;};
"vulkan-api" = callPackage
@@ -275510,7 +275832,7 @@ self: {
base bytestring conduit http-types text transformers wai wai-extra
];
description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -275627,15 +275949,15 @@ self: {
, blaze-builder, blaze-html, bytestring, case-insensitive, cereal
, clientsession, cookie, exceptions, hedgehog, hoauth2, http-client
, http-client-tls, http-conduit, http-reverse-proxy, http-types
- , jose, microlens, mtl, optparse-simple, regex-posix
- , safe-exceptions, shakespeare, tasty, tasty-hedgehog, tasty-hunit
- , text, time, unix-compat, unordered-containers, uri-bytestring
- , vault, wai, wai-app-static, wai-extra, warp, yaml
+ , jose, microlens, mtl, optparse-applicative, optparse-simple
+ , regex-posix, safe-exceptions, shakespeare, tasty, tasty-hedgehog
+ , tasty-hunit, text, time, unix-compat, unordered-containers
+ , uri-bytestring, vault, wai, wai-app-static, wai-extra, warp, yaml
}:
mkDerivation {
pname = "wai-middleware-auth";
- version = "0.2.3.1";
- sha256 = "0i5zg6pyrr3f9g39jpk557h5rqzrm36279dav3v8n6lrj919x01m";
+ version = "0.2.4.1";
+ sha256 = "1q8vj3ri5fvdhlwls7az4zcwk7iyc3fi4yf968086pkg92hpzcdl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -275647,7 +275969,8 @@ self: {
uri-bytestring vault wai wai-app-static wai-extra yaml
];
executableHaskellDepends = [
- base bytestring cereal clientsession optparse-simple wai-extra warp
+ base bytestring cereal clientsession optparse-applicative
+ optparse-simple wai-extra warp
];
testHaskellDepends = [
aeson base binary bytestring clientsession cookie hedgehog hoauth2
@@ -276076,7 +276399,7 @@ self: {
base Cabal directory mtl split text wai wai-middleware-static warp
];
description = "WAI middleware for preprocessing static files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -276267,6 +276590,29 @@ self: {
broken = true;
}) {};
+ "wai-middleware-validation" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, doctest
+ , filepath, here, hspec, http-types, insert-ordered-containers
+ , lens, openapi3, text, wai, wai-extra
+ }:
+ mkDerivation {
+ pname = "wai-middleware-validation";
+ version = "0.1.0.0";
+ sha256 = "0cbp32j31xkmniml56gnh278g94zhhfc8xlp842n8lll5hh13bf4";
+ libraryHaskellDepends = [
+ aeson base bytestring containers filepath http-types
+ insert-ordered-containers lens openapi3 text wai
+ ];
+ testHaskellDepends = [
+ base bytestring doctest here hspec http-types openapi3 wai
+ wai-extra
+ ];
+ description = "WAI Middleware to validate the request and response bodies";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"wai-middleware-verbs" = callPackage
({ mkDerivation, base, bytestring, exceptions, hashable, http-types
, mmorph, monad-control, monad-control-aligned, monad-logger, mtl
@@ -276647,7 +276993,7 @@ self: {
vector-algorithms wai
];
description = "A simple cache for serving static files in a WAI middleware";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -278039,7 +278385,7 @@ self: {
transformers unordered-containers vector wreq
];
description = "Bindings to the WebDriver API";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -278228,7 +278574,7 @@ self: {
libraryPkgconfigDepends = [ webkit ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the Webkit library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {webkit = null;};
@@ -278277,7 +278623,7 @@ self: {
libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the Webkit library";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) webkitgtk24x-gtk3;};
@@ -278334,7 +278680,7 @@ self: {
base bytestring JuicyPixels tasty tasty-hunit
];
description = "JuicyPixels support for WebP format";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {inherit (pkgs) libwebp;};
"webpage" = callPackage
@@ -279178,7 +279524,7 @@ self: {
libraryHaskellDepends = [ base bytestring deepseq ];
librarySystemDepends = [ dnsapi ];
description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {dnsapi = null;};
@@ -279424,7 +279770,7 @@ self: {
];
testHaskellDepends = [ base conduit hspec HUnit mtl ];
description = "Run computations that depend on one or more elements in a stream";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"witherable" = callPackage
@@ -279451,22 +279797,6 @@ self: {
}) {};
"witherable-class" = callPackage
- ({ mkDerivation, base, base-orphans, containers, hashable
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "witherable-class";
- version = "0";
- sha256 = "0jb8yq9i0rlbmcd5rbg95m2w26zbmi7iwph5v7wghiari751r2bp";
- libraryHaskellDepends = [
- base base-orphans containers hashable transformers
- unordered-containers vector
- ];
- description = "Witherable = Traversable + Filterable";
- license = lib.licenses.bsd3;
- }) {};
-
- "witherable-class_0_0_1" = callPackage
({ mkDerivation, base, witherable }:
mkDerivation {
pname = "witherable-class";
@@ -279475,7 +279805,6 @@ self: {
libraryHaskellDepends = [ base witherable ];
description = "Witherable = Traversable + Filterable";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"within" = callPackage
@@ -279877,7 +280206,7 @@ self: {
libraryHaskellDepends = [ base binary containers ];
testHaskellDepends = [ base binary containers hspec QuickCheck ];
description = "Implementation of a finite trie over words";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"word-vector" = callPackage
@@ -280245,7 +280574,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "a \"Desktop Workflow\" monad with Objective-C bindings";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -280383,8 +280712,8 @@ self: {
}:
mkDerivation {
pname = "wraxml";
- version = "0.4.4.1";
- sha256 = "04snqwr6plf1y179dzfjjmg9kjf4lbdgj22xqlhw6wllvd8953c2";
+ version = "0.4.4.2";
+ sha256 = "1cfbbr1fbp7wrm2w7rldvf3gvp8fzvnpa6c2mkxscarhmn5wl92z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -280393,7 +280722,7 @@ self: {
xml-basic
];
description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
- license = "GPL";
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -280848,7 +281177,7 @@ self: {
base bytestring file-embed hspec network-uri
];
description = "WSDL parsing in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -280867,7 +281196,7 @@ self: {
base bencode bytestring containers directory safe utf8-string
];
description = "A small tool to list, add and remove webseeds from a torrent file";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -281319,7 +281648,7 @@ self: {
type-level
];
description = "A embedded DSL for manipulating DSP languages in Haskell";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -281482,7 +281811,9 @@ self: {
];
description = "Haskell extended file attributes interface";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs) attr;};
"xbattbar" = callPackage
@@ -281552,7 +281883,7 @@ self: {
base directory filepath process unix
];
description = "XChat";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -281569,7 +281900,7 @@ self: {
base bytestring containers mtl network transformers
];
description = "Partial implementation of the XCP protocol with ethernet as transport layer";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -281718,7 +282049,7 @@ self: {
libraryPkgconfigDepends = [ libxfconf ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "FFI bindings to xfconf";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {libxfconf = null;};
@@ -282917,7 +283248,7 @@ self: {
];
libraryToolDepends = [ c2hs ];
description = "An XMMS2 client library";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -282931,7 +283262,7 @@ self: {
libraryHaskellDepends = [ base haskell98 xmms2-client ];
libraryToolDepends = [ c2hs ];
description = "An XMMS2 client library — GLib integration";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -282978,7 +283309,9 @@ self: {
benchmarkHaskellDepends = [ base gauge mtl time ];
description = "A Minimalistic Text Based Status Bar";
license = lib.licenses.bsd3;
- platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+ platforms = [
+ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+ ];
}) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;};
@@ -283079,7 +283412,7 @@ self: {
sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9";
libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
description = "Third party extensions for xmonad";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -283240,7 +283573,7 @@ self: {
editedCabalFile = "1vxgv702wgr0k0kzd602v8xv11q5dap4mfhqifnr928bwf9scp28";
libraryHaskellDepends = [ base magic mtl random unix xmonad ];
description = "xmonad wallpaper extension";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
}) {};
"xmonad-windownames" = callPackage
@@ -283461,43 +283794,45 @@ self: {
}) {};
"xrefcheck" = callPackage
- ({ mkDerivation, aeson, aeson-options, async, base, bytestring
+ ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
, cmark-gfm, containers, data-default, deepseq, directory
- , directory-tree, filepath, fmt, Glob, hspec, hspec-discover
- , http-client, http-types, lens, modern-uri, mtl, o-clock
- , optparse-applicative, pretty-terminal, QuickCheck, req
- , roman-numerals, template-haskell, text, text-metrics
- , th-lift-instances, th-utilities, universum, with-utf8, yaml
+ , directory-tree, file-embed, filepath, fmt, Glob, hspec
+ , hspec-discover, http-client, http-types, HUnit, lens, modern-uri
+ , mtl, o-clock, optparse-applicative, pretty-terminal, QuickCheck
+ , regex-tdfa, req, roman-numerals, template-haskell, text
+ , text-metrics, th-lift-instances, th-utilities, transformers
+ , universum, with-utf8, yaml
}:
mkDerivation {
pname = "xrefcheck";
- version = "0.1.2";
- sha256 = "0m3cya6rfx7ypq4sp172z9fnnl6n11v98f6bj003phrapl6s0vnn";
+ version = "0.1.3";
+ sha256 = "0v7ylf21kky36shq1l33mlcsg2iihqwqx7bxyjlmhndp9hi0dr8l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-options async base bytestring cmark-gfm containers
- data-default deepseq directory directory-tree filepath fmt Glob
- http-client http-types lens modern-uri mtl o-clock
- optparse-applicative pretty-terminal req roman-numerals
+ aeson aeson-casing async base bytestring cmark-gfm containers
+ data-default deepseq directory directory-tree file-embed filepath
+ fmt Glob http-client http-types HUnit lens modern-uri mtl o-clock
+ optparse-applicative pretty-terminal regex-tdfa req roman-numerals
template-haskell text text-metrics th-lift-instances th-utilities
- universum with-utf8 yaml
+ transformers universum with-utf8 yaml
];
executableHaskellDepends = [
- aeson aeson-options async base bytestring cmark-gfm containers
- data-default deepseq directory directory-tree filepath fmt Glob
- http-client http-types lens modern-uri mtl o-clock
- optparse-applicative pretty-terminal req roman-numerals
+ aeson aeson-casing async base bytestring cmark-gfm containers
+ data-default deepseq directory directory-tree file-embed filepath
+ fmt Glob http-client http-types HUnit lens modern-uri mtl o-clock
+ optparse-applicative pretty-terminal regex-tdfa req roman-numerals
template-haskell text text-metrics th-lift-instances th-utilities
- universum with-utf8 yaml
+ transformers universum with-utf8 yaml
];
testHaskellDepends = [
- aeson aeson-options async base bytestring cmark-gfm containers
- data-default deepseq directory directory-tree filepath fmt Glob
- hspec http-client http-types lens modern-uri mtl o-clock
- optparse-applicative pretty-terminal QuickCheck req roman-numerals
- template-haskell text text-metrics th-lift-instances th-utilities
- universum with-utf8 yaml
+ aeson aeson-casing async base bytestring cmark-gfm containers
+ data-default deepseq directory directory-tree file-embed filepath
+ fmt Glob hspec http-client http-types HUnit lens modern-uri mtl
+ o-clock optparse-applicative pretty-terminal QuickCheck regex-tdfa
+ req roman-numerals template-haskell text text-metrics
+ th-lift-instances th-utilities transformers universum with-utf8
+ yaml
];
testToolDepends = [ hspec-discover ];
license = lib.licenses.mpl20;
@@ -283680,7 +284015,7 @@ self: {
split text time
];
description = "#plaimi's all-encompassing bot";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -283827,7 +284162,7 @@ self: {
librarySystemDepends = [ yajl ];
libraryToolDepends = [ c2hs ];
description = "Bindings for YAJL, an event-based JSON implementation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) yajl;};
@@ -283844,7 +284179,7 @@ self: {
base bytestring enumerator json-types text transformers yajl
];
description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -284433,7 +284768,7 @@ self: {
base GLFW-b newtype OpenGL vector-space Yampa
];
description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -284467,7 +284802,7 @@ self: {
base GLUT newtype OpenGL vector-space Yampa-core
];
description = "Connects Yampa and GLUT";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -284691,8 +285026,8 @@ self: {
}:
mkDerivation {
pname = "yasi";
- version = "0.1.1.1";
- sha256 = "0b3ajgxf8bk2pjfwqmf748x1yzyq9knjsya2xzkdrjs5vffg1j9k";
+ version = "0.1.2.1";
+ sha256 = "0647z79wva7apkp0swj7gax780vqmhr5czxrvg88gl3bi03wcapl";
libraryHaskellDepends = [ base bytestring template-haskell text ];
testHaskellDepends = [
base hedgehog tasty tasty-hedgehog tasty-hunit text
@@ -284759,7 +285094,7 @@ self: {
th-abstraction transformers
];
description = "Total recursion schemes";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"yaya-hedgehog" = callPackage
@@ -284770,7 +285105,7 @@ self: {
sha256 = "0aw932d2yr3w84ia44y46w4w96bc8gdag63h66rhx3v7gwmkwdwg";
libraryHaskellDepends = [ base deriving-compat hedgehog yaya ];
description = "Hedgehog testing support for the Yaya recursion scheme library";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"yaya-test" = callPackage
@@ -284787,7 +285122,7 @@ self: {
base deriving-compat hedgehog yaya yaya-hedgehog
];
description = "Test suites for `yaya`";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -284804,7 +285139,7 @@ self: {
base bifunctors comonad either free lens yaya
];
description = "Non-total extensions to the Yaya recursion scheme library";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
}) {};
"yaya-unsafe-test" = callPackage
@@ -284820,7 +285155,7 @@ self: {
base hedgehog yaya yaya-hedgehog yaya-unsafe
];
description = "Test suites for `yaya-unsafe`";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -284873,7 +285208,7 @@ self: {
aeson base numbered-semigroups tasty tasty-hunit tasty-quickcheck
];
description = "Yesod-based server for interactive presentation slides";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -285428,7 +285763,7 @@ self: {
yesod-auth yesod-core
];
description = "A yesod-auth plugin for LTI 1.3";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -286268,7 +286603,7 @@ self: {
];
testHaskellDepends = [ base blaze-html hspec text ];
description = "Tools for using markdown in a yesod application";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287148,7 +287483,7 @@ self: {
];
testHaskellDepends = [ base cryptonite hspec QuickCheck ];
description = "Executable specifications of composable cryptographic protocols";
- license = lib.licenses.agpl3;
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287205,7 +287540,7 @@ self: {
yi-mode-haskell yi-mode-javascript yi-rope
];
description = "Yi editor";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287225,7 +287560,7 @@ self: {
yi-rope
];
description = "Add-ons to Yi, the Haskell-Scriptable Editor";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287257,7 +287592,7 @@ self: {
];
benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
description = "Yi editor core library";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287275,7 +287610,7 @@ self: {
transformers-base yi-core yi-rope
];
description = "Dynamic configuration support for Yi";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287288,7 +287623,7 @@ self: {
sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv";
libraryHaskellDepends = [ base containers split yi-language ];
description = "Simple mapping from colour names used in emacs to Color";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287309,7 +287644,7 @@ self: {
yi-language yi-rope
];
description = "Pango frontend for Yi editor";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287328,7 +287663,7 @@ self: {
stm text vty yi-core yi-language yi-rope
];
description = "Vty frontend for Yi editor";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287348,7 +287683,7 @@ self: {
yi-rope
];
description = "Fuzzy open plugin for yi";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287377,7 +287712,7 @@ self: {
text yi-core yi-language yi-rope
];
description = "Yi editor incremental reader";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287394,7 +287729,7 @@ self: {
base microlens-platform text yi-core yi-keymap-emacs yi-rope
];
description = "Cua keymap for Yi editor";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287413,7 +287748,7 @@ self: {
text transformers-base yi-core yi-language yi-misc-modes yi-rope
];
description = "Emacs keymap for Yi editor";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287441,7 +287776,7 @@ self: {
unordered-containers yi-core yi-language yi-rope
];
description = "Vim keymap for Yi editor";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287470,7 +287805,7 @@ self: {
unordered-containers
];
description = "Collection of language-related Yi libraries";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287489,7 +287824,7 @@ self: {
];
libraryToolDepends = [ alex ];
description = "Yi editor miscellaneous modes";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287508,7 +287843,7 @@ self: {
];
libraryToolDepends = [ alex ];
description = "Yi editor haskell mode";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287528,7 +287863,7 @@ self: {
];
libraryToolDepends = [ alex ];
description = "Yi editor javascript mode";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287562,7 +287897,7 @@ self: {
];
benchmarkHaskellDepends = [ base criterion deepseq text ];
description = "A rope data structure used by Yi";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
}) {};
"yi-snippet" = callPackage
@@ -287582,7 +287917,7 @@ self: {
base containers tasty-hunit tasty-th yi-rope
];
description = "Snippet support for yi";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287931,7 +288266,7 @@ self: {
libraryHaskellDepends = [ base cryptonite memory yu-utils ];
testHaskellDepends = [ base MonadRandom random yu-utils ];
description = "Auth module for Yu";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287945,7 +288280,7 @@ self: {
libraryHaskellDepends = [ base yu-auth yu-utils ];
testHaskellDepends = [ base blaze-markup hspec yu-utils ];
description = "The core of Yu";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287962,7 +288297,7 @@ self: {
base cmdargs yaml yu-auth yu-core yu-utils
];
description = "The launcher for Yu";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -287981,7 +288316,7 @@ self: {
base cmdargs directory echo filepath process yu-auth yu-utils
];
description = "Tool for Yu";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -288006,7 +288341,7 @@ self: {
warp xml-hamlet yesod-core
];
description = "Utils for Yu";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -288097,7 +288432,7 @@ self: {
time transformers vector xml-conduit
];
description = "Utilities for reading and writing Alteryx .yxdb files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -288365,19 +288700,20 @@ self: {
"zeolite-lang" = callPackage
({ mkDerivation, base, containers, directory, filepath, hashable
- , megaparsec, mtl, parser-combinators, regex-tdfa, time
- , transformers, unix
+ , megaparsec, microlens, microlens-th, mtl, parser-combinators
+ , regex-tdfa, time, transformers, unix
}:
mkDerivation {
pname = "zeolite-lang";
- version = "0.12.0.0";
- sha256 = "056brd93d1559wdz7s4wcvjglqg5p1bafhhgbqcqnd0q8msnilrv";
+ version = "0.13.0.0";
+ sha256 = "0baljnskj5vrw9vwkwddrqchqvk7i5dxr4d5aj7qvl73brchjx7c";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base containers directory filepath hashable megaparsec mtl
- parser-combinators regex-tdfa time transformers unix
+ base containers directory filepath hashable megaparsec microlens
+ microlens-th mtl parser-combinators regex-tdfa time transformers
+ unix
];
executableHaskellDepends = [
base containers directory filepath unix
@@ -288489,7 +288825,7 @@ self: {
transformers zeromq3-haskell
];
description = "Conduit bindings for zeromq3-haskell";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -288561,7 +288897,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Conduit wrapper around zeromq4-haskell";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -288839,7 +289175,7 @@ self: {
conduit-extra hspec lzma
];
description = "Read and parse ZIM files";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
"zinza" = callPackage
@@ -289261,7 +289597,7 @@ self: {
directory filepath mtl parallel-io text zmidi-core
];
description = "Representing MIDI a simple score";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -289384,7 +289720,7 @@ self: {
mtl ui-command vector zoom-cache zoom-cache-pcm
];
description = "Tools for generating zoom-cache-pcm files";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
@@ -289708,7 +290044,7 @@ self: {
base bytestring containers fixed-vector storable-record
];
description = "Haskell language binding for the Zydis library, a x86/x86-64 disassembler";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
}) {};
}
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 32fa46fd04ac..0e566aa2e6e4 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -57,9 +57,8 @@ symlinkJoin {
# as a dedicated drv attribute, like `compiler-name`
name = ghc.name + "-with-packages";
paths = paths ++ [ghc];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
- . ${makeWrapper}/nix-support/setup-hook
-
# wrap compiler executables with correct env variables
for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix
index 922d964e8abe..4c35f065cb5c 100644
--- a/pkgs/development/interpreters/angelscript/2.22.nix
+++ b/pkgs/development/interpreters/angelscript/2.22.nix
@@ -8,13 +8,11 @@ let
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "1pp853lbnz383ilp9wbgc3wv1dn7lpx3idz8dmzda94rckl7sd43";
};
- buildInputs = [
- unzip
- ];
in
stdenv.mkDerivation {
inherit (s) name version;
- inherit buildInputs;
+ nativeBuildInputs = [ unzip ];
+
src = fetchurl {
inherit (s) url sha256;
};
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index fb8c6b2844d6..3fbd64467fec 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -8,13 +8,11 @@ let
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "sha256-AQ3UXiPnNNRvWJHXDiaGB6EsuasSUD3aQvhC2dt+iFc=";
};
- buildInputs = [
- unzip
- ];
+
in
stdenv.mkDerivation {
inherit (s) name version;
- inherit buildInputs;
+ nativeBuildInputs = [ unzip ];
src = fetchurl {
inherit (s) url sha256;
};
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index aa3abc655343..01d1b61cb801 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bats";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchzip {
url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
- hash = "sha256-grB/rJaDU0fuw4Hm3/9nI2px8KZnSWqRjTJPd7Mmb7s=";
+ hash = "sha256-+dboExOx2YELxV8Cwk9SVwk9G3p8EoP0LdaJ3o7GT6c=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
inherit doCheck;
checkPhase = ''
+ # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows
+ sed -i '/test works even if PATH is reset/a skip' test/bats.bats
+
# test generates file with absolute shebang dynamically
substituteInPlace test/install.bats --replace \
"/usr/bin/env bash" "${bash}/bin/bash"
diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix
index 8f80d2f4ee68..dbc2751e7899 100644
--- a/pkgs/development/interpreters/cling/default.nix
+++ b/pkgs/development/interpreters/cling/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv
-, python
+, python3
, libffi
, git
, cmake
@@ -38,9 +38,11 @@ let
chmod -R a+w ./tools/cling
'';
- nativeBuildInputs = [ python git cmake ];
+ nativeBuildInputs = [ python3 git cmake ];
buildInputs = [ libffi llvmPackages_5.llvm zlib ];
+ strictDeps = true;
+
cmakeFlags = [
"-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
"-DLLVM_ENABLE_RTTI=ON"
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
index baf83c647767..1809f9fd2dc0 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation {
description = "A lightweight IDE for Clojure";
homepage = "https://github.com/arthuredelstein/clooj";
license = lib.licenses.bsd3;
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index a269d0b158e2..7bd3913260d4 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -149,11 +149,11 @@ stdenv.mkDerivation {
sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
nodejs
clojure
jre
- unzip
python
openssl
gnutar
diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix
index 4e50c737e39b..6e5a30a9dd7d 100644
--- a/pkgs/development/interpreters/elixir/1.11.nix
+++ b/pkgs/development/interpreters/elixir/1.11.nix
@@ -3,7 +3,7 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
mkDerivation {
- version = "1.11.3";
- sha256 = "sha256-DqmKpMLxrXn23fsX/hrjDsYCmhD5jbVtvOX8EwKBakc=";
+ version = "1.11.4";
+ sha256 = "sha256-qCX6hRWUbW+E5xaUhcYxRAnhnvncASUJck8lESlcDvk=";
minimumOTPVersion = "21";
}
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 114bc13f5d8a..9d2b9a8f0387 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
installPhase = ''
mkdir -p $out
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index 0ab90c1e0639..163c255c5222 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
- version = "1.15.3";
+ version = "1.15.4";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-GWSPNz4IxEYxSRpDPbgCXmc7WYZNi8IGVqNhSEgUaeg=";
+ sha256 = "sha256-lE2BAwiwvewydIpVYoN+zrfpzQbMbe5Nb1r0mzdxMao=";
};
nativeBuildInputs = [ meson ninja ];
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 004d2732f3a6..a8e73339ee16 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "joker";
- version = "0.15.7";
+ version = "0.16.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
- sha256 = "01mlizkflajad4759yl60ymibymrvanhc22jaffj50k9b77v97kq";
+ sha256 = "sha256-ckbKxWzcISo9yOXuwgOiSfR2hs+5od0Ru0Ku2I52Gu8=";
};
- vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl";
+ vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA=";
doCheck = false;
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 6dcb697d7639..860f9ac3a5eb 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -22,8 +22,9 @@ stdenv.mkDerivation {
sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cln yices
+ flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper cln yices
];
hardeningDisable = [ "stackprotector" ] ++
diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix
index fee53b716dae..433026f0a7e9 100644
--- a/pkgs/development/interpreters/octave/build-env.nix
+++ b/pkgs/development/interpreters/octave/build-env.nix
@@ -20,17 +20,14 @@ in buildEnv {
inherit ignoreCollisions;
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
- buildInputs = [ makeWrapper texinfo wrapOctave ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ texinfo wrapOctave ];
# During "build" we must first unlink the /share symlink to octave's /share
# Then, we can re-symlink the all of octave/share, except for /share/octave
# in env/share/octave, re-symlink everything from octave/share/octave and then
# perform the pkg install.
postBuild = ''
- . "${makeWrapper}/nix-support/setup-hook"
- # The `makeWrapper` used here is the one defined in
- # ${makeWrapper}/nix-support/setup-hook
-
if [ -L "$out/bin" ]; then
unlink $out/bin
mkdir -p "$out/bin"
diff --git a/pkgs/development/interpreters/perl/aarch64-darwin.patch b/pkgs/development/interpreters/perl/aarch64-darwin.patch
new file mode 100644
index 000000000000..b700c8ca6e0d
--- /dev/null
+++ b/pkgs/development/interpreters/perl/aarch64-darwin.patch
@@ -0,0 +1,46 @@
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index 0a91bc083c0..fdfbdd4a3b9 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
+ # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
+ # capturing its value and adding it to the flags.
+ case "$MACOSX_DEPLOYMENT_TARGET" in
+- 10.*)
++ [1-9][0-9].*)
+ add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
+ add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
+ ;;
+@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
+
+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
+ ***
+-*** Please either set it to 10.something, or to empty.
++*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
+
+ EOM
+ exit 1
+@@ -327,7 +327,7 @@ EOM
+ # "ProductVersion: 10.11" "10.11"
+ prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
+ case "$prodvers" in
+- 10.*)
++ [1-9][0-9].*)
+ add_macosx_version_min ccflags $prodvers
+ add_macosx_version_min ldflags $prodvers
+ ;;
+@@ -342,11 +342,10 @@ EOM
+ exit 1
+ esac
+
+- # The X in 10.X
+- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
++ darwin_major=$(echo $osvers|awk -F. '{print $1}')
+
+- # macOS (10.12) deprecated syscall().
+- if [ "$prodvers_minor" -ge 12 ]; then
++ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
++ if [ "$darwin_major" -ge 16 ]; then
+ d_syscall='undef'
+ # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
+ case "$MACOSX_DEPLOYMENT_TARGET" in
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 66e0b284fc0d..01b3e995f5e4 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -41,7 +41,10 @@ let
]
++ optional stdenv.isSunOS ./ld-shared.patch
++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
- ++ optional crossCompiling ./MakeMaker-cross.patch;
+ ++ optional crossCompiling ./MakeMaker-cross.patch
+ # Backporting https://github.com/Perl/perl5/pull/17946, can be
+ # removed if there's ever a 5.30.x release with it included.
+ ++ optional (versionOlder version "5.32.1") ./aarch64-darwin.patch;
# This is not done for native builds because pwd may need to come from
# bootstrap tools when building bootstrap perl.
@@ -168,11 +171,11 @@ let
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
};
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
- crossVersion = "1.3.5"; # Jan 24, 2021
+ crossVersion = "e53999d0c340769792ba18d749751b0df3d1d177"; # Mar 21, 2021
perl-cross-src = fetchurl {
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
- sha256 = "1sa2f8s1hc604g5y98w6m6y5q43s9jiyrpnp4b34zkfx1qs3w6l4";
+ sha256 = "14vcpwjhq667yh0cs7ism70df8l7068vn4a0ww59hdjyj7yc84i6";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@@ -208,7 +211,7 @@ in {
perldevel = common {
perl = pkgs.perldevel;
buildPerl = buildPackages.perldevel;
- version = "5.33.6";
- sha256 = "1fx6b2q7wzd0xwy7qkmkvd5bdm09d3zfnynrb6afl9ghd8ww56fv";
+ version = "5.33.8";
+ sha256 = "1zr6sdsfcmk86n3f8j65x07xkv29v0pi8bwc986ahmjx7x92xzgl";
};
}
diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix
index da95b5a89647..e1909a15e059 100644
--- a/pkgs/development/interpreters/perl/wrapper.nix
+++ b/pkgs/development/interpreters/perl/wrapper.nix
@@ -17,11 +17,10 @@ let
inherit ignoreCollisions;
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
+ nativeBuildInputs = [ makeWrapper ];
+
# we create wrapper for the binaries in the different packages
postBuild = ''
-
- . "${makeWrapper}/nix-support/setup-hook"
-
if [ -L "$out/bin" ]; then
unlink "$out/bin"
fi
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 37d43e33d8e5..adeafa80e6cd 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -106,6 +106,12 @@ let
./CVE-2021-3177.patch
+ # The workaround is for unittests on Win64, which we don't support.
+ # It does break aarch64-darwin, which we do support. See:
+ # * https://bugs.python.org/issue35523
+ # * https://github.com/python/cpython/commit/e6b247c8e524
+ ../3.7/no-win64-workaround.patch
+
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [
diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch b/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch
new file mode 100644
index 000000000000..685b1e83944e
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch
@@ -0,0 +1,37 @@
+From e6b247c8e524dbe5fc03b3492f628d0d5348bc49 Mon Sep 17 00:00:00 2001
+From: Victor Stinner
+Date: Tue, 18 Dec 2018 14:47:21 +0100
+Subject: [PATCH] bpo-35523: Remove ctypes callback workaround (GH-11211)
+
+Remove ctypes callback workaround: no longer create a callback at startup.
+Avoid SELinux alert on "import ctypes" and "import uuid".
+---
+ Lib/ctypes/__init__.py | 5 -----
+ .../next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst | 2 ++
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst
+
+diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
+index 6146773988648..5f78beda5866e 100644
+--- a/Lib/ctypes/__init__.py
++++ b/Lib/ctypes/__init__.py
+@@ -266,11 +266,6 @@ def _reset_cache():
+ # _SimpleCData.c_char_p_from_param
+ POINTER(c_char).from_param = c_char_p.from_param
+ _pointer_type_cache[None] = c_void_p
+- # XXX for whatever reasons, creating the first instance of a callback
+- # function is needed for the unittests on Win64 to succeed. This MAY
+- # be a compiler bug, since the problem occurs only when _ctypes is
+- # compiled with the MS SDK compiler. Or an uninitialized variable?
+- CFUNCTYPE(c_int)(lambda: None)
+
+ def create_unicode_buffer(init, size=None):
+ """create_unicode_buffer(aString) -> character array
+diff --git a/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst
+new file mode 100644
+index 0000000000000..94a9fd257383e
+--- /dev/null
++++ b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst
+@@ -0,0 +1,2 @@
++Remove :mod:`ctypes` callback workaround: no longer create a callback at
++startup. Avoid SELinux alert on ``import ctypes`` and ``import uuid``.
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 1ae8d19ac58e..fdf022213c5a 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -185,6 +185,11 @@ in with passthru; stdenv.mkDerivation {
# Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7.
# See: https://bugs.python.org/issue11122
./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
+ # The workaround is for unittests on Win64, which we don't support.
+ # It does break aarch64-darwin, which we do support. See:
+ # * https://bugs.python.org/issue35523
+ # * https://github.com/python/cpython/commit/e6b247c8e524
+ ./3.7/no-win64-workaround.patch
] ++ optionals (isPy37 || isPy38 || isPy39) [
# Fix darwin build https://bugs.python.org/issue34027
./3.7/darwin-libutil.patch
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 61ad4a8a6ad9..514930db359b 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -1,10 +1,15 @@
-{ lib, stdenv, python, buildEnv, makeWrapper
+{ lib, stdenv, buildEnv, makeWrapper
+
+# manually pased
+, python
+, requiredPythonModules
+
+# extra opts
, extraLibs ? []
, extraOutputsToInstall ? []
, postBuild ? ""
, ignoreCollisions ? false
, permitUserSite ? false
-, requiredPythonModules
# Wrap executables with the given argument.
, makeWrapperArgs ? []
, }:
@@ -22,9 +27,9 @@ let
inherit ignoreCollisions;
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
- postBuild = ''
- . "${makeWrapper}/nix-support/setup-hook"
+ nativeBuildInputs = [ makeWrapper ];
+ postBuild = ''
if [ -L "$out/bin" ]; then
unlink "$out/bin"
fi
diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix
index ba46989c94a7..1173315192e1 100644
--- a/pkgs/development/interpreters/qnial/default.nix
+++ b/pkgs/development/interpreters/qnial/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "vrthra";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper unzip ];
preConfigure = ''
cd build;
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
'';
buildInputs = [
- unzip
pkg-config
ncurses
];
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 99a812905d42..358b8663196b 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
- version = "2020.12";
+ version = "2021.02.1";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
- sha256 = "1g3ciwhlac85d6l2kqslw8pm4bjjd1z79m1c5ll0fxmr6awgpk67";
+ sha256 = "1xwqx4357bw7h5pdmwxm5wxh8wjvrcdk4rvr3wyrhg1wzy5qvsn8";
};
buildInputs = [ icu zlib gmp perl ];
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index f833c153b964..e5baacf5c295 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
- version = "2020.12";
+ version = "2021.02";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
- sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488";
+ sha256 = "08ri9mvbk97qfxcy6lj4cb7j3a789ck052m2vqfhis3vkrkw780r";
};
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index b4b41fa88046..cd60bb3b7900 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
- version = "2020.12";
+ version = "2021.02";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
- sha256 = "13h64d41fwggc3lg4bpllg4jrp64clm7nmnw4g2jyjl47cy5ni7x";
+ sha256 = "1vyl6x811f8mbdnp34yj6kfmfpxp2yfrr8cqf1w47rzmr741sjyj";
};
buildInputs = [ perl ];
diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix
index 42e82cd3a51b..61008f242b91 100644
--- a/pkgs/development/interpreters/rakudo/zef.nix
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zef";
- version = "0.11.4";
+ version = "0.11.5";
src = fetchFromGitHub {
owner = "ugexe";
repo = "zef";
rev = "v${version}";
- sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto=";
+ sha256 = "sha256-LLUAwqky/q9KvFltrcff5U2BSLvOk/BbDSj07QlePSg=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 3bf8ffab0eb6..b13c50f18d2e 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -27,6 +27,7 @@ let
ver = version;
tag = ver.gitTag;
atLeast27 = lib.versionAtLeast ver.majMin "2.7";
+ atLeast30 = lib.versionAtLeast ver.majMin "3.0";
baseruby = self.override {
useRailsExpress = false;
docSupport = false;
@@ -109,7 +110,9 @@ let
(import ./patchsets.nix {
inherit patchSet useRailsExpress ops fetchpatch;
patchLevel = ver.patchLevel;
- }).${ver.majMinTiny};
+ }).${ver.majMinTiny}
+ ++ op atLeast27 ./do-not-regenerate-revision.h.patch
+ ++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch;
postUnpack = opString rubygemsSupport ''
rm -rf $sourceRoot/{lib,test}/rubygems*
@@ -121,17 +124,12 @@ let
sed -i configure.ac -e '/config.guess/d'
cp --remove-destination ${config}/config.guess tool/
cp --remove-destination ${config}/config.sub tool/
+ '' + opString (!atLeast30) ''
# Make the build reproducible for ruby <= 2.7
# See https://github.com/ruby/io-console/commit/679a941d05d869f5e575730f6581c027203b7b26#diff-d8422f096931c58d4463e2489f62a228b0f24f0492950ba88c8c89a0d741cfe6
sed -i ext/io/console/io-console.gemspec -e '/s\.date/d'
'';
- # Force the revision.h generation. Somehow `revision.tmp` is an empty
- # file and because we don't add `git` to buildInputs, hence the check is
- # always true.
- # https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae
- buildFlags = lib.optionals atLeast27 [ "REVISION_LATEST=0" ];
-
configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!jitSupport) "--disable-jit-support"
@@ -149,6 +147,10 @@ let
preConfigure = opString docSupport ''
configureFlagsArray+=("--with-ridir=$devdoc/share/ri")
+
+ # rdoc creates XDG_DATA_DIR (defaulting to $HOME/.local/share) even if
+ # it's not going to be used.
+ export HOME=$TMPDIR
'';
# fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
@@ -261,4 +263,12 @@ in {
git = "0kbgznf1yprfp9645k31ra5f4757b7fichzi0hdg6nxkj90853s0";
};
};
+
+ ruby_3_0 = generic {
+ version = rubyVersion "3" "0" "0" "";
+ sha256 = {
+ src = "0a4fmxafxvkg1m738g2lmkhipwnmd96kzqy1m9kvk3n1l50x2gm1";
+ git = "0fvnxv97m94nridlc5nvvrlg53pr5g042dkfc5ysd327s7xj4cjp";
+ };
+ };
}
diff --git a/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch b/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch
new file mode 100644
index 000000000000..ddeb368ee8ae
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch
@@ -0,0 +1,23 @@
+Do not regenerate revision.h
+
+Ruby's makefile compares the shipped version with the git revision to regenerate
+revision.h [1], but since we don't include git in buildInputs, this comparison
+fails and it can't find $(REVISION_H).
+
+[1] https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae
+
+diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk
+--- ruby.old/defs/gmake.mk
++++ ruby.new/defs/gmake.mk
+@@ -325,11 +325,9 @@
+
+ REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null)
+ REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null)
+-ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST))
+ # GNU make treat the target as unmodified when its dependents get
+ # updated but it is not updated, while others may not.
+ $(srcdir)/revision.h: $(REVISION_H)
+-endif
+
+ # Query on the generated rdoc
+ #
diff --git a/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch b/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch
new file mode 100644
index 000000000000..2de1977630cb
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch
@@ -0,0 +1,14 @@
+Do not update gems when building with base ruby
+
+diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk
+--- ruby.old/common.mk
++++ ruby.new/common.mk
+@@ -1298,7 +1298,7 @@ update-config_files: PHONY
+ config.guess config.sub
+
+ refresh-gems: update-bundled_gems prepare-gems
+-prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
++prepare-gems:
+
+ update-gems$(gnumake:yes=-nongnumake): PHONY
+ $(ECHO) Downloading bundled gem files...
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 69f224641849..3abba61bc246 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,11 +1,6 @@
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
{
- "2.5.8" = ops useRailsExpress [
- "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
- "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
- "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
- ];
"2.6.6" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
@@ -16,4 +11,8 @@
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
];
+ "3.0.0" = ops useRailsExpress [
+ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
+ "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
+ ];
}
diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index 14f932e1d65c..3c2113d608c5 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "skaes";
repo = "rvm-patchsets";
- rev = "e2f4b82e47aeaf2a3b894da3b46ba6f0ca92cbb6";
- sha256 = "059mvf8jcjrfplr8hv2y6ibc41id979k0zwfh6zdnb7dynym4bsg";
+ rev = "28c6469ce841ff3033c376e78a7043009a3bdc5c";
+ sha256 = "0kh08hahrwif61sq0qlvgyqiymxi8c8h2dw4s3ln4aq696k4gba9";
}
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
deleted file mode 100644
index 482561a901ea..000000000000
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
-, libobjc }:
-
-with lib;
-
-stdenv.mkDerivation rec {
- version = "38.8.0";
- pname = "spidermonkey";
-
- src = fetchurl {
- url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2";
- sha256 = "10lrync6cxnjlnadc0j3vg8r2dq9b3wwanw8qj1h6ncxwb7asxcl";
- };
-
- buildInputs = [ libffi readline icu zlib ]
- ++ lib.optional stdenv.isDarwin libobjc;
- nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ];
-
- postUnpack = "sourceRoot=\${sourceRoot}/js/src";
-
- preConfigure = ''
- export CXXFLAGS="-fpermissive"
- export LIBXUL_DIST=$out
- export PYTHON="${buildPackages.python2.interpreter}"
- '';
-
- configureFlags = [
- "--enable-threadsafe"
- "--with-system-ffi"
- "--enable-posix-nspr-emulation"
- "--with-system-zlib"
- "--with-system-icu"
- "--enable-readline"
-
- # enabling these because they're wanted by 0ad. They may or may
- # not be good defaults for other uses.
- "--enable-gcgenerational"
- "--enable-shared-js"
- ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- # Spidermonkey seems to use different host/build terminology for cross
- # compilation here.
- "--host=${stdenv.buildPlatform.config}"
- "--target=${stdenv.hostPlatform.config}"
- ];
-
- configurePlatforms = [];
-
- depsBuildBuild = [ buildPackages.stdenv.cc ];
-
- # This addresses some build system bug. It's quite likely to be safe
- # to re-enable parallel builds if the source revision changes.
- enableParallelBuilding = true;
-
- postFixup = ''
- # The headers are symlinks to a directory that doesn't get put
- # into $out, so they end up broken. Fix that by just resolving the
- # symlinks.
- for i in $(find $out -type l); do
- cp --remove-destination "$(readlink "$i")" "$i";
- done
- '';
-
- meta = with lib; {
- description = "Mozilla's JavaScript engine written in C/C++";
- homepage = "https://developer.mozilla.org/en/SpiderMonkey";
- # TODO: MPL/GPL/LGPL tri-license.
-
- maintainers = [ maintainers.abbradar ];
- platforms = platforms.unix;
- knownVulnerabilities = [ "SpiderMonkey 38 is outdated and contains known security vulnerabilities." ]; # as per https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
- };
-}
diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix
deleted file mode 100644
index d75e5e8b2859..000000000000
--- a/pkgs/development/interpreters/spidermonkey/60.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
-, which, readline, zlib, icu }:
-
-with lib;
-
-let
- version = "60.9.0";
-in stdenv.mkDerivation {
- pname = "spidermonkey";
- inherit version;
-
- src = fetchurl {
- url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
- sha256 = "0gy5x2rnnbkqmjd9sq93s3q5na9nkba68xwpizild7k6qn63qicz";
- };
-
- outputs = [ "out" "dev" ];
- setOutputFlags = false; # Configure script only understands --includedir
-
- buildInputs = [ readline zlib icu ];
- nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ];
-
- patches = [
- # Fixed in 62.0
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1415202
- (fetchpatch {
- url = "https://src.fedoraproject.org/rpms/mozjs60/raw/a1b605c73f382db25977cb2d4d70a3ba2ff85b92/f/Always-use-the-equivalent-year-to-determine-the-time-zone.patch";
- sha256 = "12i225qbzlyfj2disms50zrr5jy8zgn2cc4rgsg58sfgf1bn7150";
- })
- ];
-
- preConfigure = ''
- export CXXFLAGS="-fpermissive"
- export LIBXUL_DIST=$out
- export PYTHON="${buildPackages.python2.interpreter}"
-
- # We can't build in js/src/, so create a build dir
- mkdir obj
- cd obj/
- configureScript=../js/src/configure
- '';
-
- configureFlags = [
- "--with-system-zlib"
- "--with-system-icu"
- "--with-intl-api"
- "--enable-readline"
- "--enable-shared-js"
- "--enable-posix-nspr-emulation"
- "--disable-jemalloc"
- # Fedora and Arch disable optimize, but it doesn't seme to be necessary
- # It turns on -O3 which some gcc version had a problem with:
- # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
- "--enable-optimize"
- "--enable-release"
- ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- # Spidermonkey seems to use different host/build terminology for cross
- # compilation here.
- "--host=${stdenv.buildPlatform.config}"
- "--target=${stdenv.hostPlatform.config}"
- ];
-
- configurePlatforms = [];
-
- depsBuildBuild = [ buildPackages.stdenv.cc ];
-
- # Remove unnecessary static lib
- preFixup = ''
- moveToOutput bin/js60-config "$dev"
- rm $out/lib/libjs_static.ajs
- ln -s $out/bin/js60 $out/bin/js
- '';
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- description = "Mozilla's JavaScript engine written in C/C++";
- homepage = "https://developer.mozilla.org/en/SpiderMonkey";
- license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
- maintainers = [ maintainers.abbradar ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix
index e04069f6aecc..23f24ca8ba46 100644
--- a/pkgs/development/interpreters/spidermonkey/78.nix
+++ b/pkgs/development/interpreters/spidermonkey/78.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
-, fetchpatch
, autoconf213
, pkg-config
, perl
@@ -21,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "spidermonkey";
- version = "78.4.0";
+ version = "78.8.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
- sha256 = "1z3hj45bnd12z3g6ajv9qrgclca7fymi1sxj9l9nh9q6y6xz0g4f";
+ sha256 = "0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw";
};
outputs = [ "out" "dev" ];
@@ -96,9 +95,19 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ postPatch = ''
+ # This patch is a manually applied fix of
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600
+ # Once that bug is fixed, this can be removed.
+ # This is needed in, for example, `zeroad`.
+ substituteInPlace js/public/StructuredClone.h \
+ --replace "class SharedArrayRawBufferRefs {" \
+ "class JS_PUBLIC_API SharedArrayRawBufferRefs {"
+ '';
+
meta = with lib; {
description = "Mozilla's JavaScript engine written in C/C++";
- homepage = "https://developer.mozilla.org/en/SpiderMonkey";
+ homepage = "https://spidermonkey.dev/";
license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
maintainers = with maintainers; [ abbradar lostnet ];
platforms = platforms.linux;
diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix
new file mode 100644
index 000000000000..165251c8c5c3
--- /dev/null
+++ b/pkgs/development/interpreters/trealla/default.nix
@@ -0,0 +1,48 @@
+{ lib, stdenv, fetchFromGitHub, readline, openssl, withThread ? true, withSSL ? true, xxd }:
+
+stdenv.mkDerivation rec {
+ pname = "trealla";
+ version = "1.7.65";
+
+ src = fetchFromGitHub {
+ owner = "infradig";
+ repo = "trealla";
+ rev = "v${version}";
+ sha256 = "sha256-uCDACBwdiCeAwF6IZHz7s5pD83JXTP7jAQDjGld8tt0=";
+ };
+
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace '-I/usr/local/include' "" \
+ --replace '-L/usr/local/lib' "" \
+ --replace 'GIT_VERSION :=' 'GIT_VERSION ?='
+ '';
+
+ makeFlags = [
+ "GIT_VERSION=\"v${version}\""
+ (lib.optionalString withThread "THREADS=1")
+ (lib.optionalString (!withSSL) "NOSSL=1")
+ (lib.optionalString stdenv.isDarwin "NOLDLIBS=1")
+ ];
+
+ nativeBuildInputs = [ xxd ];
+ buildInputs = [ readline openssl ];
+
+ installPhase = ''
+ install -Dm755 -t $out/bin tpl
+ '';
+
+ doCheck = true;
+ preCheck = ''
+ # Disable test 81 due to floating point error
+ rm tests/issues/test081.expected tests/issues/test081.pl
+ '';
+
+ meta = with lib; {
+ description = "A compact, efficient Prolog interpreter written in ANSI C";
+ homepage = "https://github.com/infradig/trealla";
+ license = licenses.mit;
+ maintainers = with maintainers; [ siraben ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index ac0a944f2105..c399ef223de3 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
url = "http://unicon.org/dist/uni-2-4-2010.zip";
sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61";
};
- buildInputs = [ libnsl libX11 libXt unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libnsl libX11 libXt ];
hardeningDisable = [ "fortify" ];
@@ -41,4 +42,3 @@ stdenv.mkDerivation {
homepage = "http://unicon.org";
};
}
-
diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/development/interpreters/yabasic/default.nix
new file mode 100644
index 000000000000..414171082e30
--- /dev/null
+++ b/pkgs/development/interpreters/yabasic/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchurl
+, libSM
+, libX11
+, libXt
+, libffi
+, ncurses
+}:
+
+stdenv.mkDerivation rec {
+ pname = "yabasic";
+ version = "2.89.1";
+
+ src = fetchurl {
+ url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz";
+ hash = "sha256-k8QmQCpszLyotEiWDrG878RM2wqSq7I4W9j6Z2Ub3Yg=";
+ };
+
+ buildInputs = [
+ libSM
+ libX11
+ libXt
+ libffi
+ ncurses
+ ];
+
+ meta = with lib; {
+ homepage = "http://www.yabasic.de/";
+ description = "Yet another BASIC";
+ longDescription = ''
+ Yabasic is a traditional basic-interpreter. It comes with goto and various
+ loops and allows to define subroutines and libraries. It does simple
+ graphics and printing. Yabasic can call out to libraries written in C and
+ allows to create standalone programs. Yabasic runs under Unix and Windows
+ and has a comprehensive documentation; it is small, simple, open-source
+ and free.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix
index c26672c1dabc..d46c7a6bcd85 100644
--- a/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/pkgs/development/libraries/AntTweakBar/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation {
name = "AntTweakBar-1.16";
- buildInputs = [ unzip xorg.libX11 libGLU libGL ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ xorg.libX11 libGLU libGL ];
src = fetchurl {
url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip";
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index ca1446dd9352..314347411261 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "allegro";
- version = "5.2.6.0";
+ version = "5.2.7.0";
src = fetchFromGitHub {
owner = "liballeg";
repo = "allegro5";
rev = version;
- sha256 = "1xbhvriyh10ka2j7jgjkpa6mlzp6av909hhr9sk317vjvf0z0mqz";
+ sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 8a8ab23d495e..1d0256f3b274 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
- version = "2021.Q1.4";
+ version = "2021.Q1.6";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "mA7YalgcfjfYdmKPk8L4mfDJWn0rimPDoDB9/S3pyNM=";
+ sha256 = "FSQ/bYlvdw0Ih3Yl329o8Gizw0YcZTLtiI222Ju4M8w=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix
index b226c9e36d24..2316961e3994 100644
--- a/pkgs/development/libraries/amrnb/default.nix
+++ b/pkgs/development/libraries/amrnb/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix
index 776065b28bc7..81938bb4cba7 100644
--- a/pkgs/development/libraries/amrwb/default.nix
+++ b/pkgs/development/libraries/amrwb/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1p6m9nd08mv525w14py9qzs9zwsa5i3vxf5bgcmcvc408jqmkbsw";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
index 976387d49eb0..136ffb79804a 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "apache-activemq";
- version = "5.16.0";
+ version = "5.16.1";
src = fetchurl {
- sha256 = "0x68l4n0v2jqmbawdgpghmhnchpg1jsvxzskj6s4hjll6hdgb6fk";
+ sha256 = "sha256-Q9PzqJC/+uhcbxAC6c+VD8wf0X8/XlXcO4XTnQni4yM=";
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
};
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 6094c0b8f467..22264fe01f30 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
- version = "10.2.2";
+ version = "10.3.0";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
- sha256 = "sha256-lClfxi7MQ3PlqWx7Yrkj/XGoHzFaqVl7KCqv2FWelDU=";
+ sha256 = "sha256-qx7/+lr5AAChGhmjkwL9+8XEq/b6tXipvQ6clc+B5Mc=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix
index c636d672332c..a66db4800177 100644
--- a/pkgs/development/libraries/arrayfire/default.nix
+++ b/pkgs/development/libraries/arrayfire/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config
, opencl-clhpp, ocl-icd, fftw, fftwFloat
, blas, lapack, boost, mesa, libGLU, libGL
-, freeimage, python, clfft, clblas
+, freeimage, python3, clfft, clblas
, doxygen, buildDocs ? false
, cudaSupport ? false, cudatoolkit
}:
@@ -39,9 +39,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkg-config
- python
+ python3
];
+ strictDeps = true;
+
buildInputs = [
opencl-clhpp fftw fftwFloat
blas lapack
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 7aa4859ef0ed..b1c6c6396c86 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
-, libsndfile, pkg-config, python, wafHook
+, libsndfile, pkg-config, python3, wafHook
}:
stdenv.mkDerivation rec {
@@ -10,9 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl";
};
- nativeBuildInputs = [ pkg-config python wafHook ];
+ nativeBuildInputs = [ pkg-config python3 wafHook ];
buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ];
+ strictDeps = true;
+
meta = with lib; {
description = "Library for audio labelling";
homepage = "https://aubio.org/";
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
index 540e152655f6..ccfafd36a8a3 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -37,14 +37,16 @@ stdenv.mkDerivation rec {
url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch";
sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w";
})
+ (fetchpatch {
+ name = "RtMidi-Adjust-public-header-installs-to-match-autotools.patch";
+ url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch";
+ sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj";
+ })
];
postPatch = ''
substituteInPlace rtmidi.pc.in \
--replace 'Requires:' 'Requires.private:'
- substituteInPlace CMakeLists.txt \
- --replace 'PUBLIC_HEADER RtMidi.h' 'PUBLIC_HEADER "RtMidi.h;rtmidi_c.h"' \
- --replace 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}' 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}/rtmidi'
'';
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index 88e81d733b32..3b3c005a015b 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "zita-resampler";
- version = "1.6.2";
+ version = "1.8.0";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
- sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3";
+ sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI=";
};
makeFlags = [
diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix
index 18dddee6bde8..b6468a8dae0a 100644
--- a/pkgs/development/libraries/aws-c-event-stream/default.nix
+++ b/pkgs/development/libraries/aws-c-event-stream/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-event-stream";
- version = "0.2.6";
+ version = "0.2.7";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "1hbri4dv924ph3cxkmwkl4kdca4dvhc9qda60rdzs6355l76k23n";
+ sha256 = "sha256-8Du9Ib3MhPcgetBIi0k1NboaXxZh7iPNhDe7197JnHc=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix
index 700fe4f46860..dc585217cea7 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.24";
+ version = "4.4.34";
nativeBuildInputs = [ cmake bcunit ];
buildInputs = [ mbedtls ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "sha256-RfjD+E8FLFNBkwpOohNAKDINHAhSNEkeVArqtjfn2i0=";
+ sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25";
};
# Do not build static libraries
diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/development/libraries/bearssl/default.nix
new file mode 100644
index 000000000000..de9c182df148
--- /dev/null
+++ b/pkgs/development/libraries/bearssl/default.nix
@@ -0,0 +1,61 @@
+{ lib, stdenv, fetchurl }:
+
+let
+ version = "0.6";
+ sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7";
+
+in
+stdenv.mkDerivation {
+ pname = "bearssl";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://www.bearssl.org/bearssl-${version}.tar.gz";
+ inherit sha256;
+ };
+
+ outputs = [ "bin" "lib" "dev" "out" ];
+
+ enableParallelBuilding = true;
+
+ installPhase = ''
+ runHook preInstall
+ install -D build/brssl $bin/brssl
+ install -D build/testcrypto $bin/testcrypto
+ install -Dm644 build/libbearssl.so $lib/lib/libbearssl.so
+ install -Dm644 build/libbearssl.a $lib/lib/libbearssl.a
+ install -Dm644 -t $dev/include inc/*.h
+ touch $out
+ runHook postInstall
+ '';
+
+ meta = {
+ homepage = "https://www.bearssl.org/";
+ description = "An implementation of the SSL/TLS protocol written in C";
+ longDescription = ''
+ BearSSL is an implementation of the SSL/TLS protocol (RFC 5246)
+ written in C. It aims at offering the following features:
+
+ * Be correct and secure. In particular, insecure protocol versions and
+ choices of algorithms are not supported, by design; cryptographic
+ algorithm implementations are constant-time by default.
+
+ * Be small, both in RAM and code footprint. For instance, a minimal
+ server implementation may fit in about 20 kilobytes of compiled code
+ and 25 kilobytes of RAM.
+
+ * Be highly portable. BearSSL targets not only “big” operating systems
+ like Linux and Windows, but also small embedded systems and even
+ special contexts like bootstrap code.
+
+ * Be feature-rich and extensible. SSL/TLS has many defined cipher
+ suites and extensions; BearSSL should implement most of them, and
+ allow extra algorithm implementations to be added afterwards,
+ possibly from third parties.
+ '';
+ license = lib.licenses.mit;
+ platforms = lib.platforms.all;
+ maintainers = [ lib.maintainers.Profpatsch ];
+ };
+
+}
diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix
index 03f6e96e187d..5ce7ad477bfa 100644
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "belcard";
- version = "4.4.24";
+ version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops=";
+ sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m";
};
buildInputs = [ bctoolbox belr ];
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 833d200ffa3b..8f0a116f1aa3 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -2,15 +2,16 @@
, bctoolbox
, cmake
, fetchFromGitLab
+, lib
, libantlr3c
, mbedtls
-, lib, stdenv
+, stdenv
, zlib
}:
stdenv.mkDerivation rec {
pname = "belle-sip";
- version = "4.4.26";
+ version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4=";
+ sha256 = "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z";
};
nativeBuildInputs = [ antlr3_4 cmake ];
diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix
index b38757525abd..acd2393f75ed 100644
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "belr";
- version = "4.3.2";
+ version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q";
+ sha256 = "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h";
};
buildInputs = [ bctoolbox ];
diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/development/libraries/boca/default.nix
index a23acdbdc8a9..0f848e302408 100644
--- a/pkgs/development/libraries/boca/default.nix
+++ b/pkgs/development/libraries/boca/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "BoCA";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchFromGitHub {
owner = "enzo1982";
repo = "boca";
rev = "v${version}";
- sha256 = "0x6pqd5cdag0l283lkq01qaqwyf1skxbncdwig8b2s742nbzjlz8";
+ sha256 = "sha256-SP/rVt/8VoeUprwJIIMSIBvoC1Zein3F7MR2tqc2vd0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix
index 97e879809528..148e27faa2b6 100644
--- a/pkgs/development/libraries/boost-process/default.nix
+++ b/pkgs/development/libraries/boost-process/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
mkdir $name
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 0369f603b8e1..33f9daf7b50f 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
+{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, openssl, boost
# Passed by version specific builders
, baseVersion, revision, sha256
, sourceExtension ? "tar.xz"
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
};
inherit postPatch;
- buildInputs = [ python bzip2 zlib gmp openssl boost ]
+ buildInputs = [ python3 bzip2 zlib gmp openssl boost ]
++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
configurePhase = ''
diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix
index 0adcb327cc4d..f29295bb130f 100644
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "bzrtp";
- version = "4.4.9";
+ version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix
index 74d167144a9f..73ffd6c12b23 100644
--- a/pkgs/development/libraries/clearsilver/default.nix
+++ b/pkgs/development/libraries/clearsilver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, python }:
+{ lib, stdenv, fetchurl, fetchpatch, python2 }:
stdenv.mkDerivation rec {
name = "clearsilver-0.10.5";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";
};
- PYTHON_SITE = "$(out)/site-packages";
+ PYTHON_SITE = "${placeholder "out"}/${python2.sitePackages}";
configureFlags = [
- "--with-python=${python}/bin/python"
+ "--with-python=${python2.interpreter}"
"--disable-apache"
"--disable-perl"
"--disable-ruby"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
preInstall = ''
mkdir -p $out
- mkdir -p $out/site-packages
+ mkdir -p $out/${python2.sitePackages}
'';
patches = [
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
deleted file mode 100644
index 968c395d701f..000000000000
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "concurrencykit";
- version = "0.6.0";
-
- src = fetchurl {
- url = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
- sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp";
- };
-
- #Deleting this line causes "Unknown option --disable-static"
- configurePhase = "./configure --prefix=$out";
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- description = "A library of safe, high-performance concurrent data structures";
- homepage = "http://concurrencykit.org";
- license = licenses.bsd2;
- platforms = platforms.unix;
- maintainers = [ maintainers.thoughtpolice ];
- };
-}
diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix
index aceb2d61e388..e0f9ed599123 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/pkgs/development/libraries/cppcms/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
+{ lib, stdenv, fetchurl, cmake, pcre, zlib, python2, openssl }:
stdenv.mkDerivation rec {
pname = "cppcms";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ pcre zlib python openssl ];
+ buildInputs = [ pcre zlib python2 openssl ];
+
+ strictDeps = true;
cmakeFlags = [
"--no-warn-unused-cli"
diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix
index 9410b0715006..3b9f4f942acf 100644
--- a/pkgs/development/libraries/crcpp/default.nix
+++ b/pkgs/development/libraries/crcpp/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "crcpp";
- version = "1.0.1.0";
+ version = "1.1.0.0";
src = fetchFromGitHub {
owner = "d-bahr";
repo = "CRCpp";
rev = "release-${version}";
- sha256 = "138w97kfxnv8rcnvggba6fcxgbgq8amikkmy3jhqfn6xzy6zaimh";
+ sha256 = "sha256-jBvh4dHSFChxNPVgkGVHy3TXSExsfwdVUfsA8XB1cn8=";
};
dontBuild = true;
diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix
index 80ec1986f8cf..9f7d020feaf7 100644
--- a/pkgs/development/libraries/cutelyst/default.nix
+++ b/pkgs/development/libraries/cutelyst/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "cutelyst";
- version = "2.14.0";
+ version = "2.14.2";
src = fetchFromGitHub {
owner = "cutelyst";
repo = "cutelyst";
rev = "v${version}";
- sha256 = "sha256-RidUZqDnzRrgW/7LVF+BF01zNcf1cJ/kS7OF/t1Q65c=";
+ sha256 = "sha256-JUffOeUTeaZvEssP5hfSGipeRuQ7FzLF4bOizCFhe5o=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 2b9357e3ef0f..51df5a9254a5 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitLab
, meson, ninja, nasm, pkg-config
+, xxHash
, withTools ? false # "dav1d" binary
, withExamples ? false, SDL2 # "dav1dplay" binary
, useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers
@@ -9,19 +10,20 @@ assert useVulkan -> withExamples;
stdenv.mkDerivation rec {
pname = "dav1d";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";
repo = pname;
rev = version;
- sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x";
+ sha256 = "0plmnxpz66yv3nqv1kgbyyfnwfqi9dqs0zbsdj488i6464a1m6si";
};
nativeBuildInputs = [ meson ninja nasm pkg-config ];
# TODO: doxygen (currently only HTML and not build by default).
- buildInputs = lib.optional withExamples SDL2
+ buildInputs = [ xxHash ]
+ ++ lib.optional withExamples SDL2
++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ];
mesonFlags= [
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix
index f9456b8acac4..3de84b684e52 100644
--- a/pkgs/development/libraries/docopt_cpp/default.nix
+++ b/pkgs/development/libraries/docopt_cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, python2 }:
stdenv.mkDerivation rec {
version = "0.6.3";
@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";
};
- nativeBuildInputs = [ cmake python ];
+ nativeBuildInputs = [ cmake python2 ];
cmakeFlags = ["-DWITH_TESTS=ON"];
+ strictDeps = true;
+
doCheck = true;
postPatch = ''
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 916ea2772e19..a09ad0e871ef 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -246,11 +246,6 @@ stdenv.mkDerivation rec {
# this should go away in the next release
patches = [
- (fetchpatch {
- url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315";
- sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o=";
- name = "fix_libsrt.patch";
- })
# Patch ffmpeg for svt-av1 until version 4.4
(fetchpatch {
url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch";
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index 2cc409fc0370..95207b5386f8 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -5,8 +5,8 @@
}@args:
callPackage ./generic.nix (rec {
- version = "4.3.1";
+ version = "4.3.2";
branch = "4.3";
- sha256 = "1nghcpm2r9ir2h6xpqfn9381jq6aiwlkwlnyplxywvkbjiisr97l";
+ sha256 = "0flik4y7c5kchj65p3p908mk1dsncqgzjdvzysjs12rmf1m6sfmb";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)
diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix
index f7a605ea872b..dc5f43860305 100644
--- a/pkgs/development/libraries/freetts/default.nix
+++ b/pkgs/development/libraries/freetts/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip";
sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7";
};
- buildInputs = [ apacheAnt unzip sharutils jdk ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ apacheAnt sharutils jdk ];
unpackPhase = ''
unzip $src -x META-INF/*
'';
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index c3fd6ffb9407..5588e27356f0 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -1,40 +1,47 @@
-{ lib, stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }:
+{ lib
+, stdenv
+, fetchurl
+, freetype
+, libGL
+, libGLU
+, OpenGL
+}:
-let
- name = "ftgl-2.1.3-rc5";
-in
-stdenv.mkDerivation {
- inherit name;
+stdenv.mkDerivation rec {
+ pname = "ftgl";
+ version = "2.1.3-rc5";
src = fetchurl {
- url = "mirror://sourceforge/ftgl/${name}.tar.gz";
- sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l";
+ url = "mirror://sourceforge/${pname}-${version}.tar.gz";
+ hash = "sha256-VFjWISJFSGlXLTn4qoV0X8BdVRgAG876Y71su40mVls=";
};
- buildInputs = [ freetype ]
- ++ (if stdenv.isDarwin then
- [ OpenGL ]
- else
- [ libGL libGLU ])
- ;
+ buildInputs = [
+ freetype
+ ] ++ (if stdenv.isDarwin then [
+ OpenGL
+ ] else [
+ libGL
+ libGLU
+ ]);
- configureFlags = [ "--with-ft-prefix=${lib.getDev freetype}" ];
+ configureFlags = [
+ "--with-ft-prefix=${lib.getDev freetype}"
+ ];
enableParallelBuilding = true;
- meta = {
+ meta = with lib; {
homepage = "https://sourceforge.net/apps/mediawiki/ftgl/";
description = "Font rendering library for OpenGL applications";
- license = lib.licenses.gpl3Plus;
-
longDescription = ''
- FTGL is a free cross-platform Open Source C++ library that uses
- Freetype2 to simplify rendering fonts in OpenGL applications. FTGL
- supports bitmaps, pixmaps, texture maps, outlines, polygon mesh,
- and extruded polygon rendering modes.
+ FTGL is a free cross-platform Open Source C++ library that uses Freetype2
+ to simplify rendering fonts in OpenGL applications. FTGL supports bitmaps,
+ pixmaps, texture maps, outlines, polygon mesh, and extruded polygon
+ rendering modes.
'';
-
- platforms = lib.platforms.unix;
- maintainers = [];
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix
index 088354aecb28..47926e2ec0be 100644
--- a/pkgs/development/libraries/gaia/default.nix
+++ b/pkgs/development/libraries/gaia/default.nix
@@ -9,7 +9,7 @@
, wafHook
, makeWrapper
, qt4
-, pythonPackages
+, pythonPackages ? null
, pythonSupport ? false
# Default to false since it breaks the build, see https://github.com/MTG/gaia/issues/11
, stlfacadeSupport ? false
diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix
index 888f26f2da7d..4e28f84bacdb 100644
--- a/pkgs/development/libraries/galario/default.nix
+++ b/pkgs/development/libraries/galario/default.nix
@@ -5,7 +5,7 @@
, fftw
, fftwFloat
, enablePython ? false
-, pythonPackages
+, pythonPackages ? null
, llvmPackages
}:
let
diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index bf6c030589b9..d53206ca667b 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }:
+{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }:
stdenv.mkDerivation rec {
pname = "ganv";
@@ -11,8 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f";
};
- nativeBuildInputs = [ pkg-config wafHook ];
- buildInputs = [ graphviz gtk2 gtkmm2 python ];
+ nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ];
+ buildInputs = [ graphviz gtkmm2 ];
+
+ strictDeps = true;
meta = with lib; {
description = "An interactive Gtk canvas widget for graph-based interfaces";
diff --git a/pkgs/development/libraries/gdal/2.4.nix b/pkgs/development/libraries/gdal/2.4.nix
index 5df29b38a263..76c92dd9a3b5 100644
--- a/pkgs/development/libraries/gdal/2.4.nix
+++ b/pkgs/development/libraries/gdal/2.4.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
};
- buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
++ (with pythonPackages; [ python numpy wrapPython ])
++ lib.optional stdenv.isDarwin libiconv
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 8c02919126ba..15fc84895fb5 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -7,22 +7,20 @@ with lib;
stdenv.mkDerivation rec {
pname = "gdal";
- # broken with poppler 20.08, however, can't fetch patches cleanly
- version = "3.1.2.post2020-08-26";
+ version = "3.2.2";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
- rev = "9a8df672204a8b3b33c36e09a32f747e21166fe9";
- sha256 = "1n25jma4x1l7slwxk702q77r84vxr90fyn4c3zpkr07q1b8wqql9";
+ rev = "a33784291d19015217ea2604988e53d448e14a07";
+ sha256 = "sha256-ynCju3chDfYtyrGmUE0n3kkaH2Mpm+/DDHHxCahjhSQ=";
};
sourceRoot = "source/gdal";
- nativeBuildInputs = [ autoreconfHook pkg-config ];
+ nativeBuildInputs = [ autoreconfHook pkg-config unzip ];
buildInputs = [
- unzip
libjpeg
libtiff
libpng
diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix
index 92d17452c941..47be58c50511 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
};
- buildInputs = [ unzip libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
patches = [
# This ensures that the python package is installed into gdal's prefix,
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index af3c9d84ac7c..2093328f5793 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -1,11 +1,10 @@
{ lib, stdenv
, fetchurl
-, fetchpatch
, pkg-config
, vala
, gobject-introspection
, gtk-doc
-, docbook_xsl
+, docbook-xsl-nons
, docbook_xml_dtd_43
, glib
, babl
@@ -15,6 +14,7 @@
, librsvg
, lensfun
, libspiro
+, maxflow
, netsurf
, pango
, poly2tri-c
@@ -35,25 +35,16 @@
stdenv.mkDerivation rec {
pname = "gegl";
- version = "0.4.26";
+ version = "0.4.28";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ=";
+ sha256 = "sha256-HRENhXfVTMo7NCOTFb03xXzLJ91DVWVQdKLSs/2JeQA=";
};
- patches = [
- # fix build with darwin: https://github.com/NixOS/nixpkgs/issues/99108
- # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch";
- sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
- })
- ];
-
nativeBuildInputs = [
pkg-config
gettext
@@ -62,7 +53,7 @@ stdenv.mkDerivation rec {
vala
gobject-introspection
gtk-doc
- docbook_xsl
+ docbook-xsl-nons
docbook_xml_dtd_43
];
@@ -73,6 +64,7 @@ stdenv.mkDerivation rec {
librsvg
lensfun
libspiro
+ maxflow
netsurf.libnsgif
pango
poly2tri-c
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 0e8ed605a2d6..b18ce099dced 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libelf setupHook pcre
bash gnum4 # install glib-gettextize and m4 macros for other apps to use
+ gtk-doc
] ++ optionals stdenv.isLinux [
libselinux
util-linuxMinimal # for libmount
@@ -99,8 +100,10 @@ stdenv.mkDerivation rec {
AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
]);
+ strictDeps = true;
+
nativeBuildInputs = [
- meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
+ meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2
];
propagatedBuildInputs = [ zlib libffi gettext libiconv ];
@@ -120,6 +123,8 @@ stdenv.mkDerivation rec {
"-DG_DISABLE_CAST_CHECKS"
];
+ hardeningDisable = [ "pie" ];
+
postPatch = ''
chmod +x gio/tests/gengiotypefuncs.py
patchShebangs gio/tests/gengiotypefuncs.py
@@ -144,7 +149,7 @@ stdenv.mkDerivation rec {
cp -r ${buildPackages.glib.devdoc} $devdoc
'';
- checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ];
+ checkInputs = [ tzdata desktop-file-utils shared-mime-info ];
preCheck = optionalString doCheck ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
diff --git a/pkgs/development/libraries/glpng/default.nix b/pkgs/development/libraries/glpng/default.nix
new file mode 100644
index 000000000000..1194d988c073
--- /dev/null
+++ b/pkgs/development/libraries/glpng/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromRepoOrCz
+, cmake
+, libGL
+, libpng
+, pkg-config
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "glpng";
+ version = "1.46";
+
+ src = fetchFromRepoOrCz {
+ repo = "glpng";
+ rev = "v${version}";
+ hash = "sha256-C7EHaBN0PE/HJB6zcIaYU63+o7/MEz4WU1xr/kIOanM=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+ buildInputs = [
+ libGL
+ libpng
+ zlib
+ ];
+
+ meta = with lib; {
+ homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm";
+ description = "PNG loader for OpenGL";
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
index c5846b523cd2..824d5c383182 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -30,7 +30,7 @@
stdenv.mkDerivation rec {
pname = "gnome-online-accounts";
- version = "3.38.0";
+ version = "3.38.1";
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
src = fetchFromGitLab {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "gnome-online-accounts";
rev = version;
- sha256 = "sha256-NRGab/CMJxe31rr20+5wYZF2rOzoSNdztfNVojBd5ag=";
+ sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4=";
};
outputs = [ "out" "man" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index d544dd7625dc..64b5be2e2d33 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "goffice";
- version = "0.10.48";
+ version = "0.10.49";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4";
+ sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k=";
};
nativeBuildInputs = [ pkg-config intltool ];
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 5374dc75e1a8..8883761c5d19 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- version = "1.36.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+ version = "1.36.4"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
- sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z";
+ sha256 = "1zxvdg5vgjgkq5wmzwbxj2zydaj90ja074axs26yzd9x08j0bjxz";
fetchSubmodules = true;
};
patches = [
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ zlib c-ares c-ares.cmake-config re2 openssl protobuf gflags ]
+ propagatedBuildInputs = [ c-ares re2 zlib ];
+ buildInputs = [ c-ares.cmake-config openssl protobuf gflags ]
++ lib.optionals stdenv.isLinux [ libnsl ];
cmakeFlags =
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 13088dda0c91..f70a748a20e7 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
};
patchPhase = ''
+ substituteInPlace Makefile \
+ --replace "= gcc " "?= gcc "
# Fix include directory
sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile
'' + optionalString (!staticSupport) (
diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix
index 0e467b294330..ac925477adb3 100644
--- a/pkgs/development/libraries/gtdialog/default.nix
+++ b/pkgs/development/libraries/gtdialog/default.nix
@@ -9,9 +9,9 @@ let
url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip";
sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
- cdk unzip gtk2 glib ncurses
+ cdk gtk2 glib ncurses
];
in
stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
index 4304cb388d1a..8f50c922f514 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -1,4 +1,4 @@
-{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
+{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
, gdk-pixbuf, xlibsWrapper, gobject-introspection
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
@@ -12,6 +12,16 @@ assert cupsSupport -> cups != null;
with lib;
+let
+
+ gtkCleanImmodulesCache = substituteAll {
+ src = ./hooks/clean-immodules-cache.sh;
+ gtk_module_path = "gtk-2.0";
+ gtk_binary_version = "2.10.0";
+ };
+
+in
+
stdenv.mkDerivation rec {
pname = "gtk+";
version = "2.24.32";
@@ -27,8 +37,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
setupHooks = [
- ./hooks/gtk2-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
+ gtkCleanImmodulesCache
];
nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ];
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index 159b03a26e1f..f9d739a43ea7 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv
+{ lib
+, stdenv
+, substituteAll
, fetchurl
, fetchpatch
, pkg-config
@@ -48,6 +50,16 @@
assert cupsSupport -> cups != null;
+let
+
+ gtkCleanImmodulesCache = substituteAll {
+ src = ./hooks/clean-immodules-cache.sh;
+ gtk_module_path = "gtk-3.0";
+ gtk_binary_version = "3.0.0";
+ };
+
+in
+
stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.24";
@@ -56,8 +68,8 @@ stdenv.mkDerivation rec {
outputBin = "dev";
setupHooks = [
- ./hooks/gtk3-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
+ gtkCleanImmodulesCache
];
src = fetchurl {
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index b05e9ea03933..28247d6c9728 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -1,5 +1,6 @@
{ lib
, stdenv
+, substituteAll
, fetchurl
, pkg-config
, gettext
@@ -53,6 +54,16 @@
assert cupsSupport -> cups != null;
+let
+
+ gtkCleanImmodulesCache = substituteAll {
+ src = ./hooks/clean-immodules-cache.sh;
+ gtk_module_path = "gtk-4.0";
+ gtk_binary_version = "4.0.0";
+ };
+
+in
+
stdenv.mkDerivation rec {
pname = "gtk4";
version = "4.0.3";
@@ -61,8 +72,8 @@ stdenv.mkDerivation rec {
outputBin = "dev";
setupHooks = [
- ./hooks/gtk4-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
+ gtkCleanImmodulesCache
];
src = fetchurl {
diff --git a/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh
new file mode 100644
index 000000000000..0868a4a39101
--- /dev/null
+++ b/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh
@@ -0,0 +1,15 @@
+# shellcheck shell=bash
+
+fixupOutputHooks+=(_gtkCleanImmodulesCache)
+
+# Clean comments that link to generator of the file
+_gtkCleanImmodulesCache() {
+ # gtk_module_path is where the modules are installed
+ # https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.24/gtk/gtkmodules.c#L68
+ # gtk_binary_version can be retrived with:
+ # pkg-config --variable=gtk_binary_version gtk+-3.0
+ local f="${prefix:?}/lib/@gtk_module_path@/@gtk_binary_version@/immodules.cache"
+ if [ -f "$f" ]; then
+ sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
+ fi
+}
diff --git a/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
deleted file mode 100644
index dde991fd27cd..000000000000
--- a/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# shellcheck shell=bash
-
-fixupOutputHooks+=(_gtk2CleanComments)
-
-# Clean comments that link to generator of the file
-_gtk2CleanComments() {
- local f="${prefix:?}/lib/gtk-2.0/2.10.0/immodules.cache"
- if [ -f "$f" ]; then
- sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
- fi
-}
-
diff --git a/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh
deleted file mode 100644
index d2d5287831a0..000000000000
--- a/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# shellcheck shell=bash
-
-fixupOutputHooks+=(_gtk3CleanComments)
-
-# Clean comments that link to generator of the file
-_gtk3CleanComments() {
- local f="${prefix:?}/lib/gtk-3.0/3.0.0/immodules.cache"
- if [ -f "$f" ]; then
- sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
- fi
-}
diff --git a/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh b/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh
deleted file mode 100644
index 49f7051aabb6..000000000000
--- a/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# shellcheck shell=bash
-
-fixupOutputHooks+=(_gtk4CleanComments)
-
-# Clean comments that link to generator of the file
-_gtk4CleanComments() {
- local f="${prefix:?}/lib/gtk-4.0/4.0.0/immodules.cache"
- if [ -f "$f" ]; then
- sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
- fi
-}
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index ccaceabd4e98..a3aa18b058a2 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
+{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg
, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
stripRoot = false;
};
- nativeBuildInputs = [ dmd pkg-config which ];
+ nativeBuildInputs = [ ldc pkg-config which ];
propagatedBuildInputs = [
atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
libgda libpeas librsvg pango vte
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 72646fc198bb..9ead894e0d25 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
, meson, ninja }:
@@ -26,7 +26,16 @@ stdenv.mkDerivation rec {
buildInputs = [ atk cairo glib pango fribidi libxml2 ];
- patches = [ ./4.x-nix_share_path.patch ];
+ patches = [
+ ./4.x-nix_share_path.patch
+
+ # fixes intermittent "gtksourceview-gresources.h: no such file" errors
+ (fetchpatch {
+ name = "ensure-access-to-resources-in-corelib-build.patch";
+ url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch";
+ sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0=";
+ })
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix
index 0525fcd0eba6..aacdf0ee933e 100644
--- a/pkgs/development/libraries/hawknl/default.nix
+++ b/pkgs/development/libraries/hawknl/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
makefile = "makefile.linux";
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index 265289f06f38..f35d7528f4e8 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -4,8 +4,8 @@ mkDerivation rec {
version = "unstable-20-06-26";
pname = "herqq";
- nativeBuildInputs = [ qmake ];
- buildInputs = [ qtbase unzip qtmultimedia ];
+ nativeBuildInputs = [ qmake unzip ];
+ buildInputs = [ qtbase qtmultimedia ];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 00d0933bdd70..37b567896359 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -45,7 +45,8 @@ let
platforms = platforms.all;
};
phases = "unpackPhase patchPhase buildPhase installPhase";
- buildInputs = [ bash coreutils unzip which zip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ bash coreutils which zip ];
patchPhase = ''
substituteInPlace ortograf/herramientas/make_dict.sh \
--replace /bin/bash bash \
@@ -86,7 +87,7 @@ let
license = licenses.lgpl3;
platforms = platforms.all;
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
sourceRoot = ".";
unpackCmd = ''
@@ -126,7 +127,7 @@ let
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
sourceRoot = ".";
unpackCmd = ''
@@ -155,7 +156,7 @@ let
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
sourceRoot = ".";
unpackCmd = ''
@@ -182,7 +183,7 @@ let
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase patchPhase installPhase";
sourceRoot = ".";
prePatch = ''
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 6a939835cf56..a6fb316d659f 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null;
with lib;
let
- version = "2.4.0";
+ version = "2.4.1";
versmm = versions.major version + "." + versions.minor version;
name = "hwloc-${version}";
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
- sha256 = "1s9q70mrr4igbjw4m26din81i68f4wbfpv6wdc4i2aalvd51n7rb";
+ sha256 = "sha256-OSQh5p8mEgyKuV0VH+mJ8rS2nas8dzV0HE4KbX3l3mM=";
};
configureFlags = [
diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/development/libraries/inchi/default.nix
index 256e0d702434..f74cfdec9305 100644
--- a/pkgs/development/libraries/inchi/default.nix
+++ b/pkgs/development/libraries/inchi/default.nix
@@ -1,69 +1,74 @@
-{ pkgs
-, fetchurl
+{ fetchurl
, lib
, stdenv
, unzip
, fixDarwinDylibNames
}:
-stdenv.mkDerivation {
- pname = "inchi";
- version = "1.05";
- src = fetchurl {
- url = "http://www.inchi-trust.org/download/105/INCHI-1-SRC.zip";
- sha1 = "e3872a46d58cb321a98f4fd4b93a989fb6920b9c";
- };
+let
+ versionMajor = "1";
+ versionMinor = "0.6";
+ version = versionMajor + "." + versionMinor;
+ removeDots = lib.replaceStrings [ "." ] [ "" ];
+ src-doc = fetchurl {
+ url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-DOC.zip";
+ sha256 = "1kyda09i9p89xfq90ninwi7w13k1w3ljpl4gqdhpfhi5g8fgxx7f";
+ };
+in
+ stdenv.mkDerivation rec {
+ pname = "inchi";
+ inherit version;
- nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
- outputs = [ "out" "doc" ];
+ src = fetchurl {
+ url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-SRC.zip";
+ sha256 = "1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28";
+ };
- enableParallelBuilding = true;
+ nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ outputs = [ "out" "doc" ];
- preConfigure = ''
- cd ./INCHI_API/libinchi/gcc
- '' + lib.optionalString stdenv.isDarwin ''
- substituteInPlace makefile \
- --replace ",--version-script=libinchi.map" "" \
- --replace "LINUX_Z_RELRO = ,-z,relro" "" \
- --replace "-soname" "-install_name" \
- --replace "gcc" $CC
- '';
- installPhase = ''
- runHook preInstall
+ enableParallelBuilding = true;
- cd ../../..
- mkdir -p $out/lib
- mkdir -p $out/include/inchi
- mkdir -p $doc/share/
+ preConfigure = ''
+ cd ./INCHI_API/libinchi/gcc
+ '' + lib.optionalString stdenv.isDarwin ''
+ substituteInPlace makefile \
+ --replace ",--version-script=libinchi.map" "" \
+ --replace "LINUX_Z_RELRO = ,-z,relro" "" \
+ --replace "-soname" "-install_name" \
+ --replace "gcc" $CC
+ '';
+ installPhase = let
+ versionOneDot = versionMajor + "." + removeDots versionMinor;
+ in ''
+ runHook preInstall
- install -m 755 INCHI_API/bin/Linux/libinchi.so.1.05.00 $out/lib
- ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so.1
- ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so
- install -m 644 INCHI_BASE/src/*.h $out/include/inchi
+ cd ../../..
+ mkdir -p $out/lib
+ mkdir -p $out/include/inchi
+ mkdir -p $doc/share/
- runHook postInstall
- '';
+ install -m 755 INCHI_API/bin/Linux/libinchi.so.${versionOneDot}.00 $out/lib
+ ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so.1
+ ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so
+ install -m 644 INCHI_BASE/src/*.h $out/include/inchi
- preFixup = lib.optionalString stdenv.isDarwin ''
- fixDarwinDylibNames $(find "$out" -name "*.so.*")
- '';
+ runHook postInstall
+ '';
- postInstall =
- let
- src-doc = fetchurl {
- url = "http://www.inchi-trust.org/download/105/INCHI-1-DOC.zip";
- sha1 = "2f54y0san34v01c215kk0cigzsn76js5";
- };
- in
- ''
+ preFixup = lib.optionalString stdenv.isDarwin ''
+ fixDarwinDylibNames $(find "$out" -name "*.so.*")
+ '';
+
+ postInstall = ''
unzip '${src-doc}'
install -m 644 INCHI-1-DOC/*.pdf $doc/share
'';
- meta = with lib; {
- homepage = "https://www.inchi-trust.org/";
- description = "IUPAC International Chemical Identifier library";
- license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ rmcgibbo ];
- };
-}
+ meta = with lib; {
+ homepage = "https://www.inchi-trust.org/";
+ description = "IUPAC International Chemical Identifier library";
+ license = licenses.lgpl2Plus;
+ maintainers = with maintainers; [ rmcgibbo ];
+ };
+ }
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index e283a2909474..633108459713 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib
'';
- buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];
meta = {
homepage = "http://irrlicht.sourceforge.net/";
diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix
index b41486ce9dd6..1235941b2dc3 100644
--- a/pkgs/development/libraries/irrlicht/mac.nix
+++ b/pkgs/development/libraries/irrlicht/mac.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
"-DIRRLICHT_BUILD_TOOLS=OFF"
];
- nativeBuildInputs = [ cmake ];
- buildInputs = [ unzip OpenGL Cocoa IOKit ];
+ nativeBuildInputs = [ cmake unzip ];
+ buildInputs = [ OpenGL Cocoa IOKit ];
meta = {
homepage = "http://irrlicht.sourceforge.net/";
diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 02dd4a5635b5..30044eb2cc05 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
propagatedBuildInputs = [ tnt ];
unpackPhase = ''
diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix
index 4d9902cbbe9a..0e5b1084b49c 100644
--- a/pkgs/development/libraries/java/geoipjava/default.nix
+++ b/pkgs/development/libraries/java/geoipjava/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip";
sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd";
};
- buildInputs = [ jdk unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ jdk ];
buildPhase =
''
cd source
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index d34787d8b1f0..bc50f0206598 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation {
ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip"
'';
- buildInputs = [ unzip ant javac jvm ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ ant javac jvm ];
buildPhase = "ant jar";
doCheck = false;
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix
index 78cc48d82097..b2cc4ab08b45 100644
--- a/pkgs/development/libraries/jxrlib/default.nix
+++ b/pkgs/development/libraries/jxrlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python }:
+{ lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
pname = "jxrlib";
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
--replace '.so' '.dylib'
'';
- nativeBuildInputs = [ python ];
+ nativeBuildInputs = [ python3 ];
+
+ strictDeps = true;
makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ];
diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index 0766a589a2e0..4cb2e8e958aa 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "attica";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 01d6a7ba2b1e..3ce0ca063ca1 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.78/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.79/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index 8c55f8da6a0c..a5f499e67444 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "karchive";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ bzip2 lzma zlib ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index 978db644a56f..357c0e1d11cb 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kcodecs";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools gperf ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index 26e5a83dc21b..fdfe28db6c04 100644
--- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, fetchpatch,
+ mkDerivation, lib,
extra-cmake-modules,
kconfig, kwidgetsaddons, qtbase, qttools
}:
@@ -7,13 +7,6 @@
mkDerivation {
name = "kcompletion";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
- patches = [
- # https://mail.kde.org/pipermail/distributions/2021-January/000928.html
- (fetchpatch {
- url = "https://invent.kde.org/frameworks/kcompletion/commit/7acda936f06193e9fc85ae5cf9ccc8d65971f657.patch";
- sha256 = "150ff506rhr5pin5363ks222vhv8qd77y5s5nyylcbdjry3ljd3n";
- })
- ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfig kwidgetsaddons qttools ];
propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index 2650843aa55d..94f4cb04807b 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kconfig";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index d5a407ee16f2..6f2e3f923871 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kcoreaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools shared-mime-info ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index c94167d5d76d..b497ebe1c80e 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kdbusaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools qtx11extras ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
index f82bf828e8e9..07da70092dc6 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
+++ b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
@@ -17,14 +17,14 @@ index 44fbacd..6b5abf5 100644
static QString findDaemon()
{
-- QString daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
+- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
- if (daemon.isEmpty()) {
- qCWarning(KSU_LOG) << "kdesud daemon not found.";
+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud");
+ if (!QFile::exists(daemon)) { // if not in wrappers
-+ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
++ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
+ if (daemon.isEmpty()) {
diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 9e2f827eff59..b4dabba624a0 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kdnssd";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ avahi qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
index 732f7b69c828..daeaf222b630 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
@@ -6,7 +6,7 @@ Index: kfilemetadata-5.18.0/src/CMakeLists.txt
install(EXPORT KF5FileMetaDataTargets
NAMESPACE KF5::
-- DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData
+- DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF5FileMetaData
+ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData
FILE KF5FileMetaDataTargets.cmake)
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 69ad2fbc737e..0733abc86920 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "ki18n";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedNativeBuildInputs = [ gettext python3 ];
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index a1e53bb408bd..883ef2862e49 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kidletime";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtx11extras ];
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
index 21477394c915..a3e4014df509 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
@@ -20,7 +20,7 @@ index 8fff17a..0801b75 100644
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
- // - so we try hacking it in ourselves
- QString install_lib_dir = QFile::decodeName(
-- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
+- CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/");
- QString orig_libpath = libpath;
- libpath = install_lib_dir + libpath;
- l.setFileName(libpath);
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
index bf25b98d6c56..3728c3c58b83 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
@@ -15,7 +15,7 @@ index 891f50c..ef664ad 100644
#include
#include
--#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
+-#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
+#define EXECUTE "/run/wrappers/bin/start_kdeinit"
#if KDEINIT_OOM_PROTECT
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
index 9df8505b2929..499c975a9e2d 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
@@ -33,7 +33,7 @@ index 0801b75..622dd5f 100644
-// Completely unrelated to plugins.
-static QString findSharedLib(const QString &lib)
-{
-- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib;
+- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib;
- if (QFile::exists(path)) {
- return path;
- }
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 642151913db3..f4d771ab75f8 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -24,10 +24,5 @@ mkDerivation {
patches = [
./samba-search-path.patch
./kio-debug-module-loader.patch
- # https://mail.kde.org/pipermail/distributions/2021-February/000938.html
- (fetchpatch {
- url = "https://invent.kde.org/frameworks/kio/commit/a183dd0d1ee0659e5341c7cb4117df27edd6f125.patch";
- sha256 = "1msnzi93zggxgarx962gnlz1slx13nc3l54wib3rdlj0xnnlfdnd";
- })
- ];
+ ];
}
diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix
index 751e3d7b73f1..60cef704865c 100644
--- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix
+++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix
@@ -3,7 +3,7 @@
mkDerivation {
name = "kirigami2";
meta = {
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ];
diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index 91bc3e2b98d4..c3266a21c064 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kitemmodels";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index 004d1ac77a6d..eeed5c703a29 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kitemviews";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index 1774b044b165..f1c99e0c93bb 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -6,7 +6,7 @@ mkDerivation {
name = "kplotting";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index 36e0ddc3f94c..5b73cc7fceab 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kwayland";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index 63a95bc217c8..821c703a5899 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kwidgetsaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index ab93966c0ac9..c418ca39433e 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -9,7 +9,7 @@ mkDerivation {
name = "kwindowsystem";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = lib.versionOlder qtbase.version "5.7.0";
+ broken = lib.versionOlder qtbase.version "5.14.0";
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index d1beb03fa620..f769f76854af 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "solid";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ];
buildInputs = [ qtdeclarative qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 5659aaf69607..431e4b810580 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -7,7 +7,7 @@ mkDerivation {
name = "sonnet";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ aspell qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 8701a43b4d77..871c15d6c1a3 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,667 +4,667 @@
{
attica = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/attica-5.78.0.tar.xz";
- sha256 = "0xlnsh9py1v7di305qic0kzpwbq0yw41rilkq1f8p9zsixl99w8m";
- name = "attica-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/attica-5.79.0.tar.xz";
+ sha256 = "1p6rcpfq3ifz8c8ws5k085mzg7fya2dpv7ryd6iqwi083ys49wla";
+ name = "attica-5.79.0.tar.xz";
};
};
baloo = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/baloo-5.78.0.tar.xz";
- sha256 = "1p8s0lgbqajpzbrc2pb1vzga0bsfwqjb4pzvvgqdlb419ijcjlpi";
- name = "baloo-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/baloo-5.79.0.tar.xz";
+ sha256 = "0l7z7260pjw6gmcnzp0v57dsypl2yxnm8dxfcdiln8gw2fisryc0";
+ name = "baloo-5.79.0.tar.xz";
};
};
bluez-qt = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/bluez-qt-5.78.0.tar.xz";
- sha256 = "1g83sfvl8zmyc9l5kr2bb9pdfis01m1ib9pz6qq1k5zv5aq3cyz9";
- name = "bluez-qt-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/bluez-qt-5.79.0.tar.xz";
+ sha256 = "0snips4ak77zpz6x9bzr5lmal712lz64xns1bwlz80svzcikznpj";
+ name = "bluez-qt-5.79.0.tar.xz";
};
};
breeze-icons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/breeze-icons-5.78.0.tar.xz";
- sha256 = "1fa9lirik0ic03nb56xmiirpbcg57l1b3q7dkn9r5h6scc0nsps2";
- name = "breeze-icons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/breeze-icons-5.79.0.tar.xz";
+ sha256 = "06sd7grh7r6wnx8p8mhp7vfhsg3bnyafy94fj6jz6gg9m0308cn6";
+ name = "breeze-icons-5.79.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/extra-cmake-modules-5.78.0.tar.xz";
- sha256 = "1y8js21adfzl6g5q46gj7dl8q2jhfvx0ba3ipmbclkpj4461zppf";
- name = "extra-cmake-modules-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/extra-cmake-modules-5.79.0.tar.xz";
+ sha256 = "1n5yd3ggz5pq4qs7f86aqvzvfmxx2khsn1i1m67xhrn5k7dh55mj";
+ name = "extra-cmake-modules-5.79.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/frameworkintegration-5.78.0.tar.xz";
- sha256 = "0rvi82fqck8jaxnrh5fd8m581civ174hpczanmw6n7birxvmk2wh";
- name = "frameworkintegration-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/frameworkintegration-5.79.0.tar.xz";
+ sha256 = "0c0i8hqqvi65bh1ghb6ql1a8vqihxck6xhpki4g0ryipilvqmj21";
+ name = "frameworkintegration-5.79.0.tar.xz";
};
};
kactivities = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kactivities-5.78.0.tar.xz";
- sha256 = "11v7rcw6lk4xd28i9al5p7bxklw5hdm97hvszhh1qd7kfrzblkhi";
- name = "kactivities-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kactivities-5.79.0.tar.xz";
+ sha256 = "0d3ds43iqqlbii9xwp7f20nz338xqmq70a4v84zb5ks1mnhkz47l";
+ name = "kactivities-5.79.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kactivities-stats-5.78.0.tar.xz";
- sha256 = "0afnwswng85jfkpbmbmprkqfngjxv2qpds3s2xlb5nzrpl43hc7s";
- name = "kactivities-stats-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kactivities-stats-5.79.0.tar.xz";
+ sha256 = "0s5r8891flkmrwga15ihqrmj4i12khxwp97kaa84j4mqva6zdx93";
+ name = "kactivities-stats-5.79.0.tar.xz";
};
};
kapidox = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kapidox-5.78.0.tar.xz";
- sha256 = "1d8ia33nrsvg8gf9mna0r2f0sdi4c37p8mxl59hcfqdimy7inkvp";
- name = "kapidox-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kapidox-5.79.0.tar.xz";
+ sha256 = "0qk4ksxdaiphlpd51mgwdddxq5vq8n55dd80s2a5q93jkcywhli7";
+ name = "kapidox-5.79.0.tar.xz";
};
};
karchive = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/karchive-5.78.0.tar.xz";
- sha256 = "1lqjy040c5wb76fvnvdaxsgqm63bcx9bmjinvia1caqkh11a5rw2";
- name = "karchive-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/karchive-5.79.0.tar.xz";
+ sha256 = "01qf46k7gp11fh53afcpmbfx0w5bi0k8jflb2db8nss7ri3bzlhc";
+ name = "karchive-5.79.0.tar.xz";
};
};
kauth = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kauth-5.78.0.tar.xz";
- sha256 = "1c0xyv54g8gcxaaz602ai1v4jlk7xndc65qjad66qiig958b1czg";
- name = "kauth-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kauth-5.79.0.tar.xz";
+ sha256 = "18bqfn47iyhf1zfkw3mgdxz154f9gqbkn41c3ca94qjm91mb40da";
+ name = "kauth-5.79.0.tar.xz";
};
};
kbookmarks = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kbookmarks-5.78.0.tar.xz";
- sha256 = "0b7g0fkyyqdwpfw53kdw73jcyk8wz5k2ipmwzlpx2fr5gs2v00c3";
- name = "kbookmarks-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kbookmarks-5.79.0.tar.xz";
+ sha256 = "109rjikqxv7mbhv22p41rbfz43510y6k7p0ahggynv0x5y5xzkqd";
+ name = "kbookmarks-5.79.0.tar.xz";
};
};
kcalendarcore = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcalendarcore-5.78.0.tar.xz";
- sha256 = "1v97swaqf9bmdvfagzif1ihsnd5d900nzv8aadic0a7ax5zqi41h";
- name = "kcalendarcore-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcalendarcore-5.79.0.tar.xz";
+ sha256 = "19vc1ji0jlk899rmr6i53l51diadn67mh6z6j787bp29jlcmnciv";
+ name = "kcalendarcore-5.79.0.tar.xz";
};
};
kcmutils = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcmutils-5.78.0.tar.xz";
- sha256 = "1ly21k3lrn6fx1j4vp0km8z9sb2l0adx0rhp9c1sasr8aflmy5k8";
- name = "kcmutils-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcmutils-5.79.0.tar.xz";
+ sha256 = "1wry88rikj7mz460m3c7gr6fwcdpdlx9jrxna2ikybnk9aw8dlkk";
+ name = "kcmutils-5.79.0.tar.xz";
};
};
kcodecs = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcodecs-5.78.0.tar.xz";
- sha256 = "0ypwx29v7gbcdpkvlpk0r5v7d8rd3xnqlnk1k11c75dvy3763d1n";
- name = "kcodecs-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcodecs-5.79.0.tar.xz";
+ sha256 = "1ab4dz6nvmd6fzsl7wbrvjlz0c0fk0bjb0jcklrj205pkhiaf7y8";
+ name = "kcodecs-5.79.0.tar.xz";
};
};
kcompletion = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcompletion-5.78.0.tar.xz";
- sha256 = "1a9z252m7v2fhd71dnibczb8yjq090ylcysx5pgwhc2j3djp4fd7";
- name = "kcompletion-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcompletion-5.79.0.tar.xz";
+ sha256 = "1znp6h4pggkl1hcbbw47vjkgmpc1rj6mx01p05x0ad143mwqpzwv";
+ name = "kcompletion-5.79.0.tar.xz";
};
};
kconfig = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kconfig-5.78.0.tar.xz";
- sha256 = "1fzzrypi8pxb0vprh65bpqrpgpwlwwlspf2mz5w83s90snbiwymj";
- name = "kconfig-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kconfig-5.79.0.tar.xz";
+ sha256 = "02jirbphrg6dyxd444ghzhy053s85pq4lgpppca3nmvzr2572j7r";
+ name = "kconfig-5.79.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kconfigwidgets-5.78.0.tar.xz";
- sha256 = "0fgclbyxjyjid21x2059wh7dns73acjnh4qrgzhg0nsx2h8cvm47";
- name = "kconfigwidgets-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kconfigwidgets-5.79.0.tar.xz";
+ sha256 = "1lrh2dis3invj9vclpa1mca8hrks1b82c5hkf0g0lilg69lir83y";
+ name = "kconfigwidgets-5.79.0.tar.xz";
};
};
kcontacts = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcontacts-5.78.0.tar.xz";
- sha256 = "1xjm0l8did9qmjgfvy9hsa7jbfv5mqimnwl7iiz6gxvm8sm14gcw";
- name = "kcontacts-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcontacts-5.79.0.tar.xz";
+ sha256 = "0jflvfkyd7llv54dxyd1a4h1l4xgrqggxadiqv0c6ijn4dvlsmy9";
+ name = "kcontacts-5.79.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcoreaddons-5.78.0.tar.xz";
- sha256 = "01rvijlb3b3s5r3213am9zyk7xhfqbnfxnq175hggq0mbm6zjpv3";
- name = "kcoreaddons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcoreaddons-5.79.0.tar.xz";
+ sha256 = "0n9nh4vkk19crp30dac3x9mzgzl4kv38jw6dcg4fwfp77gcin8kg";
+ name = "kcoreaddons-5.79.0.tar.xz";
};
};
kcrash = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcrash-5.78.0.tar.xz";
- sha256 = "0rrxzjxwi3kib0w86gc4gkkyzvnkg6l1x81ybclvk275zi724jkj";
- name = "kcrash-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcrash-5.79.0.tar.xz";
+ sha256 = "0w74d0j1ckbcd8q8lc57g3y7g50v222mgsvli77ql29imzx79apc";
+ name = "kcrash-5.79.0.tar.xz";
};
};
kdav = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdav-5.78.0.tar.xz";
- sha256 = "1iqh5z5rry644mcrlppbbf72nxli607varki61m1zgvcvwvaq00j";
- name = "kdav-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdav-5.79.0.tar.xz";
+ sha256 = "1573qan4xz8k33zfghwdmlr7pgbd4sfj0pshwv6bkx78kprd3xfl";
+ name = "kdav-5.79.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdbusaddons-5.78.0.tar.xz";
- sha256 = "16fk4jpx93q4l0wf3vgxg7vxajjqmbxd91y08khfahr2fssx14ag";
- name = "kdbusaddons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdbusaddons-5.79.0.tar.xz";
+ sha256 = "17sklakn9nsrjajb3nwg8ibhx64c4m86pr6ln567rdr6cahcaw90";
+ name = "kdbusaddons-5.79.0.tar.xz";
};
};
kdeclarative = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdeclarative-5.78.0.tar.xz";
- sha256 = "15s75xfy8lvwvkd789vg6y3zcxafav46g7r97psn97ans6gk2na7";
- name = "kdeclarative-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdeclarative-5.79.0.tar.xz";
+ sha256 = "05b1apviqy3dn2isqxf0bxj86r9q40pjlcqq8y15s36d6ykijyzh";
+ name = "kdeclarative-5.79.0.tar.xz";
};
};
kded = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kded-5.78.0.tar.xz";
- sha256 = "0lmxqax0x2hxllzhbvwgywdg483zarhs7f2i0d1ffigr3nn6q59m";
- name = "kded-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kded-5.79.0.tar.xz";
+ sha256 = "1gyb864rqbdi64mjc165fhcvnsw06z2zi8dg728428nzmw0dysbm";
+ name = "kded-5.79.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kdelibs4support-5.78.0.tar.xz";
- sha256 = "1iclzch3sh0j73prm2ccjvd3z89hp4638kxdblzqqxxdyali9ycq";
- name = "kdelibs4support-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz";
+ sha256 = "049l0mlf71xan8ls4hkp8s6lrnhn2i22jcnki1d5wci01dgffhm5";
+ name = "kdelibs4support-5.79.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kdesignerplugin-5.78.0.tar.xz";
- sha256 = "1chg3g8xc8nmlzg4niciphfrclmiqcfb6jxwajv1j8j3s3vk7wwz";
- name = "kdesignerplugin-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kdesignerplugin-5.79.0.tar.xz";
+ sha256 = "1jgqr76sx6d3jmqc350k49lqym5jkixnl3dq66430pvlrfv47w2n";
+ name = "kdesignerplugin-5.79.0.tar.xz";
};
};
kdesu = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdesu-5.78.0.tar.xz";
- sha256 = "072bnj6hxph864gn81hr24aklh7mq974fibglihwyak0zbml5yfm";
- name = "kdesu-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdesu-5.79.0.tar.xz";
+ sha256 = "1hlz5pr72qk64gwp30qx92jhlszri5qjsisvl4cxs01ylnrqy0c1";
+ name = "kdesu-5.79.0.tar.xz";
};
};
kdewebkit = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kdewebkit-5.78.0.tar.xz";
- sha256 = "0mcnlc4s372ghdjypksdjh6casradsxwa47aaac4d4yg2qk7mqb1";
- name = "kdewebkit-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kdewebkit-5.79.0.tar.xz";
+ sha256 = "0d81p49n2ryig9xp5id1dx4rpjjd2spl78m0xlq6rczyk7yf73pz";
+ name = "kdewebkit-5.79.0.tar.xz";
};
};
kdnssd = {
- version = "5.78.0";
+ version = "5.79.1";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdnssd-5.78.0.tar.xz";
- sha256 = "1rsjbi5x05ii17xl8zvcrfjmjsq0g6vqh90qflnyys6lzhyvs0sf";
- name = "kdnssd-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdnssd-5.79.1.tar.xz";
+ sha256 = "160qyll887wblrw0lhax749lzwhlp92sckj4g259955p8gnsw5lp";
+ name = "kdnssd-5.79.1.tar.xz";
};
};
kdoctools = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdoctools-5.78.0.tar.xz";
- sha256 = "0qngw9li2am0phkys45cph3qj01fjhjhvp3dsk3ymr60szryw23s";
- name = "kdoctools-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdoctools-5.79.0.tar.xz";
+ sha256 = "03bvj3grjw6a56shdy8c3mdp11pwmc72ccp3ia00bz310ahpphzb";
+ name = "kdoctools-5.79.0.tar.xz";
};
};
kemoticons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kemoticons-5.78.0.tar.xz";
- sha256 = "14alh2n5igk3cpm1j7ms7y0xph61qy5k3n2bw8y4y5wkb8qmqg3m";
- name = "kemoticons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kemoticons-5.79.0.tar.xz";
+ sha256 = "04x1yfdcyvx3x4aqha69rsaa78j4iw6qam3hp5a4di0yf653mphp";
+ name = "kemoticons-5.79.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kfilemetadata-5.78.0.tar.xz";
- sha256 = "111w47f74kmn81hvjxjhp6n6kc4533a76fzvrv6wbprqiwc6bncx";
- name = "kfilemetadata-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kfilemetadata-5.79.0.tar.xz";
+ sha256 = "0yxjapq88pfcma82mc9gz03x1bb81xl6xzrinr6jgz09206ra395";
+ name = "kfilemetadata-5.79.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kglobalaccel-5.78.0.tar.xz";
- sha256 = "08mqjdigb5lzx0kqhmw5m8gnvs01fzg3j0dan70v5203wbfnw69z";
- name = "kglobalaccel-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kglobalaccel-5.79.0.tar.xz";
+ sha256 = "0qqxvv3m7b44makgdcsxdhzamm4ahm1pn94rn6cpsrqsyci8axy8";
+ name = "kglobalaccel-5.79.0.tar.xz";
};
};
kguiaddons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kguiaddons-5.78.0.tar.xz";
- sha256 = "1l3ppihibhcjajmd55dr6mcc1xd4ni2iw2rdpk2l11ran4nys2dd";
- name = "kguiaddons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kguiaddons-5.79.0.tar.xz";
+ sha256 = "118wiy3pbmbazfivmh0w2g5l10qcp10b34r3d02pj7rs2a74h05w";
+ name = "kguiaddons-5.79.0.tar.xz";
};
};
kholidays = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kholidays-5.78.0.tar.xz";
- sha256 = "147ma06mrbydf2gyrh526bjh1f0xlnxiw89xp6n3wq0qmmdvhs17";
- name = "kholidays-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kholidays-5.79.0.tar.xz";
+ sha256 = "1lbbq6y1xkffh9qma7hr5hi712kl85kv51gij0mj69ssv1iq2a8n";
+ name = "kholidays-5.79.0.tar.xz";
};
};
khtml = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/khtml-5.78.0.tar.xz";
- sha256 = "0pai60cbl8p01xb97191nyzmsf7q00vcqvy8cdr8gfvrlx8k7dhn";
- name = "khtml-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/khtml-5.79.0.tar.xz";
+ sha256 = "1916kpb3kr0d7lbf0b65lrwkxnlgickm7vrmlc3qwlmf3fyqvkhy";
+ name = "khtml-5.79.0.tar.xz";
};
};
ki18n = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/ki18n-5.78.0.tar.xz";
- sha256 = "0mafvkrgmdcj869dzqmgphdwhl6a2bf2lw99w7frxh2qw4n2sd8k";
- name = "ki18n-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/ki18n-5.79.0.tar.xz";
+ sha256 = "12sa7ycxc7m7nrsm6x7f822c8p586hy0syny5ya8vpmhwk1j3gik";
+ name = "ki18n-5.79.0.tar.xz";
};
};
kiconthemes = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kiconthemes-5.78.0.tar.xz";
- sha256 = "0ssd1298pqm0g46m92b5d4yfrqxgmwf465lcbia41lndjd6px27v";
- name = "kiconthemes-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kiconthemes-5.79.0.tar.xz";
+ sha256 = "0bbs8q0dpz4qyxsd1qk5jxazn600m5j2axzccxyrr21r9plbs4nx";
+ name = "kiconthemes-5.79.0.tar.xz";
};
};
kidletime = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kidletime-5.78.0.tar.xz";
- sha256 = "0aw6g6p3bmp32zk22fwp2f1d20vbf7921ixnyf7a0w535r58d5ma";
- name = "kidletime-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kidletime-5.79.0.tar.xz";
+ sha256 = "0pp2ii4cvxygz40ai0b3rpqdjgpq4nya2hrms9c3yxb5hizrrrak";
+ name = "kidletime-5.79.0.tar.xz";
};
};
kimageformats = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kimageformats-5.78.0.tar.xz";
- sha256 = "0gv2w49cdzji8h9swaazpmbn0qqzn4ncnxj7f9rqp686q17czm7c";
- name = "kimageformats-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kimageformats-5.79.0.tar.xz";
+ sha256 = "09ffc44vzcin2ikyhm0awba7ag7pbnam4cilvfr3lwnj022y7j7c";
+ name = "kimageformats-5.79.0.tar.xz";
};
};
kinit = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kinit-5.78.0.tar.xz";
- sha256 = "16shlmm6q0vaf05gkrgqpmjrs5fgb8jrfgq331x7ic567hhzv4vv";
- name = "kinit-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kinit-5.79.0.tar.xz";
+ sha256 = "0ppri3gaiwawydjfw8ji6accrpwc8ms0sb1s5pn59wqiyv52f5rv";
+ name = "kinit-5.79.0.tar.xz";
};
};
kio = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kio-5.78.0.tar.xz";
- sha256 = "086nhyjk5sjvp97fs6kkmc99jh2303sbmpfki1qvcwzdq6idn4g2";
- name = "kio-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kio-5.79.0.tar.xz";
+ sha256 = "1ri5dv8lc4ywc7jknlszri812y91mgggjx5z5qfkv971njm6fz3n";
+ name = "kio-5.79.0.tar.xz";
};
};
kirigami2 = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kirigami2-5.78.0.tar.xz";
- sha256 = "0667wcxyhil332g6gk12bjg5y0c1zk15354wx6mg8krxl3i2nkjy";
- name = "kirigami2-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kirigami2-5.79.0.tar.xz";
+ sha256 = "01rb678qz1avzi7393wylwnc13ndzx2pgqnz3bd0zki0pjfrrlzp";
+ name = "kirigami2-5.79.0.tar.xz";
};
};
kitemmodels = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kitemmodels-5.78.0.tar.xz";
- sha256 = "1yn8gi7dml7mxyk93fzx5id2pckw6qbbkifwzmhq5i3vzpq1qdja";
- name = "kitemmodels-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kitemmodels-5.79.0.tar.xz";
+ sha256 = "1g9xa0h3kq0m5v1yvwgr8f6lrq8n2x1qzqqjbbbbyg8ayavv4abs";
+ name = "kitemmodels-5.79.0.tar.xz";
};
};
kitemviews = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kitemviews-5.78.0.tar.xz";
- sha256 = "10ysirhlgbzyiybb1ap111w89v3czing43ap10n5pldgh1c8ky05";
- name = "kitemviews-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kitemviews-5.79.0.tar.xz";
+ sha256 = "0p21hyxhain2mr19lzfml23ilpgqwr2i27p1qg39jnwyb74jw0nl";
+ name = "kitemviews-5.79.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kjobwidgets-5.78.0.tar.xz";
- sha256 = "0cdy7w14wr08xf9na1jzbrwjvmiw5q2ciniafzf9cn55yxrvmhwv";
- name = "kjobwidgets-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kjobwidgets-5.79.0.tar.xz";
+ sha256 = "059a58hp0npip07w7idjrl5sjjgl4i3bdqzv1k22hlvzdsyibggr";
+ name = "kjobwidgets-5.79.0.tar.xz";
};
};
kjs = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kjs-5.78.0.tar.xz";
- sha256 = "0sjnwj6x7dgvqh333yii5vlh7pbl1kc7zrbdjkqi38cfnbcf2w4h";
- name = "kjs-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kjs-5.79.0.tar.xz";
+ sha256 = "1v51xjmwxi1x85b4hlj8m12zxl5w0d160kjjbrrxqfn64i4302ga";
+ name = "kjs-5.79.0.tar.xz";
};
};
kjsembed = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kjsembed-5.78.0.tar.xz";
- sha256 = "0r8hxbqn5k0wsk4swym7hi15mnhd9dyvcgz8lycqnvlrz0walvr9";
- name = "kjsembed-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kjsembed-5.79.0.tar.xz";
+ sha256 = "18kjq5mim7b1a5mlhkwpwvnszjqxilhi4laqladh97wkmvsr85py";
+ name = "kjsembed-5.79.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kmediaplayer-5.78.0.tar.xz";
- sha256 = "0yy0k2cgchj1pnk2q7gq4iihscf6rgiwdpfn6i0i8zcczkm2gyls";
- name = "kmediaplayer-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kmediaplayer-5.79.0.tar.xz";
+ sha256 = "1lgrcib9acbzgs1kv44bqfisrayiir2r1iygrrncp117fj9cqx8b";
+ name = "kmediaplayer-5.79.0.tar.xz";
};
};
knewstuff = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/knewstuff-5.78.0.tar.xz";
- sha256 = "1fb1ka7ljfw4wyf8sy0r5vy9nmji286p26wjzgsf2rzzskaspc6m";
- name = "knewstuff-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/knewstuff-5.79.0.tar.xz";
+ sha256 = "0bsg0r0s12ck2cafkvnmjldr32ykivcpqjs1zfzqqbvy5w05a81y";
+ name = "knewstuff-5.79.0.tar.xz";
};
};
knotifications = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/knotifications-5.78.0.tar.xz";
- sha256 = "0f93xql467jbz964lpjrsip77wf0s8qygggkjb85y8xgpcdw4zrr";
- name = "knotifications-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/knotifications-5.79.0.tar.xz";
+ sha256 = "11g4xsa0z9680k4blxb1axn874p6s2vd5p9h376ln3blhjmy17hj";
+ name = "knotifications-5.79.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/knotifyconfig-5.78.0.tar.xz";
- sha256 = "0nzs76ii447xv3dqcg14a045xc74bnvwghfdmlb0vmh22p3a60fz";
- name = "knotifyconfig-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/knotifyconfig-5.79.0.tar.xz";
+ sha256 = "0c6d95bf8876czjd39cla7pd3li8sm684h04f77czf6sh1mil49d";
+ name = "knotifyconfig-5.79.0.tar.xz";
};
};
kpackage = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kpackage-5.78.0.tar.xz";
- sha256 = "0d0vfh3ifaj2xifw370rfapw2yf24h7f8xwbhmx787dr6w86m47c";
- name = "kpackage-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kpackage-5.79.0.tar.xz";
+ sha256 = "1xkkw4lk9hx2irni5d2k7873bffgd2w41qvvp25d786dz612fy27";
+ name = "kpackage-5.79.0.tar.xz";
};
};
kparts = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kparts-5.78.0.tar.xz";
- sha256 = "1np1vshzihh2r51gzy54yvm6h898ffw5b20c3r6jaa0837g3mlvp";
- name = "kparts-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kparts-5.79.0.tar.xz";
+ sha256 = "0d9dsgf6q44gqril6h9w5jfsavk0m5gclbmjdxjkcvrz3xfbjhd9";
+ name = "kparts-5.79.0.tar.xz";
};
};
kpeople = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kpeople-5.78.0.tar.xz";
- sha256 = "0ccc10qfhw69s12sfgpql988pf7pssx9k8j9xcywil4y7xidk05i";
- name = "kpeople-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kpeople-5.79.0.tar.xz";
+ sha256 = "0dj8hcjl0r673j7m2k83mxy2787jfi9pz6cvmfqfczbzpw20ycf4";
+ name = "kpeople-5.79.0.tar.xz";
};
};
kplotting = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kplotting-5.78.0.tar.xz";
- sha256 = "00wd3rgp4c0sngfbdz613792sidsykbnazsq05lf4pk46py4xcvc";
- name = "kplotting-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kplotting-5.79.0.tar.xz";
+ sha256 = "0lawpg7i36wppm95jxhhc7ghc88kb1s34px6w8p7n6cm2gxkhwn6";
+ name = "kplotting-5.79.0.tar.xz";
};
};
kpty = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kpty-5.78.0.tar.xz";
- sha256 = "1nhijlp98bnnqj9c0i3g1xfpdhghw7241av4wzwhhxny67addlf3";
- name = "kpty-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kpty-5.79.0.tar.xz";
+ sha256 = "1qd09r17nmsnqxggmsdw0j6l0620f11ya6mx7bc9zs2y08mgvjka";
+ name = "kpty-5.79.0.tar.xz";
};
};
kquickcharts = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kquickcharts-5.78.0.tar.xz";
- sha256 = "1zq5bp3w42sqvlvkc7vx6l7h142ihzgzqpa2435j9apvx0kvjqhp";
- name = "kquickcharts-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kquickcharts-5.79.0.tar.xz";
+ sha256 = "1p9a3mq7xxyavzmgjmz47vrv0hm1h9g8fsligi3r3n5az7klra6f";
+ name = "kquickcharts-5.79.0.tar.xz";
};
};
kross = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kross-5.78.0.tar.xz";
- sha256 = "07ylcvkz5xf6b9n65373a8zpp5nsby5c99l912bdxf05hrjcw8b1";
- name = "kross-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kross-5.79.0.tar.xz";
+ sha256 = "00hpyxcn2fwaz32gggqjcmx4blbcdxj3yvhldnmmkmi3k0r68dfc";
+ name = "kross-5.79.0.tar.xz";
};
};
krunner = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/krunner-5.78.0.tar.xz";
- sha256 = "00hy62g9i9vdzgv9ljfqjv0m45lrsmxynmp3fyp5c3amj9r64pkm";
- name = "krunner-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/krunner-5.79.0.tar.xz";
+ sha256 = "0v7faai6ar06cw7gikhccsa92aii085dk81g4xpyskmxlpvrraci";
+ name = "krunner-5.79.0.tar.xz";
};
};
kservice = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kservice-5.78.0.tar.xz";
- sha256 = "181maly1xij1jp7f0x9ajbv5q6qszqd273sdz1snkg5j4398mric";
- name = "kservice-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kservice-5.79.0.tar.xz";
+ sha256 = "1drzj4s1zbh5pffnh3r1wjsk7g1vr0np2h28mlfm4hy3bywxzrnp";
+ name = "kservice-5.79.0.tar.xz";
};
};
ktexteditor = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/ktexteditor-5.78.0.tar.xz";
- sha256 = "1r148n3nx3jyw2vn4rfxdl2mkywr5fn78s5ya7vq44pw2bmwar2n";
- name = "ktexteditor-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/ktexteditor-5.79.0.tar.xz";
+ sha256 = "1csms6cl8pp9slzwzdgsxhah1b218maakkxmiqk0ngx2sf4lbfc3";
+ name = "ktexteditor-5.79.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/ktextwidgets-5.78.0.tar.xz";
- sha256 = "1gpqxvlmqm5nj5kgx2dmvl8ynjqw995wnpl9ja5c82d8bczkn4z8";
- name = "ktextwidgets-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/ktextwidgets-5.79.0.tar.xz";
+ sha256 = "1bnhq4jpybckdlw5518n2hbfilbpadafvchnxigg9p7671pkp85l";
+ name = "ktextwidgets-5.79.0.tar.xz";
};
};
kunitconversion = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kunitconversion-5.78.0.tar.xz";
- sha256 = "17a3lpc60qn9qd53mlrjxwg5gyqvq0vnnz9wdrak481nf2c0qycc";
- name = "kunitconversion-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kunitconversion-5.79.0.tar.xz";
+ sha256 = "19snm2mvvbs2aqpq7k9b3g1fbg40kpmbjmqn38g6m065mpw3372l";
+ name = "kunitconversion-5.79.0.tar.xz";
};
};
kwallet = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kwallet-5.78.0.tar.xz";
- sha256 = "1a8n5d9y9qwcb4d9zbr1xhk3w390n7f6mmx52nq5akna51zrjc4p";
- name = "kwallet-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kwallet-5.79.0.tar.xz";
+ sha256 = "1qickn20ry8qccirdc7rvdf40dxgb13y4n0wi80qz87xzmps3f3p";
+ name = "kwallet-5.79.0.tar.xz";
};
};
kwayland = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kwayland-5.78.0.tar.xz";
- sha256 = "052avcafjnib55s2lp1fzhx7dk9mlyg4v143gfp9j8wvlqaa8sxb";
- name = "kwayland-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kwayland-5.79.0.tar.xz";
+ sha256 = "14grhcav772zfdjmwnjms819by2djm8dnv71cj4ps45iq0gba6ck";
+ name = "kwayland-5.79.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kwidgetsaddons-5.78.0.tar.xz";
- sha256 = "0b2y9ilk2zz4zw2m1lcwrmn3hni5jh6kalclx5l9fi98686b1az4";
- name = "kwidgetsaddons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kwidgetsaddons-5.79.0.tar.xz";
+ sha256 = "0jpfwxa397cvqr1q92b2nva7wy2ngv08kz5l94xrz0wzkagxfixc";
+ name = "kwidgetsaddons-5.79.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kwindowsystem-5.78.0.tar.xz";
- sha256 = "003jypnib16qpm7l76zqbhhbqq2g23hm245l9dskbansxpncmfbc";
- name = "kwindowsystem-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kwindowsystem-5.79.0.tar.xz";
+ sha256 = "15pi2vnvdchj9f3yp1p7hqxmnwd606a6fwq4h7li4pvb4w3gibmq";
+ name = "kwindowsystem-5.79.0.tar.xz";
};
};
kxmlgui = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kxmlgui-5.78.0.tar.xz";
- sha256 = "05yxgxbvv8anl4m40jwwfx183y69fdljj4g7daip0nk7hs4vc37q";
- name = "kxmlgui-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kxmlgui-5.79.0.tar.xz";
+ sha256 = "1j8fb5i1v7pqs5as1h43nc0s2pm3i9cwks2h5388yld325ysx0v9";
+ name = "kxmlgui-5.79.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kxmlrpcclient-5.78.0.tar.xz";
- sha256 = "0591c23sjwfhrf7d7z6bgikjal1h70vpjx7xmr1ypwck6pxj8z2x";
- name = "kxmlrpcclient-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kxmlrpcclient-5.79.0.tar.xz";
+ sha256 = "1cwvglsfv5m3mb5bjl7rfas1samyw703qjfiz1pf6vxgmpxdcr4a";
+ name = "kxmlrpcclient-5.79.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/modemmanager-qt-5.78.0.tar.xz";
- sha256 = "09y3pjav7dzfmplacwn0j281d59rdhlad16myaxh6hbf9zdkmnyr";
- name = "modemmanager-qt-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/modemmanager-qt-5.79.0.tar.xz";
+ sha256 = "0xfbchyaaqxjj66zb19k4vxi9azijf0llbql6fzxln687s3z65wd";
+ name = "modemmanager-qt-5.79.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/networkmanager-qt-5.78.0.tar.xz";
- sha256 = "0wfyczlki8sb2wydyslpi111y4hfc6xvnar8cxj75bsn83pd9wya";
- name = "networkmanager-qt-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/networkmanager-qt-5.79.0.tar.xz";
+ sha256 = "04iaqa2q73zvscx300bah6mnl79dai9yrmq11d1vyil99af36m6s";
+ name = "networkmanager-qt-5.79.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/oxygen-icons5-5.78.0.tar.xz";
- sha256 = "1xp3zg59srxfc0z5cf45x7am98rsjq3p3ms2975il03389w55kr9";
- name = "oxygen-icons5-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/oxygen-icons5-5.79.0.tar.xz";
+ sha256 = "1j6l9r4l82gp5qcpn3xw4dzfbhsawbpk8mypnfckk73x1bjcaqss";
+ name = "oxygen-icons5-5.79.0.tar.xz";
};
};
plasma-framework = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/plasma-framework-5.78.0.tar.xz";
- sha256 = "10c4d7mvnjdpjcjzxy8r5k1h3pxw9d4h9ii8bkngb2kjfblf3bj6";
- name = "plasma-framework-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/plasma-framework-5.79.0.tar.xz";
+ sha256 = "15hbfqdyas27kj6rd24n6d80r1dcsiiv0zgjkp12x8dnjyd3vz4x";
+ name = "plasma-framework-5.79.0.tar.xz";
};
};
prison = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/prison-5.78.0.tar.xz";
- sha256 = "0ygsdjcxr7l7jgllf6c38rbpc4byikg7zx71dzmas7ikg4axylfk";
- name = "prison-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/prison-5.79.0.tar.xz";
+ sha256 = "1rn66n67g914w1klgsirqff62qv4p2l64ahzsxnbixfwy1dwlpa2";
+ name = "prison-5.79.0.tar.xz";
};
};
purpose = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/purpose-5.78.0.tar.xz";
- sha256 = "13v2w4kx7ir9wqyahn6rlq7li7kxigxppffjccwpfihzpnyig029";
- name = "purpose-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/purpose-5.79.0.tar.xz";
+ sha256 = "1mlph5mzwfqwlkvm3df3in3r3airnx4hxhy0p56ri3k3m9k2rqpz";
+ name = "purpose-5.79.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/qqc2-desktop-style-5.78.0.tar.xz";
- sha256 = "0a9kxfrvx0qv079vd9vx4924vs5g8qbicdp1wfv3c80ilbmn1sik";
- name = "qqc2-desktop-style-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/qqc2-desktop-style-5.79.0.tar.xz";
+ sha256 = "1cykbdbzxkblwp0dmgc4r3csml9l81zhfsqcjamfai6srl10vbij";
+ name = "qqc2-desktop-style-5.79.0.tar.xz";
};
};
solid = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/solid-5.78.0.tar.xz";
- sha256 = "1qgx9fsaxsypjfzyp3dq79skp7vhhv59ssqb1aq4168gdsai15qj";
- name = "solid-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/solid-5.79.0.tar.xz";
+ sha256 = "033ss326q450phf918a5py3z6ajnjj6f1nws8ngp05zi028nkhrl";
+ name = "solid-5.79.0.tar.xz";
};
};
sonnet = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/sonnet-5.78.0.tar.xz";
- sha256 = "1jw00bkhjf029yr6qh7mkdpizcc96103fsf68ydkbykfqsb0xry2";
- name = "sonnet-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/sonnet-5.79.0.tar.xz";
+ sha256 = "09b1rb88ck50g67nmki06ixxsfnz3x3jd0f334qaz147h2jklvyq";
+ name = "sonnet-5.79.0.tar.xz";
};
};
syndication = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/syndication-5.78.0.tar.xz";
- sha256 = "0sy2419xrkb5yqj70x2gakb53hqz7j5631pjkvai92gvk01bcbd1";
- name = "syndication-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/syndication-5.79.0.tar.xz";
+ sha256 = "1jyz0c67zscgspvisn43wrdgk4pxs4i3r9pyknm8nvxwiff2p1ji";
+ name = "syndication-5.79.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.78.0";
+ version = "5.79.1";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/syntax-highlighting-5.78.0.tar.xz";
- sha256 = "1m6ngf6nij3p09p7dhngjr9jhmc6dl12vd2x4dkj5fs8wlfbfplb";
- name = "syntax-highlighting-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/syntax-highlighting-5.79.1.tar.xz";
+ sha256 = "143ra8j0x1biijclnjhp6b69v04m65avp2nic9jzj9y5wjz5x0mj";
+ name = "syntax-highlighting-5.79.1.tar.xz";
};
};
threadweaver = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/threadweaver-5.78.0.tar.xz";
- sha256 = "1llqfmpbq0mysa1h7vx16v020zw776sqkrh85kah9478bj7ffwnr";
- name = "threadweaver-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/threadweaver-5.79.0.tar.xz";
+ sha256 = "062r9nhggw3dlvgpb2l6fqyyzqv35a9lgvikh2pjdicx9r2s8z19";
+ name = "threadweaver-5.79.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index ceb8200d4c63..4b3f8440c568 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -6,7 +6,7 @@ mkDerivation {
name = "syntax-highlighting";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules perl ];
buildInputs = [ qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index b95f70dd6743..70e948afda94 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "threadweaver";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix
index b9f16d3cfaef..3cebc05f3d8b 100644
--- a/pkgs/development/libraries/kdiagram/default.nix
+++ b/pkgs/development/libraries/kdiagram/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "kdiagram";
- version = "2.7.0";
+ version = "2.8.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = pname;
rev = "v${version}";
- sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc=";
+ sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8=";
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ qtbase qtsvg ];
diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix
index 50ba2c300b3f..93aa169737bb 100644
--- a/pkgs/development/libraries/kdsoap/default.nix
+++ b/pkgs/development/libraries/kdsoap/default.nix
@@ -4,7 +4,7 @@
}:
let
- version = "1.9.1";
+ version = "1.10.0";
in
mkDerivation {
@@ -24,7 +24,7 @@ mkDerivation {
};
src = fetchurl {
url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz";
- sha256 = "09rxx7h98niawz7i94g279c2rgh7xmq1hqxwlyzwsaqsx4kfl850";
+ sha256 = "sha256-DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 804749bbdb53..3e81b45362f0 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, yacc, flex
, texinfo, perlPackages
, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
, CoreFoundation, Security, SystemConfiguration
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
patches = [ ./heimdal-make-missing-headers.patch ];
- nativeBuildInputs = [ autoreconfHook pkg-config python2 perl yacc flex texinfo ]
+ nativeBuildInputs = [ autoreconfHook pkg-config python3 perl yacc flex texinfo ]
++ (with perlPackages; [ JSON ]);
buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
++ [ db sqlite openssl libedit openldap pam]
diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index 315a38197a1f..c3621d375870 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -1,25 +1,38 @@
-{ stdenv, lib, fetchurl, extra-cmake-modules
-, qtbase, kio
-, libatasmart, parted
-, util-linux }:
+{ stdenv, lib, fetchurl, fetchpatch, extra-cmake-modules
+, qca-qt5, kauth, kio, polkit-qt, qtbase
+, util-linux
+}:
stdenv.mkDerivation rec {
pname = "kpmcore";
- version = "3.3.0";
+ # NOTE: When changing this version, also change the version of `partition-manager`.
+ version = "4.2.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
- sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq";
+ hash = "sha256-MvW0CqvFZtzcJlya6DIpzorPbKJai6fxt7nKsKpJn54=";
};
+ patches = [
+ # Fix build with `kcoreaddons` >= 5.77.0
+ (fetchpatch {
+ url = "https://github.com/KDE/kpmcore/commit/07e5a3ac2858e6d38cc698e0f740e7a693e9f302.patch";
+ sha256 = "sha256-LYzea888euo2HXM+acWaylSw28iwzOdZBvPBt/gjP1s=";
+ })
+ # Fix crash when `fstab` omits mount options.
+ (fetchpatch {
+ url = "https://github.com/KDE/kpmcore/commit/eea84fb60525803a789e55bb168afb968464c130.patch";
+ sha256 = "sha256-NJ3PvyRC6SKNSOlhJPrDDjepuw7IlAoufPgvml3fap0=";
+ })
+ ];
+
buildInputs = [
- qtbase
- libatasmart
- parted # we only need the library
-
+ qca-qt5
+ kauth
kio
+ polkit-qt
- util-linux # needs blkid (note that this is not provided by util-linux-compat)
+ util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat)
];
nativeBuildInputs = [ extra-cmake-modules ];
@@ -27,8 +40,11 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
meta = with lib; {
- maintainers = with lib.maintainers; [ peterhoeg ];
+ description = "KDE Partition Manager core library";
+ homepage = "https://invent.kde.org/system/kpmcore";
+ license = with licenses; [ cc-by-40 cc0 gpl3Plus mit ];
+ maintainers = with maintainers; [ peterhoeg oxalica ];
# The build requires at least Qt 5.14:
- broken = lib.versionOlder qtbase.version "5.14";
+ broken = versionOlder qtbase.version "5.14";
};
}
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 0a1dabef328c..2a7fb196ea68 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -13,25 +13,28 @@ stdenv.mkDerivation rec {
buildInputs = [ snappy ];
- nativeBuildInputs = []
- ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
- buildPhase = ''
- make all
+ doCheck = true;
+
+ buildFlags = [ "all" ];
+
+ postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
+ # remove shared objects from "all" target
+ sed -i '/^all:/ s/$(SHARED_LIBS) $(SHARED_PROGRAMS)//' Makefile
'';
- installPhase = "
- mkdir -p $out/{bin,lib,include}
+ installPhase = ''
+ runHook preInstall
- cp -r include $out
- mkdir -p $out/include/leveldb/helpers
- cp helpers/memenv/memenv.h $out/include/leveldb/helpers
+ install -D -t $out/include/leveldb include/leveldb/*
+ install -D helpers/memenv/memenv.h $out/include/leveldb/helpers
- cp out-shared/lib* $out/lib
- cp out-static/lib* $out/lib
+ install -D -t $out/lib out-{static,shared}/lib*
+ install -D -t $out/bin out-static/{leveldbutil,db_bench}
- cp out-static/leveldbutil $out/bin
- ";
+ runHook postInstall
+ '';
meta = with lib; {
homepage = "https://github.com/google/leveldb";
diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix
index db0bd26f4d29..6e926dfb421c 100644
--- a/pkgs/development/libraries/lib3ds/default.nix
+++ b/pkgs/development/libraries/lib3ds/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
meta = {
description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix
index fec910bd5952..b75b1b833d73 100644
--- a/pkgs/development/libraries/lib3mf/default.nix
+++ b/pkgs/development/libraries/lib3mf/default.nix
@@ -1,26 +1,41 @@
-{ lib, stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, ninja, automaticcomponenttoolkit
+, pkg-config, libzip, gtest, openssl, libuuid, libossp_uuid }:
stdenv.mkDerivation rec {
pname = "lib3mf";
- version = "2.0.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "3MFConsortium";
repo = pname;
rev = "v${version}";
- sha256 = "0w4d9zvl95g1x3r5nyd6cr27g6fwhhwaivh8a5r1xs5l6if21x19";
+ sha256 = "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3";
};
- nativeBuildInputs = [ cmake ninja ];
+ nativeBuildInputs = [ cmake ninja pkg-config ];
- buildInputs = if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ];
+ outputs = [ "out" "dev" ];
+
+ cmakeFlags = [
+ "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "out"}/include/lib3mf"
+ "-DUSE_INCLUDED_ZLIB=OFF"
+ "-DUSE_INCLUDED_LIBZIP=OFF"
+ "-DUSE_INCLUDED_GTEST=OFF"
+ "-DUSE_INCLUDED_SSL=OFF"
+ ];
+
+ buildInputs = [
+ libzip gtest openssl
+ ] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]);
postPatch = ''
- rmdir Tests/googletest
- ln -s ${gtest.src} Tests/googletest
-
# fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
- sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in
+ sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3mf.pc.in
+
+ # replace bundled binaries
+ for i in AutomaticComponentToolkit/bin/act.*; do
+ ln -sf ${automaticcomponenttoolkit}/bin/act $i
+ done
'';
meta = with lib; {
diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix
index d51eac7bdb6e..6cbf1d204376 100644
--- a/pkgs/development/libraries/libantlr3c/default.nix
+++ b/pkgs/development/libraries/libantlr3c/default.nix
@@ -15,5 +15,12 @@ stdenv.mkDerivation {
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ vbgl ];
+ # The package failed to build with error:
+ # gcc: error: unrecognized command line option '-m64'
+ #
+ # See:
+ # https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d
+ # https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd
+ broken = stdenv.hostPlatform.isAarch64;
};
}
diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix
index c7d48468336c..53b0dca09127 100644
--- a/pkgs/development/libraries/libayatana-appindicator/default.nix
+++ b/pkgs/development/libraries/libayatana-appindicator/default.nix
@@ -4,7 +4,7 @@
, gtkVersion ? "3"
, gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2
, gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3
-, dbus-glib, python2, python2Packages
+, dbus-glib,
}:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk";
};
- nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ];
+ nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
buildInputs =
lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix
index f524e9321f9d..41d07d58cba2 100644
--- a/pkgs/development/libraries/libb64/default.nix
+++ b/pkgs/development/libraries/libb64/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1lxzi6v10qsl2r6633dx0zwqyvy0j19nmwclfd0d7qybqmhqsg9l";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out $out/lib $out/bin $out/include
diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix
index 81b84e0f181c..99692f63d458 100644
--- a/pkgs/development/libraries/libcint/default.nix
+++ b/pkgs/development/libraries/libcint/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "libcint";
- version = "4.1.0";
+ version = "4.1.1";
src = fetchFromGitHub {
owner = "sunqm";
repo = "libcint";
rev = "v${version}";
- sha256 = "sha256-ZDPDJXvSAqCkhxUSzlcWBAMrCI6mjA8rXxX65Cw5nYI=";
+ sha256 = "sha256-HBZ/VMuTLAYpqcIPzQ4JbsMSXsI/sKc14ZFpbVhQF/g=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/development/libraries/libck/default.nix
index accb6556011d..a46a7b33900a 100644
--- a/pkgs/development/libraries/libck/default.nix
+++ b/pkgs/development/libraries/libck/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ asl20 bsd2 ];
homepage = "http://concurrencykit.org/";
platforms = platforms.unix;
- maintainers = with maintainers; [ chessai ];
+ maintainers = with maintainers; [ chessai thoughtpolice ];
};
}
diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix
index f0bf60cdfb88..d7a4aa91fb54 100644
--- a/pkgs/development/libraries/libdeflate/default.nix
+++ b/pkgs/development/libraries/libdeflate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub }:
+{ stdenv, lib, fetchFromGitHub, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "libdeflate";
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace /usr/local $out
'';
+ nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+
configurePhase = ''
make programs/config.h
'';
diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index e7a877962ccd..6a042012132e 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -2,19 +2,20 @@
stdenv.mkDerivation rec {
pname = "libebml";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libebml";
rev = "release-${version}";
- sha256 = "04bn1i7g4vwmkv3hv26rmcb59zkl2rh37qnfjm52j560bjlyd7im";
+ sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25";
};
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES"
+ "-DCMAKE_INSTALL_PREFIX="
];
meta = with lib; {
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 92f3eeb79957..dc5a384569cb 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libedit";
- version = "20191231-3.1";
+ version = "20210216-3.1";
src = fetchurl {
url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz";
- sha256 = "0wch48nml28jj6ild889745dsg2agm7mpvrmbl1gi98nw6vjrf6v";
+ sha256 = "sha256-IoP3QdKquTXIxSwEtXv5UtAsLALmURcvisgR93sfx3o=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix
index 85ff493ca04e..ce1c35c7ec60 100644
--- a/pkgs/development/libraries/libf2c/default.nix
+++ b/pkgs/development/libraries/libf2c/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
cp f2c.h $out/include
'';
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index daacf325e973..c7d84d9d8af6 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "libfilezilla";
- version = "0.26.0";
+ version = "0.27.0";
src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "sha256-F+0iZZPo5GbOPD+M5YOzbHnxYxierVTWMWE8w9pcgL0=";
+ sha256 = "sha256-c3ClGHyrNgqhubLA2njRrebjupN1tIKniF3OBNZJqXs=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 80cd5bc13cc3..6b761d2170c3 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,27 +1,16 @@
-{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
-, buildPackages, fetchpatch
-}:
+{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap, buildPackages }:
assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
pname = "libgcrypt";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
- sha256 = "1nb50bgzp83q6r5cz4v40y1mcbhpqwqyxlay87xp1lrbkf5pm9n5";
+ sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo=";
};
- patches = [
- # fix build on 32bit musl
- (fetchpatch {
- name = "fix_building_with_disable-asm_on_x86.patch";
- url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=af23ab5c5482d625ff52e60606cf044e2b0106c8";
- sha256 = "1m8apm8wra6fk89ggha4d0bba5absihm38zvb2khklqh9q5hj9jw";
- })
- ];
-
outputs = [ "out" "dev" "info" ];
outputBin = "dev";
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 4dec3151a7cd..3e3fa1a725bf 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libgphoto2";
- version = "2.5.26";
+ version = "2.5.27";
src = fetchFromGitHub {
owner = "gphoto";
repo = "libgphoto2";
rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
- sha256 = "0lnlxflj04ng9a0hm2nb2067kqs4kp9kx1z4gg395cgbfd7lx6j6";
+ sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg=";
};
patches = [];
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index f54929c5378b..648eb89a514a 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch
-, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
+, gnome3, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }:
let
pname = "libhttpseverywhere";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ];
- buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
+ buildInputs = [ glib libgee json-glib libsoup libarchive ];
# Fixes build with vala >=0.42
patches = [
diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix
index c988c49a6ede..ad1df00c2509 100644
--- a/pkgs/development/libraries/libimagequant/default.nix
+++ b/pkgs/development/libraries/libimagequant/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libimagequant";
- version = "2.14.0";
+ version = "2.14.1";
src = fetchFromGitHub {
owner = "ImageOptim";
repo = pname;
rev = version;
- sha256 = "sha256-XP/GeZC8TCgBPqtScY9eneZHFter1kdWf/yko0p2VYQ=";
+ sha256 = "sha256-yWtwBTAs6dlrZz3Bd/4DUb488IJsahPKwjluukTlv/o=";
};
preConfigure = ''
diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix
index 489f526248aa..77df340a55f8 100644
--- a/pkgs/development/libraries/libixp-hg/default.nix
+++ b/pkgs/development/libraries/libixp-hg/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
'';
- buildInputs = [ unzip txt2tags ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ txt2tags ];
meta = {
homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index 42d723b3b1b4..16a69f6da653 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
};
patches = [ ./install-fix.patch ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
makeFlags = [ "prefix=$(out)" ];
preInstall = "mkdir -p $out/lib";
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 5a7f2fe4b36f..5c31197ebff2 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -35,9 +35,8 @@ stdenv.mkDerivation rec {
"--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"
];
- buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common
- unzip ];
- nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ];
+ buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ];
+ nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ];
meta = {
inherit version;
diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix
index 647fb6825afb..2822b45f8719 100644
--- a/pkgs/development/libraries/liblinphone/default.nix
+++ b/pkgs/development/libraries/liblinphone/default.nix
@@ -49,7 +49,7 @@
stdenv.mkDerivation rec {
pname = "liblinphone";
- version = "4.4.21";
+ version = "4.4.35";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI=";
+ sha256 = "1sysr8wnf1kvq87h2ymr5qk9qcjapayvlmcmzcx3zxk8vhqp83d8";
};
# Do not build static libraries
diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index 1d3cf4032dda..a89bf9fc4ab9 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libmatroska";
- version = "1.6.2";
+ version = "1.6.3";
src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libmatroska";
rev = "release-${version}";
- sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd";
+ sha256 = "01dg12ndxfdqgjx5v2qy4mff6xjdxglywyg82sr3if5aw6rp3dji";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES"
+ "-DCMAKE_INSTALL_PREFIX="
];
meta = with lib; {
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index b7e082f2b9ba..91a2c378c03c 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "libndctl";
- version = "70.1";
+ version = "71.1";
src = fetchFromGitHub {
owner = "pmem";
repo = "ndctl";
rev = "v${version}";
- sha256 = "09ymdibcr18vpmyf2n0xrnzgccfvr7iy3p2l5lbh7cgz7djyl5wq";
+ sha256 = "sha256-osux3DiKRh8ftHwyfFI+WSFx20+yJsg1nVx5nuoKJu4=";
};
outputs = [ "out" "lib" "man" "dev" ];
diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix
new file mode 100644
index 000000000000..41283ed7ccd0
--- /dev/null
+++ b/pkgs/development/libraries/libplctag/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, stdenv
+, cmake
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libplctag";
+ version = "2.3.6";
+
+ src = fetchFromGitHub {
+ owner = "libplctag";
+ repo = "libplctag";
+ rev = "v${version}";
+ sha256 = "sha256-mrNEUNYxnRyKhUCz+exp6Upf2g/L6WnYJ8alcIx5wMc=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with lib; {
+ homepage = "https://github.com/libplctag/libplctag";
+ description = "Library that uses EtherNet/IP or Modbus TCP to read and write tags in PLCs";
+ license = with licenses; [ lgpl2Plus mpl20 ];
+ maintainers = with maintainers; [ petterstorvik ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/development/libraries/libpostal/default.nix
index e6c507ad2bff..d32cb2731a11 100644
--- a/pkgs/development/libraries/libpostal/default.nix
+++ b/pkgs/development/libraries/libpostal/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libpostal";
- version = "1.0.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "openvenues";
repo = "libpostal";
rev = "v${version}";
- sha256 = "0qf5nkfkfjl2ylkrnw7kzax71y85gkr8i24glyp9rflyzmpj6giy";
+ sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk=";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index afd1a6365b45..afe5b8dde132 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -3,10 +3,9 @@
, pkg-config
, cmake
, zlib
-, fetchpatch
, dbus
, networkmanager
-, spidermonkey_60
+, spidermonkey_68
, pcre
, gsettings-desktop-schemas
, glib
@@ -19,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "libproxy";
- version = "0.4.15";
+ version = "0.4.17";
src = fetchFromGitHub {
owner = "libproxy";
repo = "libproxy";
rev = version;
- sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs";
+ sha256 = "0v8q4ln0pd5231kidpi8wpwh0chcjwcmawcki53czlpdrc09z96r";
};
outputs = [ "out" "dev" "py3" ];
@@ -46,7 +45,7 @@ stdenv.mkDerivation rec {
JavaScriptCore
] else [
glib
- spidermonkey_60
+ spidermonkey_68
dbus
networkmanager
]);
@@ -57,38 +56,6 @@ stdenv.mkDerivation rec {
"-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"
];
- patches = [
- # Make build with spidermonkey_60
- (fetchpatch {
- url = "https://github.com/libproxy/libproxy/pull/86.patch";
- sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs";
- })
- (fetchpatch {
- url = "https://github.com/libproxy/libproxy/pull/87.patch";
- sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc";
- })
- (fetchpatch {
- url = "https://github.com/libproxy/libproxy/pull/95.patch";
- sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi";
- })
- (fetchpatch {
- name = "CVE-2020-25219.patch";
- url = "https://github.com/libproxy/libproxy/commit/a83dae404feac517695c23ff43ce1e116e2bfbe0.patch";
- sha256 = "0wdh9qjq99aw0jnf2840237i3hagqzy42s09hz9chfgrw8pyr72k";
- })
- (fetchpatch {
- name = "CVE-2020-26154.patch";
- url = "https://github.com/libproxy/libproxy/commit/4411b523545b22022b4be7d0cac25aa170ae1d3e.patch";
- sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8";
- })
-
- ] ++ lib.optionals stdenv.isDarwin [
- (fetchpatch {
- url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
- sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
- })
- ];
-
postFixup = lib.optionalString stdenv.isLinux ''
# config_gnome3 uses the helper to find GNOME proxy settings
wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix
index 40f6b3b1aee1..f27b58a02bb6 100644
--- a/pkgs/development/libraries/libpst/default.nix
+++ b/pkgs/development/libraries/libpst/default.nix
@@ -1,5 +1,15 @@
-{ lib, stdenv, fetchurl, autoreconfHook, boost, libgsf,
- pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }:
+{ lib
+, stdenv
+, fetchurl
+, autoreconfHook
+, pkg-config
+, bzip2
+, doxygen
+, gettext
+, imagemagick
+, libgsf
+, xmlto
+}:
stdenv.mkDerivation rec {
name = "libpst-0.6.75";
@@ -9,14 +19,24 @@ stdenv.mkDerivation rec {
sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ doxygen
+ gettext
+ xmlto
+ ];
+
buildInputs = [
- boost libgsf bzip2
- xmlto gettext imagemagick doxygen
+ bzip2
+ imagemagick
+ libgsf
];
configureFlags = [
"--enable-python=no"
+ "--disable-static"
+ "--enable-libpst-shared"
];
doCheck = true;
@@ -24,8 +44,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.five-ten-sg.com/libpst/";
description = "A library to read PST (MS Outlook Personal Folders) files";
- license = licenses.gpl2;
- maintainers = [maintainers.tohl];
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.tohl ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 42d8cbf28596..8a3179b03427 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -1,33 +1,54 @@
-{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, gobject-introspection
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
+, glib
+, python3
+, libgudev
+, libmbim
+, libqrtr-glib
+}:
stdenv.mkDerivation rec {
pname = "libqmi";
- version = "1.26.10";
-
- src = fetchurl {
- url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
- sha256 = "sha256-fABD8GyHXlzx3jwMlMzH9bBYYry82eT7DV0UJ30dq1k=";
- };
+ version = "1.28.2";
outputs = [ "out" "dev" "devdoc" ];
- configureFlags = [
- "--with-udev-base-dir=${placeholder "out"}/lib/udev"
- "--enable-introspection"
- ];
+ src = fetchurl {
+ url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
+ sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M=";
+ };
nativeBuildInputs = [
pkg-config
gobject-introspection
python3
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_43
];
buildInputs = [
- glib
libgudev
libmbim
];
+ propagatedBuildInputs = [
+ glib
+ libqrtr-glib
+ ];
+
+ configureFlags = [
+ "--with-udev-base-dir=${placeholder "out"}/lib/udev"
+ "--enable-gtk-doc"
+ "--enable-introspection"
+ ];
+
enableParallelBuilding = true;
doCheck = true;
@@ -35,7 +56,13 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.freedesktop.org/wiki/Software/libqmi/";
description = "Modem protocol helper library";
+ maintainers = teams.freedesktop.members;
platforms = platforms.linux;
- license = licenses.gpl2;
+ license = with licenses; [
+ # Library
+ lgpl2Plus
+ # Tools
+ gpl2Plus
+ ];
};
}
diff --git a/pkgs/development/libraries/libqrtr-glib/default.nix b/pkgs/development/libraries/libqrtr-glib/default.nix
new file mode 100644
index 000000000000..29097710a697
--- /dev/null
+++ b/pkgs/development/libraries/libqrtr-glib/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, gobject-introspection
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
+, glib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libqrtr-glib";
+ version = "1.0.0";
+
+ outputs = [ "out" "dev" "devdoc" ];
+
+ src = fetchurl {
+ url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
+ sha256 = "MNh5sq3m+PRh3vOmd3VdtcAji6v2iNXIPAOz5qvjXO4=";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ gobject-introspection
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_43
+ ];
+
+ buildInputs = [
+ glib
+ ];
+
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ meta = with lib; {
+ homepage = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib";
+ description = "Qualcomm IPC Router protocol helper library";
+ maintainers = teams.freedesktop.members;
+ platforms = platforms.linux;
+ license = licenses.lgpl2Plus;
+ };
+}
diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index 24cd29dcb10b..5405391a1e61 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "libquotient";
- version = "0.6.5";
+ version = "0.6.6";
src = fetchFromGitHub {
owner = "quotient-im";
repo = "libQuotient";
rev = version;
- sha256 = "sha256-TAfo4BkNHE8r32FPT2iDjddq2lk1yC9DrRGZurSO48c=";
+ sha256 = "sha256-QSpkcQEDTMsFbQBa7dTuL/5HraVChUHqUuJdNMty/4s=";
};
buildInputs = [ qtbase qtmultimedia ];
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index b7724d27a060..3dffccf5f41d 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -64,7 +64,12 @@ let
in {
libressl_3_1 = generic {
- version = "3.1.4";
- sha256 = "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21";
+ version = "3.1.5";
+ sha256 = "1504a1sf43frw43j14pij0q1f48rm5q86ggrlxxhw708qp7ds4rc";
+ };
+
+ libressl_3_2 = generic {
+ version = "3.2.5";
+ sha256 = "1zkwrs3b19s1ybz4q9hrb7pqsbsi8vxcs44qanfy11fkc7ynb2kr";
};
}
diff --git a/pkgs/development/libraries/libseat/default.nix b/pkgs/development/libraries/libseat/default.nix
new file mode 100644
index 000000000000..bdefb51b50f4
--- /dev/null
+++ b/pkgs/development/libraries/libseat/default.nix
@@ -0,0 +1,37 @@
+{ fetchFromSourcehut
+, lib
+, meson
+, ninja
+, pkg-config
+, stdenv
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libseat";
+ version = "0.5.0";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = "seatd";
+ rev = version;
+ sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0=";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config ];
+
+ buildInputs = [
+ systemd
+ ];
+
+ mesonFlags = [ "-Dserver=disabled" "-Dseatd=disabled" "-Dlogind=enabled"];
+
+ meta = with lib; {
+ description = "A universal seat management library";
+ changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${version}";
+ homepage = "https://sr.ht/~kennylevinsen/seatd/";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ emantor ];
+ };
+}
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index b39944d13dca..004460abe312 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -47,7 +47,7 @@ else stdenv.mkDerivation {
# darwin-specific
- buildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
+ nativeBuildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
# linux-specific
installFlags = lib.optional isLinux
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 2fad29888982..46c13bbe4a9d 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -4,18 +4,19 @@
, pkg-config
, cmake
-, zlib
+, libdeflate
, libjpeg
, xz
+, zlib
}:
stdenv.mkDerivation rec {
- version = "4.1.0";
pname = "libtiff";
+ version = "4.2.0";
src = fetchurl {
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
- sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax";
+ sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b";
};
cmakeFlags = if stdenv.isDarwin then [
@@ -35,7 +36,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
+ propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
+
+ buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs.
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index d108bf4e6df4..6eb1bb93f6b8 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- version = "0.12.1";
+ version = "0.12.2";
pname = "liburcu";
src = fetchurl {
url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
- sha256 = "03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv";
+ sha256 = "sha256-Tu/BHk9sIS/H2E2HHhzBOdoGaaRv8/2lV6b91NdMpns=";
};
checkInputs = [ perl ];
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 88b1f3271456..c17b8be592aa 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "libwacom";
- version = "1.8";
+ version = "1.9";
outputs = [ "out" "dev" ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "linuxwacom";
repo = "libwacom";
rev = "libwacom-${version}";
- sha256 = "sha256-vkBkOE4aVX/6xKjslkqlZkh5jdYVEawvvBLpj8PpuiA=";
+ sha256 = "sha256-o1xCSrWKPzz1GePEVB1jgx2cGzRtw0I6c4wful08Vx4=";
};
nativeBuildInputs = [ pkg-config meson ninja doxygen ];
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
index b958f018b604..161833a928cd 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "libxmlb";
- version = "0.2.1";
+ version = "0.3.0";
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libxmlb";
rev = version;
- sha256 = "XD66YfD8fjaqp5pkcR8qNh7Srjh+atAIC2qkDTF7KdM=";
+ sha256 = "sha256-prHsigfjifwiuBSUHaCWhjJIaw1LkOGHJu20cdPgH9c=";
};
patches = [
diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix
index e6996a53c832..b9ca94056180 100644
--- a/pkgs/development/libraries/lime/default.nix
+++ b/pkgs/development/libraries/lime/default.nix
@@ -2,14 +2,15 @@
, belle-sip
, cmake
, fetchFromGitLab
+, lib
, soci
, sqlite
-, lib, stdenv
+, stdenv
}:
stdenv.mkDerivation rec {
pname = "lime";
- version = "4.4.21";
+ version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "sha256-3whr2KSAULRe3McgOtJlA3NEPF8NO6YHp+4vqeMPT5I=";
+ sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z";
};
buildInputs = [ bctoolbox soci belle-sip sqlite ];
diff --git a/pkgs/development/libraries/mapbox-gl-native/default.nix b/pkgs/development/libraries/mapbox-gl-native/default.nix
index e98903e3a83e..c71bf17a3c77 100644
--- a/pkgs/development/libraries/mapbox-gl-native/default.nix
+++ b/pkgs/development/libraries/mapbox-gl-native/default.nix
@@ -1,20 +1,44 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config
-, qtbase, curl, libuv, glfw3 }:
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkg-config
+, qtbase, curl, libuv, glfw3, rapidjson }:
mkDerivation rec {
pname = "mapbox-gl-native";
- version = "2020.06.07";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "mapbox";
repo = "mapbox-gl-native";
- rev = "e18467d755f470b26f61f6893eddd76ecf0816e6";
- sha256 = "1x271gg9h81jpi70pv63i6lsa1zg6bzja9mbz7bsa4s02fpqy7wh";
+ rev = "maps-v${version}";
+ sha256 = "027rw23yvd5a6nl9b5hsanddc44nyb17l2whdcq9fxb9n6vcda4c";
fetchSubmodules = true;
};
+ patches = [
+ # https://github.com/mapbox/mapbox-gl-native/pull/16591
+ (fetchpatch {
+ name = "add-support-for-qmapboxgl-installation.patch";
+ url = "https://github.com/mapbox/mapbox-gl-native/commit/e18467d755f470b26f61f6893eddd76ecf0816e6.patch";
+ sha256 = "0gs7wmkvyhf2db4cwbsq31sprsh1avi70ggvi32bk0wn3cw4d79b";
+ })
+ (fetchpatch {
+ name = "add-support-for-using-qmapboxgl-as-a-proper-cmake-dependency.patch";
+ url = "https://github.com/mapbox/mapbox-gl-native/commit/ab27b9b8207754ef731b588d187c470ffb084455.patch";
+ sha256 = "1lr5p1g4qaizs57vjqry9aq8k1ki59ks0y975chlnrm2sffp140r";
+ })
+ (fetchpatch {
+ name = "skip-license-check.patch";
+ url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e";
+ sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba";
+ })
+ ];
+
+ postPatch = ''
+ # don't use vendored rapidjson
+ rm -r vendor/mapbox-base/extras/rapidjson
+ '';
+
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ curl libuv glfw3 qtbase ];
+ buildInputs = [ curl libuv glfw3 qtbase rapidjson ];
cmakeFlags = [
"-DMBGL_WITH_QT=ON"
@@ -27,7 +51,7 @@ mkDerivation rec {
description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL";
homepage = "https://mapbox.com/mobile";
license = licenses.bsd2;
- maintainers = [ maintainers.Thra11 ];
+ maintainers = with maintainers; [ Thra11 dotlambda ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix
index 1740b9ae580d..87e765766227 100644
--- a/pkgs/development/libraries/mapbox-gl-qml/default.nix
+++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix
@@ -1,22 +1,31 @@
-{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtlocation, mapbox-gl-native }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkg-config
+, curl
+, qtbase
+, qtlocation
+, mapbox-gl-native
+}:
mkDerivation rec {
pname = "mapbox-gl-qml";
- version = "1.7.5";
+ version = "1.7.6";
src = fetchFromGitHub {
owner = "rinigus";
repo = "mapbox-gl-qml";
rev = version;
- sha256 = "1izwkfqn8jl83vihcxl2b159sqmkn1amxf92zw0h6psls2g9xhwx";
+ sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw=";
};
- nativeBuildInputs = [ qmake ];
- buildInputs = [ qtlocation mapbox-gl-native ];
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ curl qtlocation mapbox-gl-native ];
postPatch = ''
- substituteInPlace mapbox-gl-qml.pro \
- --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}'
+ substituteInPlace src/CMakeLists.txt \
+ --replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}"
'';
# Package expects qt5 subdirectory of mapbox-gl-native to be in the include path
@@ -26,7 +35,7 @@ mkDerivation rec {
description = "Unofficial Mapbox GL Native bindings for Qt QML";
homepage = "https://github.com/rinigus/mapbox-gl-qml";
license = licenses.lgpl3Only;
- maintainers = [ maintainers.Thra11 ];
+ maintainers = with maintainers; [ Thra11 dotlambda ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/md4c/default.nix b/pkgs/development/libraries/md4c/default.nix
new file mode 100644
index 000000000000..a711ecb7c768
--- /dev/null
+++ b/pkgs/development/libraries/md4c/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+ pname = "md4c";
+ version = "0.4.7";
+
+ src = fetchFromGitHub {
+ owner = "mity";
+ repo = pname;
+ rev = "release-${version}";
+ hash = "sha256-nfMXUP1wu3ifn1QVTO/+XcfFRsThG8PlmYRv+b8AYlQ=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mity/md4c";
+ description = "Markdown parser made in C";
+ longDescription = ''
+ MD4C is Markdown parser implementation in C, with the following features:
+
+ - Compliance: Generally, MD4C aims to be compliant to the latest version
+ of CommonMark specification. Currently, we are fully compliant to
+ CommonMark 0.29.
+ - Extensions: MD4C supports some commonly requested and accepted
+ extensions. See below.
+ - Performance: MD4C is very fast.
+ - Compactness: MD4C parser is implemented in one source file and one
+ header file. There are no dependencies other than standard C library.
+ - Embedding: MD4C parser is easy to reuse in other projects, its API is
+ very straightforward: There is actually just one function, md_parse().
+ - Push model: MD4C parses the complete document and calls few callback
+ functions provided by the application to inform it about a start/end of
+ every block, a start/end of every span, and with any textual contents.
+ - Portability: MD4C builds and works on Windows and POSIX-compliant
+ OSes. (It should be simple to make it run also on most other platforms,
+ at least as long as the platform provides C standard library, including
+ a heap memory management.)
+ - Encoding: MD4C by default expects UTF-8 encoding of the input
+ document. But it can be compiled to recognize ASCII-only control
+ characters (i.e. to disable all Unicode-specific code), or (on Windows)
+ to expect UTF-16 (i.e. what is on Windows commonly called just
+ "Unicode"). See more details below.
+ - Permissive license: MD4C is available under the MIT license.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.all;
+ };
+}
+# TODO: enable tests (needs Python)
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 6321e35f7f46..ad770046d338 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -33,7 +33,7 @@
stdenv.mkDerivation rec {
pname = "mediastreamer2";
- version = "4.4.32";
+ version = "4.4.35";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "sha256-kaNQuhxsUx74hBhfpB76NuNTT+8h74nfiv1re43tHps=";
+ sha256 = "18qmg678m087k7qsaxwfcv2p875z2kpy91pqryiv955km40drl0g";
};
patches = [
diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix
index 2ac2087054fe..36abc9f3276e 100644
--- a/pkgs/development/libraries/mimalloc/default.nix
+++ b/pkgs/development/libraries/mimalloc/default.nix
@@ -7,13 +7,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mimalloc";
- version = "1.6.7";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "microsoft";
repo = pname;
rev = "v${version}";
- sha256 = "1ymffs3ixc4vkhpr09ph6xhyknm2cx8ij8j5l70cq6119mwilnwa";
+ sha256 = "sha256-BMDCreY41CxJaPo9BdSRZlqh/YjtPC9aI/Zxt501e+0=";
};
nativeBuildInputs = [ cmake ninja ];
diff --git a/pkgs/development/libraries/minizip2/default.nix b/pkgs/development/libraries/minizip2/default.nix
index 16bb2b8d44e6..591bb8c8dc3a 100644
--- a/pkgs/development/libraries/minizip2/default.nix
+++ b/pkgs/development/libraries/minizip2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "minizip";
- version = "2.10.4";
+ version = "2.10.6";
src = fetchFromGitHub {
owner = "nmoinvaz";
repo = pname;
rev = version;
- sha256 = "15bbagngvm738prkzv7lfs64pn4pq7jkhwz571j0w0nb5nw9c01x";
+ sha256 = "sha256-OAm4OZeQdP2Q/UKYI9bR7OV9RmLmYF/j2NpK5TPoE60=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index 85c9f781cc60..f213f39c06d3 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z";
};
- buildInputs = [
- unzip
- ] ++ lib.optionals stdenv.isDarwin [setfile];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = lib.optionals stdenv.isDarwin [setfile];
meta = {
homepage = "http://muparser.sourceforge.net";
diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix
index 4260e30561b4..8e63cb681203 100644
--- a/pkgs/development/libraries/mygui/default.nix
+++ b/pkgs/development/libraries/mygui/default.nix
@@ -14,8 +14,8 @@ in stdenv.mkDerivation rec {
sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
};
- nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ libX11 unzip ois freetype libuuid boost ]
+ nativeBuildInputs = [ cmake pkg-config unzip ];
+ buildInputs = [ libX11 ois freetype libuuid boost ]
++ (if withOgre then [ ogre ] else [ libGL libGLU ]);
# Tools are disabled due to compilation failures.
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index e8053ce27023..958be905f835 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }:
stdenv.mkDerivation rec {
- version = "4.9.7";
+ version = "4.9.8";
pname = "nco";
- nativeBuildInputs = [ flex which ];
- buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl coreutils ];
+ nativeBuildInputs = [ flex which antlr ];
+ buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ];
src = fetchzip {
url = "https://github.com/nco/nco/archive/${version}.tar.gz";
- sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4=";
+ sha256 = "sha256-fOdmM0I/UGhxacofEBfw9UmOOrMDUXs59ca8uvkQKqw=";
};
prePatch = ''
@@ -19,11 +19,13 @@ stdenv.mkDerivation rec {
--replace "/bin/mv" "${coreutils}/bin/mv"
'';
+ parallelBuild = true;
+
meta = {
description = "NetCDF Operator toolkit";
longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";
homepage = "http://nco.sourceforge.net/";
- license = lib.licenses.gpl3;
+ license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.bzizou ];
platforms = lib.platforms.linux;
};
diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix
index 09169019a128..9b5043a1e234 100644
--- a/pkgs/development/libraries/notcurses/default.nix
+++ b/pkgs/development/libraries/notcurses/default.nix
@@ -3,7 +3,7 @@
multimediaSupport ? true
}:
let
- version = "2.1.5";
+ version = "2.2.3";
in
stdenv.mkDerivation {
pname = "notcurses";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
owner = "dankamongmen";
repo = "notcurses";
rev = "v${version}";
- sha256 = "02x9a0z7mbgry2wsfai1l3jwb2zpcg4gq6a2w5d920ap2fixzy8b";
+ sha256 = "sha256-O6bu/tEotsxHAx6rCi0xRaklmF0l6neYwwscF2w0HJg=";
};
meta = {
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 7b02e3497f0a..81a51c7beaea 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -18,7 +18,7 @@ let
# It will rebuild itself using the version of this package (NSS) and if
# an update is required do the required changes to the expression.
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
- version = "3.60";
+ version = "3.62";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
- sha256 = "0ggyj3ax3kal65sl1vl4nfhx2s08blg4dg8iwlxcax5qb9bxbaw4";
+ sha256 = "0y2ld90bncjjggrn64c7g7mq9i03z6dc3r2kz978snz2xiydzml6";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index ee3cf93bc214..6e41639d48e5 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;
stdenv.mkDerivation rec {
pname = "ntl";
- version = "11.4.3";
+ version = "11.4.4";
src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
- sha256 = "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp";
+ sha256 = "sha256-nX9uguEaQJ8VHA3i3rCMDXY7r5g0/d/UMr89IY+AIds=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix
index 3a63bad03dcb..22161e3dc1d6 100644
--- a/pkgs/development/libraries/nvidia-video-sdk/default.nix
+++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "08h1vnqsv22js9v3pyim5yb80z87baxb7s2g5gsvvjax07j7w8h5";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
# We only need the header files. The library files are
# in the nvidia_x11 driver.
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix
index ec40bc393d51..b6aa71491680 100644
--- a/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3, opencl-headers }:
stdenv.mkDerivation rec {
pname = "opencl-clhpp";
@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "04g3mg2cpbi048fxxkghra81bpxzqr4r3gspx5mvqipx1lzypsci";
};
- nativeBuildInputs = [ cmake python ];
+ nativeBuildInputs = [ cmake python3 ];
propagatedBuildInputs = [ opencl-headers ];
+ strictDeps = true;
+
cmakeFlags = [
"-DBUILD_EXAMPLES=OFF"
"-DBUILD_TESTS=OFF"
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 11872cd47cc3..a65e978f9816 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -18,7 +18,7 @@
, enableUnfree ? false
, enableIpp ? false
-, enablePython ? false, pythonPackages
+, enablePython ? false, pythonPackages ? null
, enableGtk2 ? false, gtk2
, enableGtk3 ? false, gtk3
, enableVtk ? false, vtk
@@ -36,6 +36,8 @@
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
+assert enablePython -> pythonPackages != null;
+
let
version = "3.4.8";
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix
index ce35aa1c655e..1e3ee9896447 100644
--- a/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
-I${openfx.dev}/include/OpenFX
'';
- buildInputs = [ unzip re2 openfx zlib ilmbase libGLU libGL openexr ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix
index 0d8afe53df8b..a26e97798aef 100644
--- a/pkgs/development/libraries/openfx/default.nix
+++ b/pkgs/development/libraries/openfx/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
outputs = [ "dev" "out" ];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 2edf02e738f3..49ac7954169f 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -160,8 +160,8 @@ in {
};
openssl_1_1 = common {
- version = "1.1.1j";
- sha256 = "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma";
+ version = "1.1.1k";
+ sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9";
patches = [
./1.1/nix-ssl-cert-file.patch
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index 5f3a03a3f5bf..b5317ce9aae8 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec
outputs = [ "out" ];
- buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
setSourceRoot = ''
sourceRoot=$(echo */openvdb)
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 2b99f29f4c0d..e760868524fa 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "ortp";
- version = "4.4.32";
+ version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "sha256-tcSrDfo1AZM7yQarwfV4n6p1UOShXGKjMW5u57/cM+Q=";
+ sha256 = "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m";
};
# Do not build static libraries
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix
index 0247d12715f6..d4af69532b39 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/pkgs/development/libraries/partio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, doxygen, xorg }:
stdenv.mkDerivation {
pname = "partio";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" "lib" ];
nativeBuildInputs = [ unzip cmake doxygen ];
- buildInputs = [ freeglut libGLU libGL zlib swig python xorg.libXi xorg.libXmu ];
+ buildInputs = [ freeglut libGLU libGL zlib swig xorg.libXi xorg.libXmu ];
buildPhase = ''
make partio
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
mv $dev/include/*.h $dev/include/partio
'';
+ strictDeps = true;
+
meta = with lib; {
description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC";
homepage = "https://www.disneyanimation.com/technology/partio.html";
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index 916303f00cec..87e2ae9631c5 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -1,4 +1,15 @@
-{ lib, stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
+{ lib
+, stdenv
+, fetchurl
+, boost
+, fastjet
+, gfortran
+, lhapdf
+, python2
+, root
+, yoda
+, zlib
+}:
stdenv.mkDerivation rec {
pname = "fastnlo_toolkit";
@@ -9,8 +20,19 @@ stdenv.mkDerivation rec {
sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";
};
- buildInputs = [ boost fastjet gfortran gfortran.cc.lib lhapdf python2 root yoda ];
- propagatedBuildInputs = [ zlib ];
+ buildInputs = [
+ boost
+ fastjet
+ gfortran
+ gfortran.cc.lib
+ lhapdf
+ python2
+ root
+ yoda
+ ];
+ propagatedBuildInputs = [
+ zlib
+ ];
preConfigure = ''
substituteInPlace ./fastnlotoolkit/Makefile.in \
@@ -23,11 +45,22 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
- description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
- license = lib.licenses.gpl3;
- homepage = "http://fastnlo.hepforge.org";
- platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [ veprbl ];
+ meta = with lib; {
+ homepage = "http://fastnlo.hepforge.org";
+ description = "Fast pQCD calculations for hadron-induced processes";
+ longDescription = ''
+ The fastNLO project provides computer code to create and evaluate fast
+ interpolation tables of pre-computed coefficients in perturbation theory
+ for observables in hadron-induced processes.
+
+ This allows fast theory predictions of these observables for arbitrary
+ parton distribution functions (of regular shape), renormalization or
+ factorization scale choices, and/or values of alpha_s(Mz) as e.g. needed
+ in PDF fits or in systematic studies. Very time consuming complete
+ recalculations are thus avoided.
+ '';
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ veprbl ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
index 94bf252ec10a..92c225f90ccd 100755
--- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh
+++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
@@ -1,10 +1,12 @@
#!/bin/bash
-set -e
+set -xe
-BASE_URL="https://lhapdf.hepforge.org/downloads?f=pdfsets/6.2/"
+: ${SED:="$(nix-build '' -A gnused --no-out-link)/bin/sed"}
-for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*/dev/null | "$SED" -e "s/.*/dev/null | tr -d '\n'
echo "\";"
diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index 7fb3e640c7d6..694164f5af2e 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -6,7 +6,7 @@ let
inherit name;
src = fetchurl {
- url = "http://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz";
+ url = "https://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz";
inherit sha256;
};
@@ -189,6 +189,134 @@ in
"CT14qed_inc_proton" = "0gv0rlr6l62gidqp02ifn75d1ribvbihgpaqc92fww73zwilr7l0";
"CT14qed_neutron" = "0ck1vmqk17i7rq42hra79cz2rm8ngxv4da6dvz62l6m2nrga3l2k";
"CT14qed_proton" = "1gijxkq5gpsljijblzd13kgr7xjjvnjv18v02jivylf73igsakd7";
+ "CT18ANLO" = "16lbhgkbiym3njiffxdcm3hf7kkm33hyj2w1hwgb3mvxx2sja31c";
+ "CT18ANLO_as_0110" = "08hwxc99l645a9craimgawwynxcs5cmapgxgk0fy9ihvjvqs6jg2";
+ "CT18ANLO_as_0111" = "02ff3s127svdjzawbhzry04rcsw5waggmf3iwpqndzxhqpm0py8a";
+ "CT18ANLO_as_0112" = "063g7sqii0gf2rdjg9k9x95kzwg62w8lfq9cgyv3bnkpapnbqhia";
+ "CT18ANLO_as_0113" = "01zh34dg4cc8955ipg2i0k6s13h77jg8yaa4v2f4aw0020js9dn2";
+ "CT18ANLO_as_0114" = "061lvglsg4889q6qya83f7ngyzi2ibar1c9w6xyl462x5i4frx2x";
+ "CT18ANLO_as_0115" = "0a35axfjxywy4yh8pk4w4f57rfljvd593bx7a8wnix0cifnngg4j";
+ "CT18ANLO_as_0116" = "1cm3m3m6l93qlr9fxbc0d21gq3x0wn09qi8cxbx7lj0yqhjf2zh8";
+ "CT18ANLO_as_0117" = "1nrzrlp7i42z7pv550ggga0fk356i9rqbj60mdxvlw3xl6v4kkf4";
+ "CT18ANLO_as_0118" = "19p7x6q9flsz1s82scakgnsfsrjf8ym6ix3gp195fjgfdkannh9i";
+ "CT18ANLO_as_0119" = "1jz27f39dpg0g46p834vgvaajxspyqwd8f7zlpv44lfb43va6dgy";
+ "CT18ANLO_as_0120" = "0rp9hrvs44d8pbagmc3vipnh5d9amam3prkm2k7spvxahr6dp8dp";
+ "CT18ANLO_as_0121" = "15abhrjmmhyka9dxjmwz7103i0bpa605yhy6kisgzf7km5ca14h9";
+ "CT18ANLO_as_0122" = "15mxybppydzsxx308hqljahnmrw0islw2zl45kjlhxjxsmaai2nc";
+ "CT18ANLO_as_0123" = "19zlyapm5cp1hwvfqcjm3v6mgwdaa6f5d0mvnh68c05sn39xjhz2";
+ "CT18ANLO_as_0124" = "1fwzcs50bj6d6cjkvi4qj44mwrwxhjh25lxmk2q82wdmddgpaz0c";
+ "CT18ANNLO" = "1kbsbvvkkchhwwjdrj4d91lbykid4dcy4ghanpdd9x0nfm5b4sgk";
+ "CT18ANNLO_as_0110" = "1a60p22r292hjjcrdkgis6d81hgihnjzyzlbcqrvx9bkbq447kjq";
+ "CT18ANNLO_as_0111" = "1gyl4h92xs4s64dm7cwrfqk2zrs1cbzp76dqckf7z44k4pm460m9";
+ "CT18ANNLO_as_0112" = "1bsn5q12bgkhyl1d6wkq32m3l7i0wqxpnjxh790xcd3ympbfx16h";
+ "CT18ANNLO_as_0113" = "1dri54s71ygnd1pdnmvr9vqbyfllwzr9x39zg01rpj02zy7kidb0";
+ "CT18ANNLO_as_0114" = "0f731ryn1031053zv40mak9m7mxmn6dvnhn6ik6kyag9d3az6lvx";
+ "CT18ANNLO_as_0115" = "107569wrkjic6xjp574i6r6n8wj2x9cx4h7dqh77wxl8g4aajkh6";
+ "CT18ANNLO_as_0116" = "0r951p0a4pan71lkhf701ysw6kyq1wvf15rbjdjr4j7khjfaykcp";
+ "CT18ANNLO_as_0117" = "0xsgzga5bya0ng6i7nvk33nrf792vzbd1rs174cix4v406g99xm8";
+ "CT18ANNLO_as_0118" = "049534355lxhppw2l85i677ysb2gwzccs0b5afm719sh06rv6jkn";
+ "CT18ANNLO_as_0119" = "034kd7pg103ldc3nmgsylv0ffl8v0sp9jkf9073ny11s7b3pb5wa";
+ "CT18ANNLO_as_0120" = "1ph23xpirkahpr9x1k2qm9pp3a1hc3i15bhc6xprpc29k53m4wsi";
+ "CT18ANNLO_as_0121" = "12qrg3jb1kar46b8lai56lb7wxjr950dzaixfncxvy38hrny6mxh";
+ "CT18ANNLO_as_0122" = "1wmkl2rlhkwzxi1yln0m9i6lvpbqkp3bxdnyzz7hp3hy1sa5f60s";
+ "CT18ANNLO_as_0123" = "1caz4rfmcmabfdw5b8xg2307bs1bjclgdcxq2k6gf73z3pqbjs8w";
+ "CT18ANNLO_as_0124" = "0mx8h8vdhlklgvysmhllkzga3g65zkmzpz7bmyvaqmvbvr6x5q0w";
+ "CT18NLO" = "04y2p6vz484l3yv6381pfavqs3xh78h3jn6bg7ncp5vywwqp44n9";
+ "CT18NLO_as_0110" = "0ncaacfw8dh45vaf84kkj93hwxgwz744qqd6llpy73zdilnl62a8";
+ "CT18NLO_as_0111" = "1cib3ggy0wajvvw908wr4bfymcw62iy5abwdadhq69crcg01619r";
+ "CT18NLO_as_0112" = "1x242x4y0vykfypm02g02qxpwmsq2p45bxqrqgfy29qagxz6j66d";
+ "CT18NLO_as_0113" = "0fkis7l0s1lb2k7qyfwnn5axbpiv9yky4j5qc8g3fa068czijmhi";
+ "CT18NLO_as_0114" = "1r6ih2gqiwm7z24iw9xgn2n35659v5nwl2d02f07j1k3d33j175n";
+ "CT18NLO_as_0115" = "0z4vm73l16mpjf3wcrv5q659f2mwkx85wpmnq8j1fnk0vhms59dx";
+ "CT18NLO_as_0116" = "0g4lxxc9g09alpsff9wr7w0jgi26h3klx8rk6nb71j9yzrwv12vv";
+ "CT18NLO_as_0117" = "0hmn5vkgi5981q0s5lyp9mq9jjrzhgr1f9w8np3i2nwcgn1awis5";
+ "CT18NLO_as_0118" = "1z6is1f3064wq56lfxrmqckk3yi6wsl42s2xigx87p8zqg3r4nkz";
+ "CT18NLO_as_0119" = "0p3r7w5v3pq2dgaq96r3khx1wwjq6i33l0bbf63dxs88gk5cx1s4";
+ "CT18NLO_as_0120" = "1h0rcra68yypf1yqwlzql385ks1agxc9njdpyx60j3yg3whk4h63";
+ "CT18NLO_as_0121" = "1by1iiy7qby73m8s3qmnrf0dyca3k4z00fclbrm651f79nz8scz7";
+ "CT18NLO_as_0122" = "1r8h2cw874dh1mj4r545wp9msr1358qw1lzznwvgkmgwjclndjg4";
+ "CT18NLO_as_0123" = "1d8c3bk6bvy3azbv9yqi45cwkcmjbxxw7qaxn6xnc5jfcf6wbsp1";
+ "CT18NLO_as_0124" = "1haqxq1jbcz9qbhnw4pxsvlr37908fkdlzyn7c1csrlr8a51s3z4";
+ "CT18NNLO" = "1shkah5ma0hp101aklkz2p8n9y4i4sv6zwa5ifzyj3bgz1020l5f";
+ "CT18NNLO_as_0110" = "1smilnmhw8zjd0hl03v7wflbbia5qxqfmvyikbgwc29g212xbq71";
+ "CT18NNLO_as_0111" = "0mj77vshb9fmlvc1pp3m701nl574p0k013lg0l25r4nhvlfiiriz";
+ "CT18NNLO_as_0112" = "0a87crw7dygf9q28v95h9j02yq5f9rr5fdrxvqj5ggw839nazgmk";
+ "CT18NNLO_as_0113" = "011269haxlh2grq60qbmwrilgnkz6hlacd8x56iizl6ify7hcs2c";
+ "CT18NNLO_as_0114" = "0im03f2vr9pfd223skadmcfrypxlpka4pqizjcbqq75fddhljivq";
+ "CT18NNLO_as_0115" = "0pppdh2vq86iiar18c5wi2qbm6viv0hpyfah8pn1p6bcg1k99srs";
+ "CT18NNLO_as_0116" = "17wsn6jxp25klk3x3yfa5abxjjdl5j9vdwxqb51zg6ic3a7is764";
+ "CT18NNLO_as_0117" = "0nkdmqyqzzg19m98mqm9n2dcaiy4i97zrxmy7x1c3rxc0n7igkzh";
+ "CT18NNLO_as_0118" = "0v931kw5dzqq95940mxmkj1r6a75w525j99yf47pyf55vg22ybkb";
+ "CT18NNLO_as_0119" = "1z4kg4na0m2vrflnizxhjdxa9rdzp66mq66bxcjlvqiraf4ygkd4";
+ "CT18NNLO_as_0120" = "07bz7q5h0rfxf5989sarchsv2mcn4093b6x5094725p74sw41sq5";
+ "CT18NNLO_as_0121" = "0slw6m1scnajlfhxswd05if782k32gcyx9zz50gaiwqimrz188fa";
+ "CT18NNLO_as_0122" = "1jrzxq7mqhkfj96whqfr3ny2g1kggc047cvzb7ladlirmi05injg";
+ "CT18NNLO_as_0123" = "1zdmvp9pxjjs96yw05l5s0c0ym1hyj7d3an5siy3i20lvyxcgyz7";
+ "CT18NNLO_as_0124" = "1lb88y4c68n669c2g2q2zwjp92d9hgbxgpl0b7dxny9a7zdmw0mx";
+ "CT18XNLO" = "1k0cli4j0z5hj24pk9f78flhlvsdfya51hgh90jv4myniapk616l";
+ "CT18XNLO_as_0110" = "0yahahfmzzwzxiqanm7029z05f3nx9cs2yjdvyvhazvicsq3ibid";
+ "CT18XNLO_as_0111" = "1n0q8d0j8smq2z6n9l091r2q8v319zcf896nk2m0s7n9g9a0vcjq";
+ "CT18XNLO_as_0112" = "1wj968g1vb58gz6vslzfmihvqg5f9f2cqgq8inlgdhai1y8vk1lz";
+ "CT18XNLO_as_0113" = "1gi939mxv99q2r1m8a6d4ky5nrp24xv16xw6d9h7ly27jrw8kzm5";
+ "CT18XNLO_as_0114" = "06gf4m01yr89xklch6ack012in2i1bifyzvp793x9w8m56dx12ms";
+ "CT18XNLO_as_0115" = "1g4705l0qb0immd4la2vrj9v4kw7r7i1wz1vn4knbqjwig5kcfws";
+ "CT18XNLO_as_0116" = "0vaxwg3ixf4x92vssh8gqrszbfa5zgzbsd5p81j14nlksshrs6bf";
+ "CT18XNLO_as_0117" = "10qg2yr63csg4nd62a8h0s1z08cmgbkwvcsh0wp7zkzpw70r7x78";
+ "CT18XNLO_as_0118" = "0kxhg2pn7ki4nxcs5jhxvx4fs6c414mq0d0qm3vldv0hsayqsbnd";
+ "CT18XNLO_as_0119" = "1xd4ib2fqzhg9c6z2zyc8h3il4msm7rv9kkaaapll4h0gpjdda6x";
+ "CT18XNLO_as_0120" = "0jyb8gs0avvlhiwwvrv09p47vs3jim3y315hg7wcy31xab90b91i";
+ "CT18XNLO_as_0121" = "1afizsl9phvvdjbyrifx3ii10gpxl51rvx311imz30l51i3fzl7v";
+ "CT18XNLO_as_0122" = "0wkpicsv9357lh96vjnrxzddaaaiaagyfph2jcyp97mjhixx2hlg";
+ "CT18XNLO_as_0123" = "0hr9m422shvp5yzjdd7lqansim7qcx3iv1p017fp1a4ihj661sra";
+ "CT18XNLO_as_0124" = "03zf75f6gx41g3fxrdc6sqkfcyzz03izchwfvabwfxr06yq94jxc";
+ "CT18XNNLO" = "0j7bwzkhax4cm3wnbhqdv48j4wha9zdd7v77ihlgcvcmk79rx1fa";
+ "CT18XNNLO_as_0110" = "1vwaz00jwpyd1nafpfw0mw309v10zqxcsygdjsdd9mn5p1j6z3hv";
+ "CT18XNNLO_as_0111" = "0g6w519dc13mzgb2wpyy7chnl5wkl0ndrdiw7nymad0csg20yss2";
+ "CT18XNNLO_as_0112" = "06wlzpx9b83gblg4rvqv22k60pvjikqs5m5gp2kvrwmc2wxp73d2";
+ "CT18XNNLO_as_0113" = "0ybm5v0dprid7vvsnsihkd3vn5gqsqsmib63sh3xl45i58h1szzz";
+ "CT18XNNLO_as_0114" = "0hpznnkarzjmf5447jp9za1w52lqpysprnf14v31mda9k7a6kdkn";
+ "CT18XNNLO_as_0115" = "0lj637cwm726hqilrnfa064apdsqdav142dy3scz2gxzpzqpya7c";
+ "CT18XNNLO_as_0116" = "0m1zh15f975g628npifyqmlj578lpdlc67sdrxgdg97jfvxrq7s2";
+ "CT18XNNLO_as_0117" = "1r5kwl333ipq3g78cmn7h5yxk2gl3rfszm1ijzyf8hrjqz9m2p35";
+ "CT18XNNLO_as_0118" = "070jcd7y5w0h65ssk359w4kf2j7164pgdkg78mjwifi2garrlv0s";
+ "CT18XNNLO_as_0119" = "12nzzjyllr4vs422dxdccjy0qffg9gy8p2wa828cr3a26wjlipfr";
+ "CT18XNNLO_as_0120" = "1b9k3wd212nrhhncckj6fml58jzjagiskgmc6h248mcc8mcc2gyz";
+ "CT18XNNLO_as_0121" = "1wkgmkw5djzxc5g4iyr4h2cz08jv1clmp8x8xcidg5532zclavmd";
+ "CT18XNNLO_as_0122" = "1w7jhlk432qni1kn1big44yk16bxghbzrjb1g1rdxpibzy2jdkw3";
+ "CT18XNNLO_as_0123" = "15hqb1c4jx41119h2ahx6zacbigs9xw92jw7c4xsww9dkzr1qsr5";
+ "CT18XNNLO_as_0124" = "0fx7am4dv4d09hdk0yxvxzbdlhzc03y3q2x1hfx9wk07kcxw1mj5";
+ "CT18ZNLO" = "0iv8laks2ymn5fygk6k9lxm3s7fld5g292n9bfkhn3nmcfxczi03";
+ "CT18ZNLO_as_0110" = "0q90c9nx0b3fbqq317qr0j13cc9m3zcgpk3pcn8s2sd6aaksa66i";
+ "CT18ZNLO_as_0111" = "0wnxj323k29xvcrrf68mfyhflfnblvvnx63p070l5x52qqbfjl7y";
+ "CT18ZNLO_as_0112" = "03qjvv004g99lbi022l9bvr82gvv6gzk651r8x5hwwyr0mar4j0v";
+ "CT18ZNLO_as_0113" = "0hw6w7x3bnx2fy03jj5yvbjjab9mj0fzca8bc46phjsmx3nqxq5k";
+ "CT18ZNLO_as_0114" = "0gnhqhxcsaslcldhyh69lxdx1misjz5qiwry57n31j6mqjrggqbi";
+ "CT18ZNLO_as_0115" = "1dn32bwarggnfq2s9drmdjikcrn0nm0mqih4f5wxr3zbmq70xw4q";
+ "CT18ZNLO_as_0116" = "17q8ysl7ar1n7wym55k8vzrx963rip9l9b0kxw2bqkha5ipwmnv3";
+ "CT18ZNLO_as_0117" = "1afaqy8afzib6fmyy7ysnfk8w5f92893nvh4fn1sx9ink7i2zqal";
+ "CT18ZNLO_as_0118" = "0sbhjzjsjd8m6sgz66vky3w7ymhwpss0dr2p603dxgm84fig1kzx";
+ "CT18ZNLO_as_0119" = "0fxplpy2l1fdh5p4csdlabg36xgbpdg8pcdfcnws2cfj3g0941as";
+ "CT18ZNLO_as_0120" = "05dk8bvwkn5y5j4rk18an25rg1f1am9vlddal84rbp8m15qnms65";
+ "CT18ZNLO_as_0121" = "0ymql1wjxng5i887lx2q6p8gryw29zs0d2hzkfxl4f0zzn2wlwpi";
+ "CT18ZNLO_as_0122" = "0gnl23n4ljlry340pwwfs0xs22bl2qp2b8p3f73gpp9xn42nwz1g";
+ "CT18ZNLO_as_0123" = "1wfx59iadvn85raa1bq81ipxpjbxli58hs8wpzm1vz10ilifn9d5";
+ "CT18ZNLO_as_0124" = "0jm0gnp8g1drz6a10wrdxkj2s8gws80ias1ixdnr5fdmnghf1wl7";
+ "CT18ZNNLO" = "0zsqrpab6vgcinsxjq3rqdadig5flxzk61wc1aa9rwnkbpm1paa5";
+ "CT18ZNNLO_as_0110" = "09ypj0yydkiw82bq3ymsp19i4iz82fm2z2xfplb3iasa86y377in";
+ "CT18ZNNLO_as_0111" = "00h0zd5indm57xhn467qffpx7aadzb73vyfazq09pl5vdqq9fn8x";
+ "CT18ZNNLO_as_0112" = "19vlb1bvp7r9jnknd2dvblggim1xqf4yjqyf5h04r90b89pyzxn8";
+ "CT18ZNNLO_as_0113" = "0h8i68dligavf051dpil2bqvlxm19156v1951n340pcncaxxi5d1";
+ "CT18ZNNLO_as_0114" = "1n2drxdd6f36njq0lcfm7s6cyignqdqvirh03ixvvar2pgj02yay";
+ "CT18ZNNLO_as_0115" = "0cv633f5gg6hcyhwfh22h5n4irnk1pxsk7949wiax7qkl84mcm1j";
+ "CT18ZNNLO_as_0116" = "17z25cky2ysrcplsxblrzka667npnnp42k6n8jsm73pagscsj91n";
+ "CT18ZNNLO_as_0117" = "1yrbrzbg5r2pvwhbnvfwcp9d9rvfmqqxwph0rd0sdfix9agwy2yd";
+ "CT18ZNNLO_as_0118" = "019lbvb8pjfbwz8hz8h2xw76nf1ly9mgnbz6pzi3v9msk0qbmlp1";
+ "CT18ZNNLO_as_0119" = "1x08wg3y3fqa8ah6m0c6x2fckjjyylkhnmry6vg93rp3n7qlvynw";
+ "CT18ZNNLO_as_0120" = "0m9mfr8553yrysbcksx17nz1gm1vi2zvs5bp8d3v82phsv5alhf5";
+ "CT18ZNNLO_as_0121" = "0snzl818ag926n0i67hdwkjclfvykx546vfnvsx7n2z5pabakd1j";
+ "CT18ZNNLO_as_0122" = "10i7dk1bllyk6f3l92kbiqdib8l2zvqf91g9c20k12sim6n6x2g5";
+ "CT18ZNNLO_as_0123" = "0v2h2fjkdsnyssb6ralw32c23l0nmdxbg3sx38vxh2y2s2nycz5h";
+ "CT18ZNNLO_as_0124" = "0w29hn728p8yip40mr27kqmv5wndfkq6nx0vnl53x41pwczkhkdl";
"EPPS16nlo_CT14nlo_Ag108" = "1p7gckhv44h04rvknd6fdizy9c1jqfwic7ppf0ra14ic8wp1g7wg";
"EPPS16nlo_CT14nlo_Al27" = "0hxyakfgknmixxndfj14i44afp5gcfz9afjvjdaj702sv42a7qa8";
"EPPS16nlo_CT14nlo_Au197" = "1g272110y3a1fr6raxdfhagn68i0lcnwbdhiiqg4j6wb6v4m3p6i";
@@ -290,12 +418,20 @@ in
"HERAPDF20_NNLO_ALPHAS_130" = "1g2q3438bivd20i685jmx565cq108yv72vhxmpmhysh4qwvwpqqw";
"HERAPDF20_NNLO_EIG" = "12zn49jx7qjr8apgpbhknzll4vwlz3x9y1ai908ix2h86pgap2ml";
"HERAPDF20_NNLO_VAR" = "152h21khvkhxwx87c5lqwzpakmahcpj1ixw6kgl0wrrwjknvfgxn";
+ "JAM19FF_kaon_nlo" = "05mcahzr0k5w0hqfbn902lmkwxlkbf8wrk6akpqnfsyqpbmhja5k";
+ "JAM19FF_pion_nlo" = "06krcf0c9jbbpwf1rk1xd5z7rz904ji984xz05kv9p1j1vgk0ha0";
+ "JAM19PDF_proton_nlo" = "1zrcijik60rci6km5d8pn8ivww8w3v8pb1m5dshqjs51lhf56ayp";
+ "JAM20-SIDIS_FF_hadron_nlo" = "11g4syy0r46m1wvzq0pb84s4kk2aihjmhx16mr8gzv5b11520a6d";
+ "JAM20-SIDIS_FF_kaon_nlo" = "1b2rz6k0g6ck3m28vdqjnnfc025ql5alhjmgn1l84cflf4fvkkgp";
+ "JAM20-SIDIS_FF_pion_nlo" = "15l98gmzsqxw615802si94dmj8ihsz6n1mraxkkwjl86hm8nalzi";
+ "JAM20-SIDIS_PDF_proton_nlo" = "07xwp9as0nscm4whl5x9bry1p54yl5qmj2r3hqh6vjsz6mxksdjp";
"JR14NLO08FF" = "16azkqxf1yw1j32ay6j01gf8n9n7qm56jh4yzgjag0zdhm01lbip";
"JR14NLO08VF" = "1ilw38pp4vy8c8v1glfi4ixca73wjkdg3di1wh9p8xqrifdb096p";
"JR14NNLO08FF" = "1w0pywmjb4xi7bsvv1mdd4q2adf1g7khspfbkphmlh8zipx29nxx";
"JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r";
"JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq";
"JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn";
+ "LUXlep-NNPDF31_nlo_as_0118_luxqed" = "09ch6mjfn6rjsd31jfb59j92ngqiy0x19qamyxh0jwk0sbyr1dpw";
"LUXqed17_plus_PDF4LHC15_nnlo_100" = "18y3pa6gjmcv2s21si9a5dvbq6xxqphbqz5qiy39c62g2zf8512c";
"LUXqed17_plus_PDF4LHC15_nnlo_30" = "1bnwlxr8p4xmr36zd2flhqssil6w7jh50k46j0mxfnd8jgxgwn6n";
"LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib";
@@ -344,11 +480,23 @@ in
"MMHT2014nnlo_mcrange_nf3" = "0zskxladqr40v6wqafbl1pl04vq43babqf437c4xxg4sz9435l3l";
"MMHT2014nnlo_mcrange_nf4" = "0sny8r9zap8gnjh9id1klr59d9hs0bb40pf8hpy8q5pg6052vx3q";
"MMHT2014nnlo_mcrange_nf5" = "1l340c1x4fz647bhybrvbb6z00mla81b78jfqpnwd4vwfxnqmq9y";
+ "MMHT2015qed_nlo" = "130fmxnaashvwwaaiz5b787ldz8l78ar5h2h038xvisdjkxvdqni";
+ "MMHT2015qed_nlo_elastic" = "1whplgg2s55wjii1hd32hzd5wsqbgvjjbnfw4fzjmnx4vwn63n2j";
+ "MMHT2015qed_nlo_inelastic" = "1b24flby6n9q2cg4haldmjs8ql35lhlw0bgynwja1v2n0fbf550y";
+ "MMHT2015qed_nnlo" = "1ypqiz0yz6hnxfml7ym83k4qqvqsbl39abbr38galns8xzzpi03m";
+ "MMHT2015qed_nnlo_elastic" = "17in1cz5j7mm9qjk8i27fif6x276lcqmccl7kfz8a5yn73xxzja4";
+ "MMHT2015qed_nnlo_inelastic" = "1ngk4p7w8l8b8sfg6hlm8ypxz97i1iwzlrc48szy7bi99kn8rmy1";
"MRST2004qed" = "1kdrzk2arvs36lnpkbc94w06hx3nh8nixh2qjhb271c2blwgahzh";
"MRST2004qed_neutron" = "12vna0ic6gh313k22b44b0k9kd939v7zjl2hj65k1075j23mq425";
"MRST2004qed_proton" = "10z0cr8pnr0lfxxi916naiz381a2cqn461jblfzvvddwqmqbllbc";
"MRST2007lomod" = "13ar6hzw9al20zlm8lg0hvwmgrmv0dbam820gm36rj8p7i33qlr6";
"MRSTMCal" = "0kbyp4rypw8jm28zfpvf0grvfvxmsrp3grwsmfxpa2c38x6la3rq";
+ "MSHT20lo_as130" = "0ivjvqabk9jnrlrczjlqywmijx5ql8wy579j77qkl1vhv7sqccm1";
+ "MSHT20nlo_as118" = "1qwbwcq8p4hrprz4ib18mp5142b0lbyyzc1bf5a4iq5jjvi5qm93";
+ "MSHT20nlo_as120" = "10y1a6iryahrafzdqskypjrnad6xxq08gm72pa9yc61xdy6andc6";
+ "MSHT20nlo_as_smallrange" = "1rygvj33g84whl24kgpqa47g11c48l93jlnpzqq8f5zr1ijqcq7i";
+ "MSHT20nnlo_as118" = "1yz0003ixjg97974648qba5d37vb4fhzzmq4k9xh4c37pnc3kgyn";
+ "MSHT20nnlo_as_smallrange" = "1bv7cbdynp6dm5c9v7r32gqy1lch4428apw426pr0d7xpm0abnxv";
"MSTW2008CPdeutnlo68cl" = "1x2y7hl8ckplx175bp3wi04xafm44dd7vzfgnmvvai1x0072xi51";
"MSTW2008CPdeutnnlo68cl" = "1szsdqjkmny30mpw4pdzi97vj7i55agxm285dvnkzp06ycgp1ld3";
"MSTW2008lo68cl" = "0j12mv286r4ds9v7piqh4n44yjnc51hm74lqa4vv5xznxhibng7l";
@@ -360,16 +508,16 @@ in
"MSTW2008lo90cl_nf4" = "1bdjl58gslhw539650qwi7vbvsr22hpxpca17rkbqz9szh0ljhym";
"MSTW2008lo90cl_nf4as5" = "1crsm7dfcs0fn1i2ng18wy23z2ap01xr2rsnafqlra0q135m6hfp";
"MSTW2008nlo68cl" = "0pdvb5nshjjw7ddmdmj1v88m3jlk3vwfnab0pf2kf8hfx10hbv4q";
- "MSTW2008nlo68cl_asmz+68cl" = "1zbvbpfy30612ygr9rz7ickdrbdsg0gd6p8xs7ylzj5h06sckq84";
- "MSTW2008nlo68cl_asmz+68clhalf" = "174spwhpl6cvj8bw8wns0jiznnsjrv3i7cvd4x9vi0fa5z4sb5d3";
+ "MSTW2008nlo68cl_asmz+68cl" = "0gwmxs0f7raxvmpn12zavzqsrp3x0a82y1vq2kf9p9fq17in55yn";
+ "MSTW2008nlo68cl_asmz+68clhalf" = "1rmda4zpm6cs9kyxkhwpz38iv6g259156bmka4dc4zyfg1lcw85d";
"MSTW2008nlo68cl_asmz-68cl" = "15mmdnd3wwlrs5pwwhfa9f88vjpgza8vwxwxpyadxsmhx9jk79hy";
"MSTW2008nlo68cl_asmz-68clhalf" = "0dd7llc6ip6myy2yvf16riqs334f20l8wkmkksq53xngmz9qf263";
"MSTW2008nlo68cl_nf3" = "1j82imyylvnf3x39x1mb19hhp2nbcq2lk82hf7sj72c557l3qpjk";
"MSTW2008nlo68cl_nf4" = "08f008by768c8v3cmrsbgxpglqdj58nwwf22dmk2mbf2jq449s0n";
"MSTW2008nlo68cl_nf4as5" = "0hrqmmnp20vpj6dpz3bvm531i0pvl06als8irqz91cknv6zsvxf9";
"MSTW2008nlo90cl" = "1d3p4cialrngci9kn7225zcmyrr547dskzi74dfgdhbqc0256a2r";
- "MSTW2008nlo90cl_asmz+90cl" = "1g4gwmriyl71xd2k49jc391vfr02dic0q73lc2wphm1y8qmbphdd";
- "MSTW2008nlo90cl_asmz+90clhalf" = "0743kimz3ljlb921pacw2lii104j0yfvv073wddz89r877np6mi5";
+ "MSTW2008nlo90cl_asmz+90cl" = "19cd358yqklc8bxv0mg69cq3sf6zah7di0q9ilfqbiddmw1flw3p";
+ "MSTW2008nlo90cl_asmz+90clhalf" = "0ngn8f149agvmc54nrxjxqa0rifbd8a1hbcgpa443l75bmd9sqcp";
"MSTW2008nlo90cl_asmz-90cl" = "0fnqj7ywnp9nz5733ggjwmhxpy15zs2xgxjz7ixmql5mmaz3sxb6";
"MSTW2008nlo90cl_asmz-90clhalf" = "1jrp9q8li7a4bwhgh7q9h9zc0sdhck957zn14q9ca9kjsflyb9f5";
"MSTW2008nlo90cl_nf3" = "02ihabrcgp474wkq4w2fshpiqdznjaxyg5vawv52yj6hxifyy5a9";
@@ -383,16 +531,16 @@ in
"MSTW2008nlo_mcrange_fixasmz_nf3" = "0zwnicbmmqbak5sw92njpmvxpjnnhwl1ggvlj8q39hn5w5kdy1kq";
"MSTW2008nlo_mcrange_nf3" = "01mlzqwk30glr95g7n2y3yvvy7s6mkbdb5cqwl1m7k8d6m18n49g";
"MSTW2008nnlo68cl" = "0y6lv1wkhydfnlakjrrrjapxaapa0bcbmfx0w9c4psgy156kv1fv";
- "MSTW2008nnlo68cl_asmz+68cl" = "0ik5c4vcv1ki5cnvnyk381lw36bsqp8mjkzh8ghqjz6z8fr2hb97";
- "MSTW2008nnlo68cl_asmz+68clhalf" = "1d8c0rr3lscin28622f82s79xgbam4qhqkpvvjgynhyn0wy46b4j";
+ "MSTW2008nnlo68cl_asmz+68cl" = "0fhkbkshrc29kz0fc9vi2dqsg6irjm4sfw4sp0s4wkj766wg19nz";
+ "MSTW2008nnlo68cl_asmz+68clhalf" = "1z0fplsv1fij4fgrz7npr34hcmc2qkf7g398bq1smvb6b2qy5jb8";
"MSTW2008nnlo68cl_asmz-68cl" = "1qhjhdzpy67665ccwv0n3g7jlyb2vfk60cphjr0jb1adgv9fxa7q";
"MSTW2008nnlo68cl_asmz-68clhalf" = "0rlsis3r7l32jdiq2yhx1mz7q6qlzlsrarljvrmxf0g0g2d8nr4c";
"MSTW2008nnlo68cl_nf3" = "07nrz7afd1mcsqc3lqv9vk2phs1nfxdl63qh1bc0g7nznxwmmn97";
"MSTW2008nnlo68cl_nf4" = "1kd62hzk2p3q56kj79bs101arp55ajlyhwwa3vq3yp37i3ynz9ds";
"MSTW2008nnlo68cl_nf4as5" = "0x19rq5k9c97vzskqppf4k0fjahwiw2c1nb6iy5c2fq8mj1pz2gj";
"MSTW2008nnlo90cl" = "13xqlfys37b8chinah2yqmzd0clzli06p7vjk30ha22wgwm02dq3";
- "MSTW2008nnlo90cl_asmz+90cl" = "03p1af5962smr5794322gj3s4f0fvnvmfizsabch03ivyaqpr1nq";
- "MSTW2008nnlo90cl_asmz+90clhalf" = "0v99vr5kkgkscqvs8b3ahnvg5yl9rfzgf7hams1j12vjg2b9kd4z";
+ "MSTW2008nnlo90cl_asmz+90cl" = "0pd6imc3hvq7vgyv1db9y8rvpgz4ffwqv6rqzp27c7ipxg0wjyz0";
+ "MSTW2008nnlo90cl_asmz+90clhalf" = "1xn52ppixjg22ybd8ggf0azb3zg5zyilqjss033g0k9crq4a6y2v";
"MSTW2008nnlo90cl_asmz-90cl" = "10wxgh52zs0fp0bwd0b6csnz9x6mvp45gvjhk0y1dhgfwbcvw9y9";
"MSTW2008nnlo90cl_asmz-90clhalf" = "1kmvp1yfgsx4jhsjc4drg82cq4xs6as4grwrymfkrqnvhcg86vap";
"MSTW2008nnlo90cl_nf3" = "0vw0cmszwp49fsskacccl921za88cl5cfy0sqckgxzs4hx21x43n";
@@ -628,96 +776,129 @@ in
"NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg";
"NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq";
"NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk";
- "NNPDF31_lo_as_0118" = "1n3n3irw0lb1vmcr9qxgcd6xj8prdz6xbrrfbx1815avqs1pyb94";
- "NNPDF31_lo_as_0130" = "1amkzj0jcx35zrcwl067zf3sz7h2kanj8q49661ayl8yw2c1ncib";
- "NNPDF31_lo_pch_as_0118" = "02f294h655vn85vqx32hipnmfifal28pn6f18an821jrb72plnzp";
- "NNPDF31_lo_pch_as_0130" = "0qmjfr147zx9hp3znjxd44rx3hz2zwyvs5lbbbd0y0y1argc25dx";
- "NNPDF31_nlo_as_0116" = "0px6id1q66pdn47ja09shn0cbwxzw6sj4r3qfzz30w3srr93i4jd";
- "NNPDF31_nlo_as_0118" = "17avv0qpn7k7lg26rxmcpcrv127w30d20n286vd523b9x6qknkds";
- "NNPDF31_nlo_as_0118_1000" = "1ms69qgi3mhrwi3jxapykfsiqwq3cfpx38jwmsv4pq2g2hhawvfq";
- "NNPDF31_nlo_as_0118_C1p6" = "10y6fb4fmsv7mvsj7zrv6g7x80yxglaq2d0ir4hsn3vs3yqq7r0d";
- "NNPDF31_nlo_as_0118_hessian" = "1jlqbq9wb97l9jhm2r4mkvnhb3vfp0bdhz6lhxnd0a9ipsgmc1wi";
- "NNPDF31_nlo_as_0118_luxqed" = "0zsyp7g93d1z7fpdd5a43i8wd9jfriw2pkligdy78xxlv9zngbkl";
- "NNPDF31_nlo_as_0118_mc" = "0iqk4fq0g4v0khymzab6cxhly7ybxw6f010b5x6ybgw2vzizvmq4";
- "NNPDF31_nlo_as_0118_nf_4" = "0swfqsn68n60r4n3m5szzds8a5pz6p1ad2kkvwawhkgmp2ww0yf7";
- "NNPDF31_nlo_as_0118_nf_6" = "1b44sygil9ngxmdn0273nvh3pzry2k03mkdibf3kfxn5s0ymkl4h";
- "NNPDF31_nlo_as_0120" = "0114g1y2h090137wnhjmycrd67nb8s2gg9byx0j7hm1vy7sajj1j";
- "NNPDF31_nlo_hessian_pdfas" = "0hhm5k3i9ls6fsncfn5cxsx6b1fhb1x581d2cz2balabvby9kf8h";
- "NNPDF31_nlo_pch_as_0116" = "1q037ai33p0p9s9x5vr0p2v3jy0ghrg9djkyimy1lw00cmkj28xc";
- "NNPDF31_nlo_pch_as_0118" = "1sym62b0n1rln2fybpppl8sz555wb6cymr20djrwvs45wdkmbbyz";
- "NNPDF31_nlo_pch_as_0118_1000" = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
- "NNPDF31_nlo_pch_as_0118_hessian" = "0fqkq9jq6l6mfl73ykkn9f6w52wpfys4vqh97ngkm331qkm9y6z8";
- "NNPDF31_nlo_pch_as_0118_mc" = "1q5ihiwzm9vm5v8k47b691cccv0ikvzqahi2vxigqdvhnlq8nrq5";
- "NNPDF31_nlo_pch_as_0118_nf_3" = "040kfq43a1hb5z4inhw1pzqhk62yr0sf1kq32jv1wkbc1524j5gf";
- "NNPDF31_nlo_pch_as_0118_nf_4" = "18vj61dv179ypq3l8wgvc5m0ksc1i6mm3r1jj45bk0dxszlrsrv6";
- "NNPDF31_nlo_pch_as_0118_nf_6" = "02zmby2c6adp1q0kcjx4f3qvabn5qif82q942xnxflgpnpk9qafq";
- "NNPDF31_nlo_pch_as_0120" = "0kgslc183vaxj1fxcwfabs6ah4lx787gi98q02nci010w2zmx7zm";
- "NNPDF31_nlo_pch_hessian_pdfas" = "1bmja7lqdwakqfhf7q72snyjg3qg84xdkwjwmz6lvy75r1810dhl";
- "NNPDF31_nlo_pch_pdfas" = "027prs00nc8laqpjvz20ij5ipzcp291szdpz02aiinf2a5sy2f0j";
- "NNPDF31_nlo_pdfas" = "0d8krd9akg486k8gp1kj4qn4zwy4pjd4j3xz2527a8hkiv99v8bi";
- "NNPDF31_nnlo_as_0108" = "16hhkvmk2cpmqx7jgkh7ckdzas9c6v23l04z7mlnvvc4682n5zvz";
- "NNPDF31_nnlo_as_0110" = "1hznzg01dvpa77nxr11dmqdhwbrj310hhw1h088bz5svfh15ga2r";
- "NNPDF31_nnlo_as_0112" = "0cdjiiniwikkda593sv1lk1wywdxgzfqg5fvhczgwq588xmac2wa";
- "NNPDF31_nnlo_as_0114" = "1q6phbv3w4dsyw0jasbpzid8r39mr8icw4av85dyim4n1ncqag9a";
- "NNPDF31_nnlo_as_0116" = "1fz1h7vd910vm8li56j0w1b5jqalym0zkqv8msr01zyq6dwr1hfj";
- "NNPDF31_nnlo_as_0117" = "181xc88i392rbfwqg1p7imkh71ilbcxdibi1mh0zk4kmnx6sskfp";
- "NNPDF31_nnlo_as_0118" = "1p4idzrg8i67h8anzanizas7a1hkxbhrw7ch6x6d1swbigw40ajf";
- "NNPDF31_nnlo_as_0118_1000" = "1bcjsxnp205v9ipf0j57pfnzl7kd89ds3w0gnjdsq8q86s0c5k23";
- "NNPDF31_nnlo_as_0118_CMSW1" = "0ibgi8jbick51fh3pdnc7zrjsdpjyc3gg2hnm0jmxw3hck7rp2x2";
- "NNPDF31_nnlo_as_0118_CMSW2" = "1h49ygmp58zs0ml1lza6clykhylw4bgvsi6nadwmc2bqs4hqqp8a";
- "NNPDF31_nnlo_as_0118_CMSW3" = "0z4djd7nrkqd55dvswr85l4sphjbrgsh5bslgypbf2axizlscdyc";
- "NNPDF31_nnlo_as_0118_CMSW4" = "13wkx8a4zkivk832f0ng6zq4m9ahka2lm3l6230yicl2fwb9znsx";
- "NNPDF31_nnlo_as_0118_collider" = "00fgz6m8qbhgmvkli8pyh1gsazajqz8cqbad117z1ijvidhdkxs0";
- "NNPDF31_nnlo_as_0118_hessian" = "0rzfcmwadff2p7qk19dj2skd4dpv9z59jmnv51c44yis07fmsjbb";
- "NNPDF31_nnlo_as_0118_luxqed" = "0smmsn2b2lxwzpr4wr5wg4rg8kjy3lz0xhjdwlimv5gmf24dswds";
- "NNPDF31_nnlo_as_0118_mc" = "1nmwb3v0aiqjhhlzlrf9qkydgfhk6lp48ydbvy4w5fnhs4rqas4j";
- "NNPDF31_nnlo_as_0118_mc_138" = "1bv63m9lxxy3mrbmkjbn3jjansghlphxwmqywkcynk6z42krpgdn";
- "NNPDF31_nnlo_as_0118_mc_164" = "1dkj741r29lh1011c8v2d8ax41a9pxvj8ksvz12y18ipf5p0jrnb";
+ "NNPDF31_lo_as_0118" = "1jq8ad68kym717qinwdldvrjnry9sfsfq7lvfv6ipm1sdzixqm96";
+ "NNPDF31_lo_as_0130" = "1lg49cbg43yrpb7fgqfk0d55m28rrw781mks3zn9m24fv0hiyzqp";
+ "NNPDF31_lo_pch_as_0118" = "0xm3fyvrm77hd2layrfwc74vncc470gvf7hx8nzd2sw3ai1g9h7x";
+ "NNPDF31_lo_pch_as_0130" = "18fip94c0ywzj543qq154z2wnllbn8jw61nx6l8v9wmg2sdzi6zi";
+ "NNPDF31_nlo_as_0116" = "0i6bpa2wf52vsc6x5nlsmncal1ghqpsyz7pya2a2zg0k7z6dfcsp";
+ "NNPDF31_nlo_as_0118" = "0vwbgaxs5gj5cnyncmc7m3650pd6bplwdga3fnyy1vrrh3mpsngh";
+ "NNPDF31_nlo_as_0118_1000" = "0ql0phs563ck7bx7cm5x242icfb2jrlsxhsv80m0hxyr3fhyc06h";
+ "NNPDF31_nlo_as_0118_C1p6" = "0nn6krh6vk8rxiwhpnn3nbxian8hw8d1vq31ywh9560hbi3vpcrl";
+ "NNPDF31_nlo_as_0118_hessian" = "10v2ayms2mhm9zi7k0fw9rshawc7njdlbjs8rfg5hiqn1adss4w3";
+ "NNPDF31_nlo_as_0118_luxqed" = "19fdqxfmx8kzcgq13dk4k1nhkgqpnm5xgahp13hwz1i2vcp6xq87";
+ "NNPDF31_nlo_as_0118_mc" = "1yw21cs6p85ij8lm9k0cvlm651a3x9f73f23ysxjgh1r5kqnhz9y";
+ "NNPDF31_nlo_as_0118_nf_4" = "0qywlyd34yqb2r8ch9wjimyfi1jr3rdhxliwrmns0558hbd47a3z";
+ "NNPDF31_nlo_as_0118_nf_6" = "1pb22z2s0ir130dk5pkxwyid37i6mf8jpr7k7nlfi45gl9zy5ldd";
+ "NNPDF31_nlo_as_0120" = "1b5wsab66karm1ay5vxpjw21g2ywhnzqnlahxnvnaf80izha35hl";
+ "NNPDF31_nlo_hessian_pdfas" = "0sxka18qp99gjj9abml2ba4877zavijmjfzg6m0qczx9m8v9m3xg";
+ "NNPDF31_nlo_pch_as_0116" = "1wqpq2qj5czvcj754nd6c7rrss8skjx58vp2gj2bc5n95jv1qazn";
+ "NNPDF31_nlo_pch_as_0118" = "113xpp3xvpfpivlj6p7av4czfbfnh6bk2kd4d2635ddvy0clqkpf";
+ "NNPDF31_nlo_pch_as_0118_1000" = "1sbjqkwq7iy7fnk3r9ga1rzadzy8x3ld933vcih87is09bzg5rfl";
+ "NNPDF31_nlo_pch_as_0118_hessian" = "0xmz2hc3n8alhf210axv3amf7klhbyl1dd1z2yyx6c3pcvcrf80m";
+ "NNPDF31_nlo_pch_as_0118_mc" = "1w1jifp5f7ypf5xqdw1mkx1d6shknryhqzk8rk8naf37bms68mfn";
+ "NNPDF31_nlo_pch_as_0118_nf_3" = "0m7rq7k8x6bsakkw3kmcicq04c39flrw1axv72dqaf9xci9w3pii";
+ "NNPDF31_nlo_pch_as_0118_nf_4" = "0k77chw866shjkc0ml6kb4az75sdcvdd897r8d56jl72d2lkxp3m";
+ "NNPDF31_nlo_pch_as_0118_nf_6" = "0bdc60dxj7jmqacbbaxp2m9qzg82r6pgn7h9pi2k15d07qm6fc4d";
+ "NNPDF31_nlo_pch_as_0120" = "15s1b5w52c3q1nfzckdxmdwrnxw08pprmphc1p33am9v7cwwq2jk";
+ "NNPDF31_nlo_pch_hessian_pdfas" = "0qdswml17bg68y67yw2zbwwp233nxpd1qpc23rqjwyzk2r7qk9bg";
+ "NNPDF31_nlo_pch_pdfas" = "196pcdwsi5p9g88g1c8958qkdj6qmzvl7rsg3j8zll6274m42s4c";
+ "NNPDF31_nlo_pdfas" = "1as7bkp56pwpn2vinxdnhzlnvnxx5ng0mlpmwzz5n7gsinyaz1x9";
+ "NNPDF31_nnlo_as_0108" = "03kg0i43wxf794c4xhvismks6c7nw9hq9ihn58sz628lqcjmsccq";
+ "NNPDF31_nnlo_as_0110" = "04a5gf6nyd58h9sad8zv46vmb074dx7j19r23lbc9w1di23sk104";
+ "NNPDF31_nnlo_as_0112" = "1xkjjm49nlm72f4l3ynrm4g2ayzask22saaf6p1p61lx0jv1hjyd";
+ "NNPDF31_nnlo_as_0114" = "1j4q47qscyw52swmnn0a3lr0avfsjvy20ca50xfhjsvla6wd9lpg";
+ "NNPDF31_nnlo_as_0116" = "1k2d4jzg5jfs6f2mscpvalmh7i5fypx98lnb5wjycprlwd3nr3i9";
+ "NNPDF31_nnlo_as_0117" = "0b6d1xlq4qwjalvrc7ppavw44w5zf0fn3rbsvh3k4qy9r19wk5fb";
+ "NNPDF31_nnlo_as_0118" = "1bw2ksmxdfbwdcimc0ld87hanbqy514sridrcarqwgqh9yv5n0qp";
+ "NNPDF31_nnlo_as_0118_1000" = "026d0xygh046y10jxsfc91hr4qxgark12m393r0afip69dzdsrx0";
+ "NNPDF31_nnlo_as_0118_CMSW1" = "0vqjyziilfzi0gz3a2rv0i6hk3ri3krc2zcdjwfa61z1mg5syi4a";
+ "NNPDF31_nnlo_as_0118_CMSW1_hessian_100" = "1jc8k64pj1mfcw8v9qq9v8m222d09bgfkla7viqzzzbdhy5f6yy1";
+ "NNPDF31_nnlo_as_0118_CMSW2" = "14acp7w3sx5v4ly5wa32vpsk8xw2rh8g5gl7x3f72c0s5jcs4n81";
+ "NNPDF31_nnlo_as_0118_CMSW2_hessian_100" = "0ykaw8x0i6k8vlbms2inm9zm860apsi5mf4wkxha416v4chrpd04";
+ "NNPDF31_nnlo_as_0118_CMSW3" = "1snkandx6apar3sp0c182n770rxn2s64pc07h5k18627cnvpzing";
+ "NNPDF31_nnlo_as_0118_CMSW3_hessian_100" = "03n59yvpgciipkv3k0yr0ab3myhx263n90ah3q3h8hdszkf80ri1";
+ "NNPDF31_nnlo_as_0118_CMSW4" = "1zpnvawdj20izx0mx9a3xz0d0an6i65axbzg5z7fkiq0p09rfx70";
+ "NNPDF31_nnlo_as_0118_CMSW4_hessian_100" = "1qczy2935iq2h4mfq0mv53v2vlfsyvhkff36c5dkdlkrzfkvpl8x";
+ "NNPDF31_nnlo_as_0118_collider" = "1y2axnkjwx7yg301mj1yx1x937j7mhsnbbdpip94pl3vm5hz10dk";
+ "NNPDF31_nnlo_as_0118_hessian" = "0jvzl1bs0mh9c7ypkdgw0s06qn9jkww1d124lc7aq48w1g4n0zyy";
+ "NNPDF31_nnlo_as_0118_luxqed" = "10fwxncr1y7hnja5nxywldpkzrijxz5ayldqjc21jamyhyj3qsh7";
+ "NNPDF31_nnlo_as_0118_mc" = "0sg939j6xn7d5g46547np3123srgz44h9clh29ybl5cnmccv23cl";
+ "NNPDF31_nnlo_as_0118_mc_138" = "1kbxhjzrr4802kcpi7m2g2dx4ywvs9rqjispjwbjc60rqkqispyv";
+ "NNPDF31_nnlo_as_0118_mc_164" = "0i9yxnbps63nz6ala4jk6qmpxlg6p46w6jja8qn73hp0n69w2acz";
"NNPDF31_nnlo_as_0118_mc_hessian_pdfas" = "1b9ijn595qfq32yz9rlnn2br7lssbk8ka39ripfcfyf33v9sv460";
- "NNPDF31_nnlo_as_0118_nf_4" = "11dl3c2anh2v140vn6v4mx9lj65844svsd0f84wng0sngrn6dli9";
- "NNPDF31_nnlo_as_0118_nf_6" = "0s102m1gf8r30g7zy4c91imn26ksj4q600711rgmw2ada1xn87f8";
- "NNPDF31_nnlo_as_0118_noLHC" = "1ypim2zfa2i3r1hcw0j6w9abmxx67g1rhdacsajfp479s68kmi3c";
- "NNPDF31_nnlo_as_0118_noZpt" = "1dx3hlcf8c1a40iyccw84v6f2h5jfyw1pp3n01q2rls9i5b12r15";
- "NNPDF31_nnlo_as_0118_nojets" = "05rkknl44j0pm7kb1l6ihy6rlvwxrkram4sn9zm0za1pv0r9dr6k";
- "NNPDF31_nnlo_as_0118_notop" = "16prpxwn081v63a0pkgjvcizvn33ng5cafv6664yp44j7vbpwi4n";
- "NNPDF31_nnlo_as_0118_proton" = "0xjfambqz14vvg506kj8mqkb37q1bq7m3wgh089fjzq0acrmh9kl";
- "NNPDF31_nnlo_as_0118_wEMC" = "0hkpr14cxgz2r47bfh7k706l22pl6nlhbdqxd7wmrlyrk19vgar3";
- "NNPDF31_nnlo_as_0119" = "13ys6fkvna2i0ifzw2dz3g4jn1zsacslffylrkmj6zxmkc0qganp";
- "NNPDF31_nnlo_as_0120" = "19gszb3kxgwdskabdsk183bdn9b0zyphkk8v1r8s372fg52c8jgg";
- "NNPDF31_nnlo_as_0122" = "1mg40xkp5sb7mpwz420b1mv8cqxldi9rsddnmgdhc5pal5wpgaf6";
- "NNPDF31_nnlo_as_0124" = "1lag0smkh7pjbl449wipn3rq59yi48313xrma531i9ldh68a4ssg";
- "NNPDF31_nnlo_hessian_pdfas" = "0yirp5jhns652a4f2jvhxhvd4y117z3mc5vcd2vsvqyjijx6q0gi";
- "NNPDF31_nnlo_pch_as_0116" = "144bgqmxci7ibwp84kg8a6mw3mwmsilq2ay14y48vsx1ydp56w5q";
- "NNPDF31_nnlo_pch_as_0118" = "1vkpr9js1xwr0g6fz66j2a22b3k5003adf34x0nb6pjm2nxh0njf";
- "NNPDF31_nnlo_pch_as_0118_1000" = "1kwc21p2s383973k5jqciqjpmp4xlvj59zsxjs9nvsywzp9k7vaq";
- "NNPDF31_nnlo_pch_as_0118_hessian" = "18pjqnjkz6jgia5jb4a59s9568yf3b7cp6iqb6fk3xmqlwx5vdd9";
- "NNPDF31_nnlo_pch_as_0118_mc" = "0wyccq58w705ayy5r9fcfnybb9rw43nl46rrnfysi65myqgcfjnc";
- "NNPDF31_nnlo_pch_as_0118_mc_138" = "1rzbff1dmdybkgc5ky7qqcvm5g7npiq4nwjjsq714zajlm0r4y1f";
- "NNPDF31_nnlo_pch_as_0118_mc_164" = "0ymnwm3n45jsxz6dl8ys0p7zswf6w21q3m016lsrcrmyy756c6a5";
- "NNPDF31_nnlo_pch_as_0118_nf_3" = "1hhz6h8mcj6n8309sw5b3w6dinm54hgbxc7c07xjzkb9xmliqwa6";
- "NNPDF31_nnlo_pch_as_0118_nf_4" = "0jldm9dlcngdqcy05y8kjszm8g6s3dvamkz8wh70d260ifh2jb23";
- "NNPDF31_nnlo_pch_as_0118_nf_6" = "0kpnhryf8g0s2ykvbwxiiczycrknbrfsnbs08h1zg0cpq8whljqd";
- "NNPDF31_nnlo_pch_as_0120" = "0bgr66vrjm749pzif53yqq15023yva03x32wkn5gynq083gfdw37";
- "NNPDF31_nnlo_pch_hessian_pdfas" = "1004frva4k0s59naxys505fjc83wkz1andzz5gll6v5flfscfch0";
- "NNPDF31_nnlo_pch_pdfas" = "1p26cb6h1czrdlzk166668900ilzr7r93dmksvc3pqafq2mi80jb";
- "NNPDF31_nnlo_pdfas" = "0d2cv8y23w30cgxs5090ygb614fwrdj0vwh6pjshqv9403maykr8";
+ "NNPDF31_nnlo_as_0118_nf_4" = "0l796ns5xm0biyl0jra5z6y7vddv52v48wlbdywsq54082scfpl0";
+ "NNPDF31_nnlo_as_0118_nf_4_mc_hessian" = "1bw0x75pah1kp387s8m0rv2qc54k5pbncbv507d5278hhfsn68qa";
+ "NNPDF31_nnlo_as_0118_nf_6" = "0dbxxk0p001sk6sb9nf5ipzi39w65vf4c4g8cbhll7p4fqi8f8dy";
+ "NNPDF31_nnlo_as_0118_noLHC" = "18y9mnp1gmvdbikgfdybw8wz2w5x60wk8lya13g7z6nhbfs08qa4";
+ "NNPDF31_nnlo_as_0118_noZpt" = "1jwhkz8b1x6a2qi62jvprcp1rmcq5aq7s31qhw0skcpx8r6r6gnb";
+ "NNPDF31_nnlo_as_0118_nojets" = "1bg714agc25p7zw2yydvl340sns7fhszpbphzap6fc0jsg511zh5";
+ "NNPDF31_nnlo_as_0118_notop" = "1v675r4qk0wz1hg000fw79nmf1zjqi2ghvgjgs7hyzzbh5g4l3ds";
+ "NNPDF31_nnlo_as_0118_proton" = "0ipsp8kk59fb3w9d1y4pq85f4fl6789rypjfbpp44gcy8hzshbm7";
+ "NNPDF31_nnlo_as_0118_wEMC" = "0savd87jahlac4ag3qfamhnpa7mpnm00j104f3ci17gdax1sds50";
+ "NNPDF31_nnlo_as_0119" = "1s7ildlffbh6cpmzlmafxzbbrlgggfqxsv4qic99yvgqvdgqar8w";
+ "NNPDF31_nnlo_as_0120" = "1z6lqcq1dgvqnpwlfymlf9yhcaqc2p8ny7wv4xs57639dsp5xarb";
+ "NNPDF31_nnlo_as_0122" = "0482r1hip6c4kpq24xzi8nw8awky0669k4plgpgv0av12l4bh9c9";
+ "NNPDF31_nnlo_as_0124" = "0cf3djgs4gayzwy8p0qvynripz3hxd3866m8ldlhxnjmcsgcps11";
+ "NNPDF31_nnlo_hessian_pdfas" = "1m5wdnj7hvg2a51w1qmhm934glhjf9db0x5nry5blp90y5x0v185";
+ "NNPDF31_nnlo_pch_as_0116" = "1i8yzqywg4hcf53vcp25fg8llybis3pz6xbp5ajpyjvrvsgii1pc";
+ "NNPDF31_nnlo_pch_as_0118" = "01rsx0ss67772b20dnnw463328pgbd57d8zcj3lqymlb4a6fq8f7";
+ "NNPDF31_nnlo_pch_as_0118_1000" = "187xkvp7y1wssgpb21r1w4yxn6m1280jac9nmiavrma06jfd57c1";
+ "NNPDF31_nnlo_pch_as_0118_hessian" = "0fs5d450hc15hqs6xv9nxfsnhwszmg9ybjypgwa9kn4s4kkaz1wl";
+ "NNPDF31_nnlo_pch_as_0118_mc" = "06vgb01l1yigln7cn9y3lslg35grwvydpd8g04xn4pj4pj2vjrs0";
+ "NNPDF31_nnlo_pch_as_0118_mc_138" = "0za3v1mg8gb631039kg5mkr9zhn390dkyim9p663srpk85j7h5g5";
+ "NNPDF31_nnlo_pch_as_0118_mc_164" = "1xc02sbmhyjr4gjwim4p0gg90zh26zdmnz89395pxzbq2navcraz";
+ "NNPDF31_nnlo_pch_as_0118_nf_3" = "14xb6m1wqc5f7xjiklwnshn7ljrlg6kmbzr2rib44pgbj6pnl2xn";
+ "NNPDF31_nnlo_pch_as_0118_nf_4" = "1sg823n82j9ijqx4ldysh0g53pjzn4sysvag837ywfyns4p5qy9k";
+ "NNPDF31_nnlo_pch_as_0118_nf_6" = "14ls2yd1n2pqvdvq18qmhizms3a8pwqvksdkvwn0m1379lkss106";
+ "NNPDF31_nnlo_pch_as_0120" = "09zc56cmpj9iw0qp2bm9a8d86r0mdagg1vrpf2xqza4fr841r5km";
+ "NNPDF31_nnlo_pch_hessian_pdfas" = "08baysni2lhbpr1scx7h0zf64gyncj2ahcv4y86142gl4zqrafvp";
+ "NNPDF31_nnlo_pch_pdfas" = "09mw3gr7dz0vwdnralaplvlz2c464lmdizf673xsb0wlm12pqf6g";
+ "NNPDF31_nnlo_pdfas" = "0l92q3xhdk5nrnhkmrirxnvplj531rdpnblnacd759cl4hgxcs2q";
"NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8";
"NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8";
- "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72";
- "PDF4LHC15_nlo_30_pdfas" = "0xi4xydx0x4ina0wmqv9jf4978xhd8x0l91dwfxh5vy39r5x4lm4";
"PDF4LHC15_nlo_100" = "0m9d4zy7608iryqy1ypgkr1d3yhw2wv1nrrc70zrfih7x0fp7lz7";
"PDF4LHC15_nlo_100_pdfas" = "05wyqyh9y32sxflq69igcnnsl0ifnkyw3vnnnjn6kscl8h8hs7lp";
+ "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72";
+ "PDF4LHC15_nlo_30_pdfas" = "0xi4xydx0x4ina0wmqv9jf4978xhd8x0l91dwfxh5vy39r5x4lm4";
"PDF4LHC15_nlo_asvar" = "14hdgj5g8ia7y6hi40zbh925dacrk7hd6cli6lkhlqzxl755nbs3";
"PDF4LHC15_nlo_mc" = "09p7y0z04r6wdkf8gi3yj85qk5hmp0mmhab8c7a7lly4731fyf42";
"PDF4LHC15_nlo_mc_pdfas" = "0sds9rkvbjkk7pardwq959qqbrvgwswxmsqcfppky2p0qmdsjs0s";
"PDF4LHC15_nlo_nf4_30" = "1ysy6dqlacg4bwb2f16p1aza5gwm9qnhmc0g0mhsdw4d2i4ml5yg";
- "PDF4LHC15_nnlo_30" = "10cm4wa0mk34rnvsr5q8g9w7fs9cblsryms2nl370wdvcrhzsxph";
- "PDF4LHC15_nnlo_30_pdfas" = "13xln0y8l0qcj9951glj4f1kqfaagj8gwkxzlvdkgjnj1scdy6yj";
"PDF4LHC15_nnlo_100" = "1gcq3qrf39dhq2pmpjrj3z0i0ycrk76mjdwmgfvzdxysp530ax54";
"PDF4LHC15_nnlo_100_pdfas" = "16r8far43ymsd64a4bbqlj56qvbjmcyxbawv4lkfxysjvbydxj4w";
+ "PDF4LHC15_nnlo_30" = "10cm4wa0mk34rnvsr5q8g9w7fs9cblsryms2nl370wdvcrhzsxph";
+ "PDF4LHC15_nnlo_30_pdfas" = "13xln0y8l0qcj9951glj4f1kqfaagj8gwkxzlvdkgjnj1scdy6yj";
"PDF4LHC15_nnlo_asvar" = "03fh1jcbmvla7n2jj3zq4ibwvq66h0rniply7h93d94zawcgsy4v";
"PDF4LHC15_nnlo_mc" = "0c6nfkv3x1p5iw514knjvqcs1dcaryf74qqg1za8x234yr5ndi3p";
"PDF4LHC15_nnlo_mc_pdfas" = "0l8hlcz69cdii7mpgargi9nsx7iy746nad5pnn7pvycrc40marij";
+ "TUJU19_nlo_119_50" = "1q1dhsxz1kq75rpzv6gg6p6bzvvv0d44pc4y3wsiy9g14aff85vq";
+ "TUJU19_nlo_12_6" = "006j6y4xbjss9apzagjcc3r1z6s61a1hzafhcyriiffqhn8bg50k";
+ "TUJU19_nlo_131_54" = "0ymf35alyar6fwagmdny2zz2aag576f38kail7gh2lvqpmjmv6np";
+ "TUJU19_nlo_197_79" = "0rq57sjcwljz8fz2m5bz0hm1670jp080zawmavmagmzvmyxbpnpj";
+ "TUJU19_nlo_1_1" = "0fp4syfjgl0y58hrr3g515j96yp7ncbrnzj1h7i5h3fphxzayhcz";
+ "TUJU19_nlo_208_82" = "16g5fjpa1r6pml6jnmzikwafdc0vgj8j3b0ivjz0bsqxms66msg9";
+ "TUJU19_nlo_27_13" = "1ffipy7g22mjbhy7wpjipfka84k4iw52bni4gw2a6aan5qljlcii";
+ "TUJU19_nlo_2_1" = "1l17drwy3vv8s7g9fdivxs2z6m88h7fpamnr5y0y6nbkh6bja2s6";
+ "TUJU19_nlo_3_2" = "1qm010yjnj9amj2j89v6s5s42q18q8b6md35c9mbv88ibqbsdnvn";
+ "TUJU19_nlo_40_20" = "0xylrincss1ijkfxnk7hl72c1rzpzm14hcarddh9pd57z7i1gv4c";
+ "TUJU19_nlo_4_2" = "0adqxh47pnhgmq9r89wcqaldfrqll5gpjzqncqd5ba8301i3d98m";
+ "TUJU19_nlo_56_26" = "04q8c3gkbxib5fz20f7rwn33sqapcmsj6fwwihi6ca8n1rl6hw6h";
+ "TUJU19_nlo_64_29" = "1yyl70v8s16s2v630wamyfk8lwdw53cbp5hipgwdw1sfs33pj1mj";
+ "TUJU19_nlo_7_3" = "17qfnf8bv6c5q6xkl68c6n1gxp81gang5w71gvn9m5d6pn2wiicj";
+ "TUJU19_nnlo_119_50" = "186fja2z84csh6zsp0lpy5mch5swmwaf7mvq8kf073jxlrkrws42";
+ "TUJU19_nnlo_12_6" = "0k5q6a8jidhmnjgll1l71dxx85lzd7w4v9bsmi42qladkd71vblv";
+ "TUJU19_nnlo_131_54" = "0inwqb1v390xkjzhc7gy4hng07jzbbhpq99f4zpkzx115xs57l74";
+ "TUJU19_nnlo_197_79" = "09c9b1kqzw28rqgxfxq2mvwna8yb6f2y90332f05jpvfk3mmr7n2";
+ "TUJU19_nnlo_1_1" = "0qmvcbsyi333b9dd42xjdq62a7dfa3hvfcbk48fg4m179mzhp588";
+ "TUJU19_nnlo_208_82" = "1xpwnl342g8ahhp3lm7p2xhzlx5qzhjvz6g1w1nqrd818w3994zn";
+ "TUJU19_nnlo_27_13" = "18fsbp1nh4zx2wgg9r7ian0mvhvf4y8ssqv33vqvn0vwk7gqw7jf";
+ "TUJU19_nnlo_2_1" = "1p0b74w1a9906lqbxbc8dkk5bcdhnbqc82lnhsr4qfi8sxih2l9i";
+ "TUJU19_nnlo_3_2" = "132w4cv8r7958sad6jakfppsywifwzzacsfyn81qvv76xzc2hm3w";
+ "TUJU19_nnlo_40_20" = "0fkbwxh0smj1icjfn58fsfh52ny35pmqjs7cs3qnw6dk5p95qx6k";
+ "TUJU19_nnlo_4_2" = "12vm0dl8ylz38zzi6rsyy24h3yg30nq6l464nl5fr6jdkvkbz2f0";
+ "TUJU19_nnlo_56_26" = "1kqc6v6qq6wl3nls31gn5nrzwfl9kshm2bbak771c3xvjsgvjpdy";
+ "TUJU19_nnlo_64_29" = "166k8swsysr7x5rgivi6k04q4p8njb2ny7xj7xjqhkgxrznc8jzq";
+ "TUJU19_nnlo_7_3" = "0q9vswr0s3k15abghx3cccf1ays0601n1438pwqgd5xz8981ngm5";
"abkm09_3_nlo" = "0h268l7j1zkxm2nacari10f86lpha511xhgrg0q9r8hc47sw2vxs";
"abkm09_3_nnlo" = "1gzhvblckskscql53pfxp79qclhhhhm45sqjhc9jrm1bp3x52w8i";
"abkm09_4_nlo" = "0yq3gy0qgnk5dh0hh3ldrf5bqzx5wpkhw509nvz5arlh0bfwhyg4";
@@ -736,6 +917,7 @@ in
"abm12lhc_4_nnlo" = "1hciv1z9b5fiz7swv21gr0rshijj9yj2n8x4l54v9g0jyd061jaz";
"abm12lhc_5_nnlo" = "00xxkrhbfkxhg33mkpwwk5nsdp4nmi0zmllx5z5ygxl24rinsq9j";
"cteq6" = "0lp110wldhliad354v29f0rhdzf5qrs1ibklj0cmzp2rcbp8zrix";
+ "cteq61" = "14hbc855b3wsjk7ypg86md46cjm1bj7n4hins9nr8kgzs69i6vss";
"cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y";
"cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap";
"nCTEQ15FullNuc_108_54" = "107klcpsr9d4dwavcqqs3849k90mdb3bdjam3pd79cmsy7ncr2hf";
@@ -830,4 +1012,56 @@ in
"nCTEQ15np_7_3" = "0ndqi05g88b769p1chfc6maz6wvs33rx45r4k8f68n79yy6kvrh1";
"nCTEQ15np_84_42" = "0v968jw1m9ky1mh82w1bjidvg7r7cx23bnpv0vr4c1kqz0n5hb5s";
"nCTEQ15np_9_4" = "0akxbyrs4y8gmnjiwma8z8ryrzmaw6dj148iq7ihsllwar3hp3p0";
+ "nNNPDF10_nlo_as_0118_Ag108" = "1xqhzgvkicxd9wy4lnhqw6brsksxqsq429r6bb0ghn1ll5ln4qzx";
+ "nNNPDF10_nlo_as_0118_Al27" = "0z836h7a5abbwq988zdvvf8yhr92krzzmys6lkkgkcffdf2pc0zq";
+ "nNNPDF10_nlo_as_0118_Au197" = "1f6vn6n0zz8wml8zn7n2n6wj5y41yanw9b9av51m5kiq4n1r9lrk";
+ "nNNPDF10_nlo_as_0118_Be9" = "1jy2cix4gkx648dypdqfj7xi8gdlflh20xlasmwl78av5j7s7rs5";
+ "nNNPDF10_nlo_as_0118_C12" = "1c6fvp82cs3464akqf0skrqpcvyp75yqp39zxafzgbqd4wc3pv9f";
+ "nNNPDF10_nlo_as_0118_Ca40" = "0r903a01085yhfagnljvjaqfn190r3q0ggvx87kh54xsbv1wkvbl";
+ "nNNPDF10_nlo_as_0118_Cu64" = "1vq8a6drcp606fkx8mml2qq37if59cakmcq73y4n7c7swp6q51r3";
+ "nNNPDF10_nlo_as_0118_D2" = "07kjzhyh6n6723h2fylgwm7w7ljxz4m6fs9bgwjxp987i00msrra";
+ "nNNPDF10_nlo_as_0118_Fe56" = "1smkjmymykhlp0vvlpsp6p6p44pw5aa705sw9lcyxmg8ccy9kmpj";
+ "nNNPDF10_nlo_as_0118_He4" = "0mdxsh41m0vzcdq4axvz81m9ra0p6dff88k09gjb4adx9vv52mjc";
+ "nNNPDF10_nlo_as_0118_Li6" = "1hrryxhhg9xxg817brrd39k5wz6iq1fv6z8sdabrpxn0nwr1bj7r";
+ "nNNPDF10_nlo_as_0118_N1" = "01h7g4w3nc09jyi7g8j5yx2yzqair3ysbx9rx244k1rjx6jppian";
+ "nNNPDF10_nlo_as_0118_N14" = "1ny3znivkkl7xhdw8pxkdadwc957236rh60wviiyw4cdqjb6a3iq";
+ "nNNPDF10_nlo_as_0118_Pb208" = "066w59xm6lkwrm3glssc6n3qyvv38mx47mkx39p8z9r2spb8igks";
+ "nNNPDF10_nlo_as_0118_Sn119" = "1mqx7wj095v0799wxbvfxvb6bl1qh5wdkf14a8gqsj0f5qjnpmyw";
+ "nNNPDF10_nlo_as_0118_Xe131" = "0mz9fgxfyx1asi2vxs1xfwn8z51z08naiq1ycl77f4yp6wim6s54";
+ "nNNPDF10_nnlo_as_0118_Ag108" = "08vy16fskrvc62y3h0hsikmi6q86njwfm2msmajxbd7vzcv5wkkn";
+ "nNNPDF10_nnlo_as_0118_Al27" = "0vm95lawgsncsx10ypy99746sz34y6shblkj9pgn6si2cy8gpcwp";
+ "nNNPDF10_nnlo_as_0118_Au197" = "0b3ld033f2hwjaqp5p5pzmmzfid8hl416a1q8fc0zmd2lfiamsac";
+ "nNNPDF10_nnlo_as_0118_Be9" = "10skffir8hqfv2wj01ghc14lfs516kmh59q3v48nw3a724kxr93a";
+ "nNNPDF10_nnlo_as_0118_C12" = "12rrpcq9bvwcncj1hk28wkym5zzdjkf0d0pdj1nx9asm6vpbjsdv";
+ "nNNPDF10_nnlo_as_0118_Ca40" = "0k914fnqsv45f16s6zmdwbnbnhj5lxnrk9pbnnaap4vk7vx7101j";
+ "nNNPDF10_nnlo_as_0118_Cu64" = "137n1nsq75g0n4hmbqfl1gihngfrz0rqd2gwj24m5byhbylwlg83";
+ "nNNPDF10_nnlo_as_0118_D2" = "0xa17gjjh0mphg1h711vb6p2pjln0lqy7401lamnib2z7p7mss0m";
+ "nNNPDF10_nnlo_as_0118_Fe56" = "0h0qwbckdcppqgbhfy3kyy9p4nryh3p45sjmlxhm94mlznipjwrd";
+ "nNNPDF10_nnlo_as_0118_He4" = "022h44i8k2ybvm9lkgc4lkcv4z7r0xzlrq2bxyqkfmpp5fpp7gkw";
+ "nNNPDF10_nnlo_as_0118_Li6" = "11bci8mnv57a583ayrpvvnz4lsxz43z23iqgqjc3b3rychgiz57a";
+ "nNNPDF10_nnlo_as_0118_N1" = "174gscxa2acqpgf2mks5xpim1jcpb0vg76pggxazm376vyyjk883";
+ "nNNPDF10_nnlo_as_0118_N14" = "1g2gwnbfzlfa094px1rnjgk8py8qzwq7bi68n7p49bqjj88km3av";
+ "nNNPDF10_nnlo_as_0118_Pb208" = "0bdi3z36ckf788v3ld3ngvchyxzsxcfl9fj7rzs2lwkg80rclgd9";
+ "nNNPDF10_nnlo_as_0118_Sn119" = "0k7lnr1ils38sqybipmf13n582wb0cf9rr288ibrbmx15rkk5c3w";
+ "nNNPDF10_nnlo_as_0118_Xe131" = "17k1afk6j53nl83ixyy6nyds3wy5agacdyn62bwp7ykfs8x97s4n";
+ "nNNPDF20_nlo_as_0118_Ag108" = "1fb2h6752vn0v66h12dhhk2izxjs4b10mdqx17djrvpkzl97hf8d";
+ "nNNPDF20_nlo_as_0118_Al27" = "1lfkg84hf0chgk0qzp45ch23pzjixkzxxh3x7xphcmnpri4cgl3r";
+ "nNNPDF20_nlo_as_0118_Au197" = "08ll61b96iggm1qnr9q2qdzyxasxn9mlshnxz7kzigfsnqqnkfbw";
+ "nNNPDF20_nlo_as_0118_Be9" = "1g4vlr9p6i6n87bx6w2i5d4qkhymldkyxj1i2qnl8v467vhsz6la";
+ "nNNPDF20_nlo_as_0118_C12" = "15366p04rh31nnd6zxcmcs9ki5fwzn8d8cvzms45apnw928k6pqn";
+ "nNNPDF20_nlo_as_0118_Ca40" = "1abxkr4r5psi6n8rrsbf97gwwkh1dg9jqfd46hn2725r22c6k8l4";
+ "nNNPDF20_nlo_as_0118_Cu64" = "1nkkiwx22b649pmyfykn2ggdq99y985mnkv3fnkm8i43scwbswvb";
+ "nNNPDF20_nlo_as_0118_D2" = "0gvf9qqgr4ixm9cf2654xyvkc624k5ijqwdds61frljlhd49yqm1";
+ "nNNPDF20_nlo_as_0118_Fe56" = "1ci132hc8mpsj0zjr9fichnkapagjs6q9pqli0yzgnnv6l2aih3a";
+ "nNNPDF20_nlo_as_0118_He4" = "1phq7m6lbx87s4whs2xygigq7fz1qhzj3nd9anx5r67w7q99rcad";
+ "nNNPDF20_nlo_as_0118_Li6" = "0pwdqrmivpm0j7hrg6h2qqshpna2vjlslxnz0sd100kc3lfq7xab";
+ "nNNPDF20_nlo_as_0118_N1" = "09y7pd3nnys49w25gb4524x5xkahillvaypjgncbn8n5x1a11nsr";
+ "nNNPDF20_nlo_as_0118_N14" = "0nb3kcmhbyncp9frs27ww550mjl3f7yiahyyrm3aik93ycpm16n7";
+ "nNNPDF20_nlo_as_0118_O16" = "12kfhldvg8gqxjaian14dng6qqc6nikydwcj5jz2i2d1da3dyhgg";
+ "nNNPDF20_nlo_as_0118_Pb208" = "1rwb7vca0y1aj38mz8m3wg07q9hq66qd5j3y6hs9bh0jz6hkifzh";
+ "nNNPDF20_nlo_as_0118_Sn119" = "1dan86ckd5padipp4x12x8msfg5p97b8hwxm78gfyf88kq725m6z";
+ "nNNPDF20_nlo_as_0118_W184" = "1g0br4gdrb2vzwmqhgj5778a6vl0lykc4ymylibxlqbqrhf8j89b";
+ "nNNPDF20_nlo_as_0118_Xe131" = "1a62qi3qy5kli9q80p2w80mj5v3ps2g6p40zxlgm65q5mphkx1qi";
+ "xFitterPI_NLO_EIG" = "1v6mfhmcrmdvica0wlc2ilfca1srxc7vjyli113wjvpd7wfpnvj5";
+ "xFitterPI_NLO_VAR" = "09mlsww89hhm2s96rlkqbkfwwf9qkblw7n3nnrgas6l1kn2hxq1i";
}
diff --git a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
index ce1085f37f7f..a4fb8b41e7a1 100644
--- a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
+++ b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
@@ -1,19 +1,19 @@
diff --git a/meson_options.txt b/meson_options.txt
-index a6c8af72..8e5c3d73 100644
+index e2a1e028..310029f2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,6 +10,9 @@ option('media-session',
description: 'Build and install pipewire-media-session',
- type: 'boolean',
- value: true)
+ type: 'feature',
+ value: 'auto')
+option('media-session-prefix',
+ description: 'Install directory for pipewire-media-session and its support files',
+ type: 'string')
option('man',
description: 'Build manpages',
- type: 'boolean',
+ type: 'feature',
diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
-index 4a70b0b0..84c9a19e 100644
+index 5c4d1af0..7296220f 100644
--- a/src/daemon/systemd/user/meson.build
+++ b/src/daemon/systemd/user/meson.build
@@ -10,7 +10,7 @@ install_data(
diff --git a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch
index 2a92711626bf..cb695fa398ca 100644
--- a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch
+++ b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch
@@ -1,29 +1,29 @@
diff --git a/meson.build b/meson.build
-index ffee41b4..bab6f019 100644
+index 97d4d939..b17358e5 100644
--- a/meson.build
+++ b/meson.build
-@@ -318,8 +318,8 @@ alsa_dep = (get_option('pipewire-alsa')
- ? dependency('alsa', version : '>=1.1.7')
- : dependency('', required: false))
-
+@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd'
+
+ alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa'))
+
-installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name)
-installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name)
+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', pipewire_name)
+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', pipewire_name)
- installed_tests_enabled = get_option('installed_tests')
+ installed_tests_enabled = not get_option('installed_tests').disabled()
installed_tests_template = files('template.test.in')
-
+
diff --git a/meson_options.txt b/meson_options.txt
-index f03033c3..32df6c53 100644
+index fba0d647..8c6106cd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-@@ -18,6 +18,9 @@ option('installed_tests',
+@@ -26,6 +26,9 @@ option('installed_tests',
description: 'Install manual and automated test executables',
- type: 'boolean',
- value: false)
+ type: 'feature',
+ value: 'disabled')
+option('installed_test_prefix',
+ description: 'Prefix for installed tests',
+ type: 'string')
option('gstreamer',
description: 'Build GStreamer plugins',
- type: 'boolean',
+ type: 'feature',
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 5c5578abc8df..955a4d9da6e3 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -39,11 +39,11 @@ let
fontDirectories = [];
};
- mesonBool = b: if b then "true" else "false";
+ mesonEnable = b: if b then "enabled" else "disabled";
self = stdenv.mkDerivation rec {
pname = "pipewire";
- version = "0.3.23";
+ version = "0.3.24";
outputs = [
"out"
@@ -61,7 +61,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
- hash = "sha256:1HMUrE1NBmrdBRMKX3LRlXaCEH3wqP2jGtW8Rp9oyQA=";
+ hash = "sha256:PcY20FTtUtJYAwCscEs+HfkdwDksYPFZIVTVORP1ooI=";
};
patches = [
@@ -103,22 +103,23 @@ let
++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ];
mesonFlags = [
- "-Ddocs=true"
- "-Dman=false" # we don't have xmltoman
- "-Dexamples=${mesonBool withMediaSession}" # only needed for `pipewire-media-session`
+ "-Ddocs=enabled"
+ "-Dman=disabled" # we don't have xmltoman
+ "-Dexamples=${mesonEnable withMediaSession}" # only needed for `pipewire-media-session`
"-Dudevrulesdir=lib/udev/rules.d"
- "-Dinstalled_tests=true"
+ "-Dinstalled_tests=enabled"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
"-Dpipewire_pulse_prefix=${placeholder "pulse"}"
"-Dmedia-session-prefix=${placeholder "mediaSession"}"
"-Dlibjack-path=${placeholder "jack"}/lib"
- "-Dgstreamer=${mesonBool gstreamerSupport}"
- "-Dffmpeg=${mesonBool ffmpegSupport}"
- "-Dbluez5=${mesonBool bluezSupport}"
- "-Dbluez5-backend-hsp-native=${mesonBool nativeHspSupport}"
- "-Dbluez5-backend-hfp-native=${mesonBool nativeHfpSupport}"
- "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}"
- "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}"
+ "-Dlibcamera=disabled"
+ "-Dgstreamer=${mesonEnable gstreamerSupport}"
+ "-Dffmpeg=${mesonEnable ffmpegSupport}"
+ "-Dbluez5=${mesonEnable bluezSupport}"
+ "-Dbluez5-backend-hsp-native=${mesonEnable nativeHspSupport}"
+ "-Dbluez5-backend-hfp-native=${mesonEnable nativeHfpSupport}"
+ "-Dbluez5-backend-ofono=${mesonEnable ofonoSupport}"
+ "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}"
"-Dpipewire_config_dir=/etc/pipewire"
];
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index f3fae283e87c..fd2a8ab92cfa 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
- version = "21.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
+ version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
- sha256 = "sha256-AW3eNOX4aOqYoyypm2QzJaloIoFQCUK3ET9OyI0g4vM=";
+ sha256 = "sha256-XBR1nJmJHm5HKs7W1fD/Haz4XYDNkCbTZcVcZT7feSw=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/prime-server/default.nix b/pkgs/development/libraries/prime-server/default.nix
index e50b855dddd4..4f30a9f005c9 100644
--- a/pkgs/development/libraries/prime-server/default.nix
+++ b/pkgs/development/libraries/prime-server/default.nix
@@ -3,19 +3,22 @@
stdenv.mkDerivation rec {
pname = "prime-server";
- version = "0.6.7";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "kevinkreiser";
repo = "prime_server";
rev = version;
- sha256 = "027w3cqfnciyy2x78hfclpb77askn773fab37mzwf6r3mcc7vyl5";
+ sha256 = "0izmmvi3pvidhlrgfpg4ccblrw6fil3ddxg5cfxsz4qbh399x83w";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ curl zeromq czmq libsodium ];
+ # https://github.com/kevinkreiser/prime_server/issues/95
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-variable" ];
+
meta = with lib; {
description = "Non-blocking (web)server API for distributed computing and SOA based on zeromq";
homepage = "https://github.com/kevinkreiser/prime_server";
diff --git a/pkgs/development/libraries/protobuf/3.15.nix b/pkgs/development/libraries/protobuf/3.15.nix
new file mode 100644
index 000000000000..63e175d98038
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.15.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+ version = "3.15.5";
+ sha256 = "1znxzy4illsr4a08642h6s83jawzrq40m6pzkp05q0cpm8hcpvda";
+}
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index 150005646379..1c06020653ec 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,20 +1,33 @@
-{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config }:
+{ fetchFromGitHub
+, lib
+, stdenv
+, cmake
+}:
stdenv.mkDerivation rec {
pname = "libupnp";
- version = "1.14.0";
+ version = "1.14.1";
+
+ outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "mrjimenez";
repo = "pupnp";
rev = "release-${version}";
- sha256 = "1wp9sz2ld4g6ak9v59i3s5mbsraxsphi9k91vw9xgrbzfmg8w0a6";
+ sha256 = "sha256-QWwgtfgO+7zGW1M5qdfrIilVw6D/A/Er3l2bZ8V35kE=";
};
- outputs = [ "dev" "out" ];
- nativeBuildInputs = [ autoreconfHook pkg-config ];
+ nativeBuildInputs = [
+ cmake
+ ];
- hardeningDisable = [ "fortify" ];
+ postPatch = ''
+ # Wrong paths in pkg-config file generated by CMake
+ # https://github.com/pupnp/pupnp/pull/205/files#r588946478
+ substituteInPlace CMakeLists.txt \
+ --replace '\''${exec_prefix}/' "" \
+ --replace '\''${prefix}/' ""
+ '';
meta = {
description = "An open source UPnP development kit for Linux";
@@ -26,9 +39,9 @@ stdenv.mkDerivation rec {
UPnP Device Architecture Specification.
'';
- license = "BSD-style";
+ license = lib.licenses.bsd3;
- homepage = "http://pupnp.sourceforge.net/";
+ homepage = "https://pupnp.github.io/pupnp/";
platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix
index 0fe0806b1ebe..2be89b3b7534 100644
--- a/pkgs/development/libraries/python-qt/default.nix
+++ b/pkgs/development/libraries/python-qt/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "all" ];
- nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools ];
+ nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ];
- buildInputs = [ python unzip ];
+ buildInputs = [ python ];
qmakeFlags = [ "PythonQt.pro"
"INCLUDEPATH+=${python}/include/python3.6"
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 9613eed28743..617b2c1d9d23 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -90,11 +90,7 @@ qtModule {
'' else ''
substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
--replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
- '')
- + ''
- substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \
- --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]'
- '');
+ ''));
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
# with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
@@ -190,6 +186,7 @@ qtModule {
buildInputs = optionals stdenv.isDarwin (with darwin; [
cups
+ apple_sdk.libs.sandbox
# `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py`
# to get some information about the host platform.
@@ -205,15 +202,8 @@ qtModule {
shift
done
'')
-
- # For sandbox.h include
- (runCommand "MacOS_SDK_sandbox.h" {} ''
- install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h
- '')
]);
- __impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib";
-
dontUseNinjaBuild = true;
dontUseNinjaInstall = true;
dontUseXcbuild = true;
diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix
index da56c07779b9..b4a201c08cc4 100644
--- a/pkgs/development/libraries/qt-5/qt-env.nix
+++ b/pkgs/development/libraries/qt-5/qt-env.nix
@@ -5,7 +5,7 @@ buildEnv {
paths = [ qtbase ] ++ paths;
pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" ];
- extraOutputsToInstall = [ "dev" ];
+ extraOutputsToInstall = [ "out" "dev" ];
postBuild = ''
rm "$out/bin/qmake"
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index 4587bf461624..85468bd4f183 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,7 +1,8 @@
-{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }:
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, gtk2 }:
mkDerivation {
- name = "qtstyleplugins-2017-03-11";
+ pname = "qtstyleplugins";
+ version = "unstable-2017-03-11";
src = fetchFromGitHub {
owner = "qt";
@@ -10,7 +11,18 @@ mkDerivation {
sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy";
};
- patches = [ ./fix-build-against-Qt-5.15.patch ];
+ patches = [
+ (fetchpatch rec {
+ name = "0001-fix-build-against-Qt-5.15.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins";
+ sha256 = "j0CgfutqFawy11IqFnlrkfMsMD01NjX/MkfVEVxj1QM=";
+ })
+ (fetchpatch rec {
+ name = "0002-fix-gtk2-background.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins";
+ sha256 = "qUOkNckrSUEzXY1PUZKfbiCjhNyB5ZBw2IN/j32GKM4=";
+ })
+ ];
nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [ gtk2 ];
diff --git a/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch b/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch
deleted file mode 100644
index 7eb744158204..000000000000
--- a/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt
-Date: Thu, 28 May 2020 12:35:42 +0200
-Subject: [PATCH] fix build against Qt 5.15
-
-With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application
-palette handling between QGuiApplication and QApplication")
-QApplicationPrivate::setSystemPalette is no longer used and necessary.
----
- src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++
- src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
-index 36169c9..2544593 100644
---- a/src/plugins/styles/gtk2/qgtkstyle.cpp
-+++ b/src/plugins/styles/gtk2/qgtkstyle.cpp
-@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app)
- // not supported as these should be entirely determined by
- // current Gtk settings
- if (app->desktopSettingsAware() && d->isThemeAvailable()) {
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- QApplicationPrivate::setSystemPalette(standardPalette());
-+#endif
- QApplicationPrivate::setSystemFont(d->getThemeFont());
- d->applyCustomPaletteHash();
- if (!d->isKDE4Session())
-diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-index e57b3d8..e71beb0 100644
---- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-+++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme()
- if (oldTheme != QGtkStylePrivate::getThemeName()) {
- oldTheme = QGtkStylePrivate::getThemeName();
- QPalette newPalette = qApp->style()->standardPalette();
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- QApplicationPrivate::setSystemPalette(newPalette);
-+#endif
- QApplication::setPalette(newPalette);
- if (!QGtkStylePrivate::instances.isEmpty()) {
- QGtkStylePrivate::instances.last()->initGtkWidgets();
---
-2.26.2
-
diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix
index e5fad490f6ed..1f2518fc7380 100644
--- a/pkgs/development/libraries/qwt/6.nix
+++ b/pkgs/development/libraries/qwt/6.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
stdenv.mkDerivation rec {
- name = "qwt-6.1.5";
+ name = "qwt-6.1.6";
src = fetchurl {
url = "mirror://sourceforge/qwt/${name}.tar.bz2";
- sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0";
+ sha256 = "sha256-mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY=";
};
propagatedBuildInputs = [ qtbase qtsvg qttools ];
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 7a9818bce97d..0d7483d3c2e3 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }:
+{ lib, stdenv, fetchFromGitHub, zlib, pkg-config, python3, openssl }:
stdenv.mkDerivation rec {
pname = "rdkafka";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-EoNzxwuLiYi6sMhyqD/x+ku6BKA+i5og4XsUy2JBN0U=";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config python3 ];
- buildInputs = [ zlib perl python openssl ];
+ buildInputs = [ zlib openssl ];
NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix
index bc82e95be713..eb3d7629a4ea 100644
--- a/pkgs/development/libraries/redkite/default.nix
+++ b/pkgs/development/libraries/redkite/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "redkite";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
- sha256 = "16j9zp5i7svq3g38rfb6h257qfgnd2brrxi7cjd2pdax9xxwj40y";
+ sha256 = "sha256-bf8kz9RyhDDuUHKiKvLiQLBIEXbIyoy3yuKfSpSYYv0=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix
index 5b73bc41475d..69ec01747484 100644
--- a/pkgs/development/libraries/resolv_wrapper/default.nix
+++ b/pkgs/development/libraries/resolv_wrapper/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, cmake, pkg-config }:
stdenv.mkDerivation rec {
- name = "resolv_wrapper-1.1.6";
+ name = "resolv_wrapper-1.1.7";
src = fetchurl {
url = "mirror://samba/cwrap/${name}.tar.gz";
- sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa";
+ sha256 = "sha256-Rgrn/V5TSFvn3ZmlXFki8csWNrnoghmB1JrRZQfIoHQ=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix
index 278fdecc1a67..c93ea5ba78ba 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 = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "ROCclr";
rev = "rocm-${version}";
- hash = "sha256-B27ff1b9JRhxFUsBt7CGuYaR87hvKbVSCERWD45d8tM=";
+ hash = "sha256-2DI/PL29aiZcxOrGZBzXwAnNgZQpSDjyyGKgl+vDErk=";
};
nativeBuildInputs = [ cmake rocm-cmake ];
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index e4ee3c473075..6ab2fe9f6cbf 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
- version = "6.15.5";
+ version = "6.17.3";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8=";
+ sha256 = "sha256-mfONfYMxZ3CT7Bk3OYSwg0UChmk4mQ1+cHN94gEDZcM=";
};
nativeBuildInputs = [ cmake ninja ];
diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix
index 96f7108e3fe0..b9a34b113ebd 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 = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-CompilerSupport";
rev = "rocm-${version}";
- hash = "sha256-JMzXg1Hw0iWcTnKu/NgW7rD8iagp724F01GaJbrJj9M=";
+ hash = "sha256-LbQqyJxRqb6vpXiYSkRlF1FeqXJJXktPafGmYDDK02U=";
};
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 965d92179b67..e62d6f0076fc 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 = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-Device-Libs";
rev = "rocm-${version}";
- hash = "sha256-IAE8T/gmotXO/ADH3bxTjrpxWd2lRoj3o/rrSaEFNNo=";
+ hash = "sha256-9p6PIXdHFIgHgNWZzqVz5O9i2Np0z/iyxodG2cLrpGs=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index ab0957474adc..d721cfece96a 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 = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-OpenCL-Runtime";
rev = "rocm-${version}";
- hash = "sha256-kW5jTDlQtXQ0i4ADJEnmESxjcLCt4QZCYJ1ouIsk4YE=";
+ hash = "sha256-+6h1E5uWNKjjaeO5ZIi854CWYi0QGQ5mVUHdi9+4vX4=";
};
nativeBuildInputs = [ cmake rocm-cmake ];
diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix
index beb0c61e683c..c63e8249cfc0 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 = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCR-Runtime";
rev = "rocm-${version}";
- hash = "sha256-8hNb0Yo9ApedOG7xrUr5rwiA/YsqDTcyr6dBRg8lXro=";
+ hash = "sha256-Jxg3n203tV0L+UrmeQEuzX0TKpFu5An2cnuEA/F/SNY=";
};
sourceRoot = "source/src";
diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix
index 5863e1f0a57c..1339e035ebfd 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 = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCT-Thunk-Interface";
rev = "rocm-${version}";
- hash = "sha256-2kLSlGwX3pD8I5pXwV5L0k9l8OzJRkUvnAqv5E+gcd4=";
+ hash = "sha256-gdto7BbrSRa3UiRNvTW1KLkHyjrcxdah4+L+1Gdm0wA=";
};
preConfigure = ''
diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix
index 42c84b3ed610..1eea35a34e76 100644
--- a/pkgs/development/libraries/science/math/amd-blis/default.nix
+++ b/pkgs/development/libraries/science/math/amd-blis/default.nix
@@ -6,10 +6,10 @@
# Enable BLAS interface with 64-bit integer width.
, blas64 ? false
-# Target architecture, use "zen" or "zen2", optimization for Zen and
-# other families is pretty much mutually exclusive in the AMD fork of
-# BLIS.
-, withArchitecture ? "zen"
+# Target architecture. "amd64" compiles kernels for all Zen
+# generations. To build kernels for specific Zen generations,
+# use "zen", "zen2", or "zen3".
+, withArchitecture ? "amd64"
# Enable OpenMP-based threading.
, withOpenMP ? true
@@ -20,13 +20,13 @@ let
blasIntSize = if blas64 then "64" else "32";
in stdenv.mkDerivation rec {
pname = "amd-blis";
- version = "2.2";
+ version = "3.0";
src = fetchFromGitHub {
owner = "amd";
repo = "blis";
rev = version;
- sha256 = "1b2f5bwi0gkw2ih2rb7wfzn3m9hgg7k270kg43rmzpr2acpy86xa";
+ hash = "sha256-bbbeo1yOKse9pzbsB6lQ7pULKdzu3G7zJzTUgPXiMZY=";
};
inherit blas64;
@@ -36,7 +36,10 @@ in stdenv.mkDerivation rec {
python3
];
- doCheck = true;
+ # Tests currently fail with non-Zen CPUs due to a floating point
+ # exception in one of the generic kernels. Try to re-enable the
+ # next release.
+ doCheck = false;
enableParallelBuilding = true;
@@ -51,8 +54,8 @@ in stdenv.mkDerivation rec {
'';
postInstall = ''
- ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libblas.so.3
- ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libcblas.so.3
+ ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libblas.so.3
+ ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libcblas.so.3
ln -s $out/lib/libblas.so.3 $out/lib/libblas.so
ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so
'';
diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix
index ac35385f9835..f17124db47bb 100644
--- a/pkgs/development/libraries/science/math/amd-libflame/default.nix
+++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "amd-libflame";
- version = "2.2";
+ version = "3.0";
src = fetchFromGitHub {
owner = "amd";
repo = "libflame";
rev = version;
- sha256 = "1s8zvq6p843jb52lrbxra7vv0wzmifs4j36z9bp7wf3xr20a0zi5";
+ hash = "sha256-jESae5NqANw90RBbIHH2oGEq5/mudc4IONv50P/AeQ0=";
};
patches = [
diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix
index aca395001f96..fcb49d70a3b1 100644
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/default.nix
@@ -4,7 +4,7 @@
, gfortran
, blas
, boost
-, python
+, python3
, ocl-icd
, opencl-headers
, Accelerate, CoreGraphics, CoreVideo, OpenCL
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gfortran
blas
- python
+ python3
boost
] ++ lib.optionals (!stdenv.isDarwin) [
ocl-icd
@@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
OpenCL
];
+ strictDeps = true;
+
meta = with lib; {
homepage = "https://github.com/clMathLibraries/clBLAS";
description = "A software library containing BLAS functions written in OpenCL";
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index 566a17c61472..d9c19e6790c6 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -8,6 +8,14 @@
, cudatoolkit
, fetchurl
, addOpenGLRunpath
+, # The distributed version of CUDNN includes both dynamically liked .so files,
+ # as well as statically linked .a files. However, CUDNN is quite large
+ # (multiple gigabytes), so you can save some space in your nix store by
+ # removing the statically linked libraries if you are not using them.
+ #
+ # Setting this to true removes the statically linked .a files.
+ # Setting this to false keeps these statically linked .a files.
+ removeStatic ? false
}:
stdenv.mkDerivation {
@@ -23,6 +31,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ addOpenGLRunpath ];
installPhase = ''
+ runHook preInstall
+
function fixRunPath {
p=$(patchelf --print-rpath $1)
patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc ]}:\$ORIGIN/" $1
@@ -35,6 +45,10 @@ stdenv.mkDerivation {
mkdir -p $out
cp -a include $out/include
cp -a lib64 $out/lib64
+ '' + lib.optionalString removeStatic ''
+ rm -f $out/lib64/*.a
+ '' + ''
+ runHook postInstall
'';
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
diff --git a/pkgs/development/libraries/science/math/cutensor/default.nix b/pkgs/development/libraries/science/math/cutensor/default.nix
new file mode 100644
index 000000000000..1b5895b02bb3
--- /dev/null
+++ b/pkgs/development/libraries/science/math/cutensor/default.nix
@@ -0,0 +1,37 @@
+{ callPackage
+, cudatoolkit_10_1, cudatoolkit_10_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+}:
+
+rec {
+ cutensor_cudatoolkit_10_1 = callPackage ./generic.nix rec {
+ version = "1.2.2.5";
+ libPath = "lib/10.1";
+ cudatoolkit = cudatoolkit_10_1;
+ # 1.2.2 is compatible with CUDA 11.0, 11.1, and 11.2:
+ # ephemeral doc at https://developer.nvidia.com/cutensor/downloads
+ sha256 = "1dl9bd71frhac9cb8lvnh71zfsnqxbxbfhndvva2zf6nh0my4klm";
+ };
+
+ cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override {
+ libPath = "lib/10.2";
+ cudatoolkit = cudatoolkit_10_2;
+ };
+
+ cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2;
+
+ cutensor_cudatoolkit_11_0 = cutensor_cudatoolkit_10_2.override {
+ libPath = "lib/11";
+ cudatoolkit = cudatoolkit_11_0;
+ };
+
+ cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override {
+ cudatoolkit = cudatoolkit_11_1;
+ };
+
+ cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override {
+ cudatoolkit = cudatoolkit_11_2;
+ };
+
+ cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2;
+}
diff --git a/pkgs/development/libraries/science/math/cutensor/generic.nix b/pkgs/development/libraries/science/math/cutensor/generic.nix
new file mode 100644
index 000000000000..0b2bd31b2c30
--- /dev/null
+++ b/pkgs/development/libraries/science/math/cutensor/generic.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, lib
+, libPath
+, cudatoolkit
+, fetchurl
+, autoPatchelfHook
+, addOpenGLRunpath
+
+, version
+, sha256
+}:
+
+let
+ mostOfVersion = builtins.concatStringsSep "."
+ (lib.take 3 (lib.versions.splitVersion version));
+in
+
+stdenv.mkDerivation {
+ pname = "cudatoolkit-${cudatoolkit.majorVersion}-cutensor";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz";
+ inherit sha256;
+ };
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ addOpenGLRunpath
+ ];
+
+ buildInputs = [
+ stdenv.cc.cc.lib
+ ];
+
+ propagatedBuildInputs = [
+ cudatoolkit
+ ];
+
+ # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
+ # See the explanation in addOpenGLRunpath.
+ installPhase = ''
+ mkdir -p "$out" "$dev"
+ mv include "$dev"
+ mv ${libPath} "$out/lib"
+
+ function finalRPathFixups {
+ for lib in $out/lib/lib*.so; do
+ addOpenGLRunpath $lib
+ done
+ }
+ postFixupHooks+=(finalRPathFixups)
+ '';
+
+ passthru = {
+ inherit cudatoolkit;
+ majorVersion = lib.versions.major version;
+ };
+
+ meta = with lib; {
+ description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives";
+ homepage = "https://developer.nvidia.com/cutensor";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ obsidian-systems-maintenance ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index c742cc60b27f..50563f2745ab 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -3,7 +3,6 @@
fetchFromGitHub,
gfortran,
cmake,
- python2,
shared ? true
}:
let
@@ -11,7 +10,7 @@ let
version = "3.9.0";
in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "liblapack";
inherit version;
@@ -22,17 +21,41 @@ stdenv.mkDerivation {
sha256 = "0sxnc97z67i7phdmcnq8f8lmxgw10wdwvr8ami0w3pb179cgrbpb";
};
- nativeBuildInputs = [ gfortran python2 cmake ];
+ nativeBuildInputs = [ gfortran cmake ];
+
+ # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10.
+ hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ];
cmakeFlags = [
"-DCMAKE_Fortran_FLAGS=-fPIC"
"-DLAPACKE=ON"
"-DCBLAS=ON"
+ "-DBUILD_TESTING=ON"
]
++ optional shared "-DBUILD_SHARED_LIBS=ON";
doCheck = true;
+ # Some CBLAS related tests fail on Darwin:
+ # 14 - CBLAS-xscblat2 (Failed)
+ # 15 - CBLAS-xscblat3 (Failed)
+ # 17 - CBLAS-xdcblat2 (Failed)
+ # 18 - CBLAS-xdcblat3 (Failed)
+ # 20 - CBLAS-xccblat2 (Failed)
+ # 21 - CBLAS-xccblat3 (Failed)
+ # 23 - CBLAS-xzcblat2 (Failed)
+ # 24 - CBLAS-xzcblat3 (Failed)
+ #
+ # Upstream issue to track:
+ # * https://github.com/Reference-LAPACK/lapack/issues/440
+ ctestArgs = lib.optionalString stdenv.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'";
+
+ checkPhase = ''
+ runHook preCheck
+ ctest ${ctestArgs}
+ runHook postCheck
+ '';
+
meta = with lib; {
inherit version;
description = "Linear Algebra PACKage";
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index 241eb5a37211..481836a4e115 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -8,8 +8,8 @@
, fixDarwinDylibNames
, cudaSupport
-, cudatoolkit_10_2
-, cudnn_cudatoolkit_10_2
+, cudatoolkit_11_1
+, cudnn_cudatoolkit_11_1
}:
let
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
installPhase = ''
# Copy headers and CMake files.
- install -Dm755 -t $dev/lib lib/*.a
+ mkdir -p $dev
cp -r include $dev
cp -r share $dev
@@ -109,8 +109,8 @@ in stdenv.mkDerivation {
passthru.tests.cmake = callPackage ./test {
inherit cudaSupport;
- cudatoolkit = cudatoolkit_10_2;
- cudnn = cudnn_cudatoolkit_10_2;
+ cudatoolkit = cudatoolkit_11_1;
+ cudnn = cudnn_cudatoolkit_11_1;
};
meta = with lib; {
diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
index bfb708531df6..208e0b7adab8 100644
--- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
+++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@@ -8,7 +8,7 @@ version: {
hash = "sha256-xBaNyI7eiQnSArHMITonrQQLZnZCZK/SWKOTWnxzdpc=";
};
x86_64-linux-cuda = {
- url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip";
- hash = "sha256-rNEyE4+jfeX7cU0aNYd5b0pZGYT0PNPnDnS1PIsrMeM=";
+ url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip";
+ hash = "sha256-uQ7ptOuzowJ0JSPIvJHyNotBfpsqAnxpMDLq7Vl6L00=";
};
}
diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix
index d99026bc5659..d4f16d230e60 100644
--- a/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "primesieve";
- version = "7.5";
+ version = "7.6";
nativeBuildInputs = [cmake];
src = fetchurl {
url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz";
- sha256 = "0g60br3p8di92jx3pr2bb51xh15gg57l7qvwzwn7xf7l585hgi7v";
+ sha256 = "sha256-SFZp6Pmmx05SiUfSdN9wXxPKrydtRg0PA3uNvAycCpk=";
};
meta = with lib; {
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index 166d0f2911d6..cd737a82a293 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, freetype, cmake, python }:
+{ lib, stdenv, fetchurl, pkg-config, freetype, cmake }:
stdenv.mkDerivation rec {
version = "1.3.14";
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ];
- checkInputs = [ python ];
doCheck = false; # fails, probably missing something
meta = with lib; {
diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix
index 37ea3b65728f..f0b68845edb2 100644
--- a/pkgs/development/libraries/simdjson/default.nix
+++ b/pkgs/development/libraries/simdjson/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
- version = "0.8.2";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
- sha256 = "sha256-azRuLB03NvW+brw7A/kbgkjoDUlk1p7Ch4zZD55QiMQ=";
+ sha256 = "sha256-e9Y5QEs9xqfJpaWxnA6iFwHE6TTGyVM7hfFuMEmpW78=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index 2f1006404b7a..e67cb1736b75 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -4,7 +4,7 @@
, curl
}:
let
- version = "2020.3.4";
+ version = "2020.3.6";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
- sha256 = "1laa8dllpvf2z0cjxx22ravdf1d7a18bm708gd2ny35fhjfibm0h";
+ sha256 = "sha256-7D7KRNIffgUr6vwbni1XwW+8GtXwM6vJZ7V6/QLDVmk=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 1efac7fc5e48..3d90a8ebb21c 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "skalibs";
- version = "2.10.0.1";
- sha256 = "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg";
+ version = "2.10.0.2";
+ sha256 = "03qyi77wgcw3nzy7i932wd98d6j7nnzxc8ddl973vf5sa1v3vflb";
description = "A set of general-purpose C programming libraries";
diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix
index 47f633f5096b..9973e04a670b 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/pkgs/development/libraries/slib/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
patches = [ ./catalog-in-library-vicinity.patch ];
- buildInputs = [ unzip scheme texinfo ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ scheme texinfo ];
postInstall = ''
ln -s mklibcat{.scm,}
diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix
index f561864a7502..2c87d421babe 100644
--- a/pkgs/development/libraries/soci/default.nix
+++ b/pkgs/development/libraries/soci/default.nix
@@ -6,17 +6,17 @@
stdenv.mkDerivation rec {
pname = "soci";
- version = "4.0.0";
+ version = "4.0.1";
src = fetchFromGitHub {
owner = "SOCI";
repo = pname;
rev = version;
- sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb";
+ sha256 = "sha256-d4GtxDaB+yGfyCnbvnLRUYcrPSMkUF7Opu6+SZd8opM=";
};
# Do not build static libraries
- cmakeFlags = [ "-DSOCI_STATIC=OFF" ];
+ cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ sqlite ];
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index 1395f3e60cf8..593bd87a9829 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sofia-sip";
- version = "1.13.2";
+ version = "1.13.3";
src = fetchFromGitHub {
owner = "freeswitch";
repo = pname;
rev = "v${version}";
- sha256 = "01xj30hhm1ji76igkqkn63rw42vvzq3azkr9qz6fy83iwqaybgyn";
+ sha256 = "sha256-qMgZpLo/BHGJbJ0DDN8COHAhU3ujWgVK9oZOnnMwKas=";
};
buildInputs = [ glib openssl ];
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index e85b6d4cbf40..b6ec4842e077 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -39,11 +39,11 @@ let
throw "You need to enable at least one output module.";
in stdenv.mkDerivation rec {
pname = "speech-dispatcher";
- version = "0.10.1";
+ version = "0.10.2";
src = fetchurl {
url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "0j2lfzkmbsxrrgjw6arzvnfd4jn5pxab28xsk2djssr2ydb9x309";
+ sha256 = "sha256-sGMZ8gHhXlbGKWZTr1vPwwDLNI6XLVF9+LBurHfq4tw=";
};
patches = [
diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
index 3a3f5c79763e..01ec3a4fba29 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/pkgs/development/libraries/symengine/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "symengine";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "symengine";
repo = "symengine";
rev = "v${version}";
- sha256 = "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1";
+ sha256 = "sha256-aoitTT9fwTIs3ovfqQjKGgrU+kT5mj+vDHt5lg49JHU=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 553c42da7c4f..27705c578584 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation (rec {
pname = "talloc";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchurl {
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
- sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g";
+ sha256 = "sha256-J6A++Z44TXeRJN91XesinNF2H5Reym0gDoz9m/Upe9c=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix
index 451f17a2cd72..feb3825b3d4e 100644
--- a/pkgs/development/libraries/tclap/default.nix
+++ b/pkgs/development/libraries/tclap/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "tclap-1.2.2";
+ name = "tclap-1.2.3";
src = fetchurl {
url = "mirror://sourceforge/tclap/${name}.tar.gz";
- sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm";
+ sha256 = "sha256-GefbUoFUDxVDSHcLw6dIRXX09Umu+OAKq8yUs5X3c8k=";
};
meta = with lib; {
diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix
index c7939a6be255..ad4a999e45cd 100644
--- a/pkgs/development/libraries/tinyobjloader/default.nix
+++ b/pkgs/development/libraries/tinyobjloader/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
description = "Tiny but powerful single file wavefront obj loader";
license = licenses.mit;
maintainers = [ maintainers.ivar ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/tllist/default.nix b/pkgs/development/libraries/tllist/default.nix
index 11e61e93a0c1..c84973919990 100644
--- a/pkgs/development/libraries/tllist/default.nix
+++ b/pkgs/development/libraries/tllist/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ fionera AndersonTorres ];
- platforms = with platforms; linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 932239a485fd..f4787271c039 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/include
diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix
index 800b35640111..062c441063c0 100644
--- a/pkgs/development/libraries/trompeloeil/default.nix
+++ b/pkgs/development/libraries/trompeloeil/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "trompeloeil";
- version = "39";
+ version = "40";
src = fetchFromGitHub {
owner = "rollbear";
repo = "trompeloeil";
rev = "v${version}";
- sha256 = "1053iw4isi7qsy94fqmh570wki999sg9n70jhqy8kfy1bniczh0l";
+ sha256 = "sha256-q0iMM3Hb5Y21RUhhxFEd/q4OCJFJ12gozZd5jCDscro=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index deed5b64d2c5..b8ea203ef176 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -1,26 +1,49 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook,
- texinfo, bison, flex, expat, file
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, bison
+, expat
+, file
+, flex
+, texinfo
}:
stdenv.mkDerivation rec {
pname = "udunits";
- version = "2.2.27.6";
+ version = "unstable-2021-03-17";
src = fetchFromGitHub {
owner = "Unidata";
repo = "UDUNITS-2";
- rev = "v${version}";
- sha256 = "0621pac24c842dyipzaa59rh6pza9phdqi3snd4cq4pib0wjw6gm";
+ rev = "c83da987387db1174cd2266b73dd5dd556f4476b";
+ hash = "sha256-+HW21+r65OroCxMK2/B5fe7zHs4hD4xyoJK2bhdJGyQ=";
};
- nativeBuildInputs = [ autoreconfHook texinfo bison flex file ];
- buildInputs = [ expat ];
+ nativeBuildInputs = [
+ autoreconfHook
+ texinfo
+ bison
+ flex
+ file
+ ];
+ buildInputs = [
+ expat
+ ];
meta = with lib; {
homepage = "https://www.unidata.ucar.edu/software/udunits/";
description = "A C-based package for the programatic handling of units of physical quantities";
- license = licenses.bsdOriginal;
+ longDescription = ''
+ The UDUNITS package supports units of physical quantities. Its C library
+ provides for arithmetic manipulation of units and for conversion of
+ numeric values between compatible units. The package contains an extensive
+ unit database, which is in XML format and user-extendable. The package
+ also contains a command-line utility for investigating units and
+ converting values.
+ '';
+ license = licenses.asl20;
+ maintainers = with maintainers; [ AndersonTorres pSub ];
platforms = platforms.linux;
- maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix
index e627b97849a0..30129992c73d 100644
--- a/pkgs/development/libraries/utf8cpp/default.nix
+++ b/pkgs/development/libraries/utf8cpp/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
description = "UTF-8 with C++ in a Portable Way";
license = licenses.free;
maintainers = with maintainers; [ jobojeha ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix
index 380f533fe6f7..d8c83bf54a8a 100644
--- a/pkgs/development/libraries/vcg/default.nix
+++ b/pkgs/development/libraries/vcg/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "http://vcg.isti.cnr.it/vcglib/install.html";
description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
license = licenses.gpl3;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix
index 9ddc95a9ccc7..0bded9d92ddd 100644
--- a/pkgs/development/libraries/wtk/default.nix
+++ b/pkgs/development/libraries/wtk/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
builder = ./builder.sh;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ];
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
index 7b6907a01627..3bcc40b5da32 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, curl, libxml2 }:
stdenv.mkDerivation rec {
- name = "xmlrpc-c-1.51.06";
+ name = "xmlrpc-c-1.51.07";
src = fetchurl {
url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
- sha256 = "1l4zz22q10081vr06b8sii0l3krr64xyiywz6rcladw8kiyxip06";
+ sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk=";
};
buildInputs = [ curl libxml2 ];
diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix
index a0d1378aa708..2037d815a81b 100644
--- a/pkgs/development/libraries/zchunk/default.nix
+++ b/pkgs/development/libraries/zchunk/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitHub
-, fetchpatch
-, pkg-config
+, argp-standalone
+, curl
, meson
, ninja
+, pkg-config
, zstd
-, curl
-, argp-standalone
}:
stdenv.mkDerivation rec {
pname = "zchunk";
- version = "1.1.8";
+ version = "1.1.9";
outputs = [ "out" "lib" "dev" ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
owner = "zchunk";
repo = pname;
rev = version;
- sha256 = "0q1jafxh5nqgn2w5ciljkh8h46xma0qia8a5rj9m0pxixcacqj6q";
+ hash = "sha256-MqnHtqOjLl6R5GZ4f2UX1iLoO9FUT2IfZlSN58wW8JA=";
};
nativeBuildInputs = [
@@ -29,25 +29,23 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- zstd
curl
+ zstd
] ++ lib.optional stdenv.isDarwin argp-standalone;
- # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS
- # https://github.com/zchunk/zchunk/pull/35
- patches = [
- (fetchpatch {
- name = "darwin-support.patch";
- url = "https://github.com/zchunk/zchunk/commit/f7db2ac0a95028a7f82ecb89862426bf53a69232.patch";
- sha256 = "0cm84gyii4ly6nsmagk15g9kbfa13rw395nqk3fdcwm0dpixlkh4";
- })
-];
-
meta = with lib; {
- description = "File format designed for highly efficient deltas while maintaining good compression";
homepage = "https://github.com/zchunk/zchunk";
+ description = "File format designed for highly efficient deltas while maintaining good compression";
+ longDescription = ''
+ zchunk is a compressed file format that splits the file into independent
+ chunks. This allows you to only download changed chunks when downloading a
+ new version of the file, and also makes zchunk files efficient over rsync.
+
+ zchunk files are protected with strong checksums to verify that the file
+ you downloaded is, in fact, the file you wanted.
+ '';
license = licenses.bsd2;
- maintainers = with maintainers; [];
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 8cfec83af542..90758db16edd 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -1,80 +1,81 @@
-{ lib, stdenv
-, perl
-, pkg-config
+{ lib
+, stdenv
, fetchFromGitHub
, fetchpatch
-, zip
-, unzip
+, cmake
+, perl
+, pkg-config
, python3
, xmlto
+, zip
, zlib
}:
stdenv.mkDerivation rec {
pname = "zziplib";
- version = "0.13.71";
+ version = "0.13.72";
src = fetchFromGitHub {
owner = "gdraheim";
- repo = "zziplib";
+ repo = pname;
rev = "v${version}";
- sha256 = "P+7D57sc2oIABhk3k96aRILpGnsND5SLXHh2lqr9O4E=";
+ hash = "sha256-Ht3fBgdrTm4mCi5uhgQPNtpGzADoRVOpSuGPsIS6y0Q=";
};
patches = [
- # Install man pages
+ # apply https://github.com/gdraheim/zziplib/pull/113
(fetchpatch {
- url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch";
- sha256 = "wVExEZN8Ml1/3GicB0ZYsLVS3KJ8BSz8i4Gu46naz1Y=";
- excludes = [ "GNUmakefile" ];
+ url = "https://github.com/gdraheim/zziplib/commit/82a7773cd17828a3b0a4f5f552ae80c1cc8777c7.diff";
+ sha256 = "0ifqdzxwb5d19mziy9j6lhl8wj95jpxzm0d2c6y3bgwa931avd3y";
})
-
- # Fix man page formatting
(fetchpatch {
- url = "https://github.com/gdraheim/zziplib/commit/22ed64f13dc239f86664c60496261f544bce1088.patch";
- sha256 = "ScFVWLc4LQPqkcHn9HK/VkLula4b5HzuYl0b5vi4Ikc=";
+ url = "https://github.com/gdraheim/zziplib/commit/1cd611514c5f9559eb9dfc191d678dfc991f66db.diff";
+ sha256 = "11w9qa46xq49l113k266dnv8izzdk1fq4y54yy5w8zps8zd3xfny";
+ })
+ (fetchpatch {
+ url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff";
+ sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg";
})
];
nativeBuildInputs = [
+ cmake
perl
pkg-config
- zip
python3
xmlto
+ zip
];
-
buildInputs = [
zlib
];
- checkInputs = [
- unzip
+ # test/zziptests.py requires network access
+ # (https://github.com/gdraheim/zziplib/issues/24)
+ cmakeFlags = [
+ "-DZZIP_TESTCVE=OFF"
+ "-DBUILD_SHARED_LIBS=True"
+ "-DBUILD_STATIC_LIBS=False"
+ "-DBUILD_TESTS=OFF"
+ "-DMSVC_STATIC_RUNTIME=OFF"
+ "-DZZIPSDL=OFF"
+ "-DZZIPTEST=OFF"
+ "-DZZIPWRAP=OFF"
+ "-DBUILDTESTS=OFF"
];
- # tests are broken (https://github.com/gdraheim/zziplib/issues/20),
- # and test/zziptests.py requires network access
- # (https://github.com/gdraheim/zziplib/issues/24)
- doCheck = false;
- checkTarget = "check";
-
meta = with lib; {
+ homepage = "https://github.com/gdraheim/zziplib";
description = "Library to extract data from files archived in a zip file";
-
longDescription = ''
- The zziplib library is intentionally lightweight, it offers the ability
- to easily extract data from files archived in a single zip
- file. Applications can bundle files into a single zip archive and
- access them. The implementation is based only on the (free) subset of
- compression with the zlib algorithm which is actually used by the
- zip/unzip tools.
+ The zziplib library is intentionally lightweight, it offers the ability to
+ easily extract data from files archived in a single zip file.
+ Applications can bundle files into a single zip archive and access them.
+ The implementation is based only on the (free) subset of compression with
+ the zlib algorithm which is actually used by the zip/unzip tools.
'';
-
license = with licenses; [ lgpl2Plus mpl11 ];
-
- homepage = "http://zziplib.sourceforge.net/";
-
- maintainers = [ ];
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = python3.meta.platforms;
};
}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 412fd4b8dee5..79a799f76fbc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -225,7 +225,7 @@ $out/lib/common-lisp/query-fs"
x.deps;
};
cl-cffi-gtk-glib = addNativeLibs [pkgs.glib];
- cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk_pixbuf];
+ cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk-pixbuf];
cl-cffi-gtk-cairo = addNativeLibs [pkgs.cairo];
cl-cffi-gtk-pango = addNativeLibs [pkgs.pango];
cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3];
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index 0201491f4cca..a8ed246e6f8f 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -11,6 +11,6 @@ self = rec {
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
];
CPATH = "${libfixposix}/include";
- LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib";
+ LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib";
};
in stdenv.mkDerivation self
diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix
index 0a9d666f8b7f..3364fe796e72 100644
--- a/pkgs/development/misc/avr8-burn-omat/default.nix
+++ b/pkgs/development/misc/avr8-burn-omat/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index e08078ea6725..c8fce166aa7d 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -5,16 +5,16 @@ deployAndroidPackage {
buildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional (os == "linux") [
pkgs.glibc
- pkgs.xlibs.libX11
- pkgs.xlibs.libXext
- pkgs.xlibs.libXdamage
- pkgs.xlibs.libXfixes
- pkgs.xlibs.libxcb
- pkgs.xlibs.libXcomposite
- pkgs.xlibs.libXcursor
- pkgs.xlibs.libXi
- pkgs.xlibs.libXrender
- pkgs.xlibs.libXtst
+ pkgs.xorg.libX11
+ pkgs.xorg.libXext
+ pkgs.xorg.libXdamage
+ pkgs.xorg.libXfixes
+ pkgs.xorg.libxcb
+ pkgs.xorg.libXcomposite
+ pkgs.xorg.libXcursor
+ pkgs.xorg.libXi
+ pkgs.xorg.libXrender
+ pkgs.xorg.libXtst
pkgs.libcxx
pkgs.libGL
pkgs.libpulseaudio
diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix
index 0234c9f3d04b..a768a120547f 100644
--- a/pkgs/development/mobile/androidenv/tools/26.nix
+++ b/pkgs/development/mobile/androidenv/tools/26.nix
@@ -4,7 +4,7 @@ deployAndroidPackage {
name = "androidsdk";
inherit os package;
buildInputs = [ autoPatchelfHook makeWrapper ]
- ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ];
+ ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ];
patchInstructions = ''
${lib.optionalString (os == "linux") ''
@@ -27,7 +27,7 @@ deployAndroidPackage {
# Wrap monitor script
wrapProgram $PWD/monitor \
--prefix PATH : ${pkgs.jdk8}/bin \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]}
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]}
# Patch all script shebangs
patchShebangs .
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
index 601cac372c8c..89fd34bb5a3d 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
@@ -64,8 +64,7 @@ stdenv.mkDerivation {
}
else throw "Platform: ${stdenv.system} not supported!";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
buildCommand = ''
mkdir -p $out
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
index 52257bfd4611..fb462cc27fe6 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
@@ -64,8 +64,7 @@ stdenv.mkDerivation {
}
else throw "Platform: ${stdenv.system} not supported!";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
buildCommand = ''
mkdir -p $out
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
index 78044752b54c..c207b112fae2 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
@@ -64,8 +64,7 @@ stdenv.mkDerivation {
}
else throw "Platform: ${stdenv.system} not supported!";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
buildCommand = ''
mkdir -p $out
diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index 240f287003b8..2023cbfbfa0c 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -107,7 +107,7 @@ let
mirakurun = super.mirakurun.override rec {
nativeBuildInputs = with pkgs; [ makeWrapper ];
postInstall = let
- runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l_utils ]);
+ runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l-utils ]);
in
''
substituteInPlace $out/lib/node_modules/mirakurun/processes.json \
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 3b9a5ee49413..959cb20d10ec 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -12,6 +12,7 @@
, "@webassemblyjs/wast-refmt"
, "alloy"
, "asar"
+, "balanceofsatoshis"
, "bash-language-server"
, "bower"
, "bower2nix"
@@ -134,6 +135,7 @@
, "json-refs"
, "json-server"
, "jsonlint"
+, "kaput-cli"
, "karma"
, "lcov-result-merger"
, "leetcode-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 68c934bee738..950115f80bfd 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -22,13 +22,40 @@ let
sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
};
};
- "@angular-devkit/architect-0.1102.3" = {
+ "@alexbosworth/html2unicode-1.1.5" = {
+ name = "_at_alexbosworth_slash_html2unicode";
+ packageName = "@alexbosworth/html2unicode";
+ version = "1.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@alexbosworth/html2unicode/-/html2unicode-1.1.5.tgz";
+ sha512 = "CXMFAyovJHtLzKlraBpGlM/8TX9bvVz081IDZkQF3IMGHePgHCAs1vQdnKM38VMGekywNCbo7kt3fHooSMgA2w==";
+ };
+ };
+ "@alexbosworth/request-2.88.3" = {
+ name = "_at_alexbosworth_slash_request";
+ packageName = "@alexbosworth/request";
+ version = "2.88.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@alexbosworth/request/-/request-2.88.3.tgz";
+ sha512 = "51/Y5x0SncVGQc274YckWMo9CooUGp7XppgV9K8v5eBwcXnw9sM/j0LpAvUFE7gjJcmZVYXDmLxtOYtgC0f2dg==";
+ };
+ };
+ "@alexbosworth/saxophone-0.6.2" = {
+ name = "_at_alexbosworth_slash_saxophone";
+ packageName = "@alexbosworth/saxophone";
+ version = "0.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@alexbosworth/saxophone/-/saxophone-0.6.2.tgz";
+ sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww==";
+ };
+ };
+ "@angular-devkit/architect-0.1102.6" = {
name = "_at_angular-devkit_slash_architect";
packageName = "@angular-devkit/architect";
- version = "0.1102.3";
+ version = "0.1102.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.3.tgz";
- sha512 = "+skN/lDvWPxiQl0d2maVtfqgr/aRIx4cZdlTTp20FQ14J8BK9xFHuexnhQ17jdVYCIrgWoPDz2d9ZRw7e6pXvA==";
+ url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.6.tgz";
+ sha512 = "27+5tjoUOAcm2pzo6EJhQn3lK4s9Gk0RfZFc2ygVu8PHnukXZAd4ntclGi33aPgJmt4zA2qbWq4Ytn2a/G6FMg==";
};
};
"@angular-devkit/core-11.2.0" = {
@@ -49,6 +76,15 @@ let
sha512 = "2JEGXzFqjTqVls2uIZEE0sk4VY9a/alxBAq8BFYIVbvzKsL9gAY71Ztf21zrhQrZop9qeuLJtOAbp00QyYUaQA==";
};
};
+ "@angular-devkit/core-11.2.6" = {
+ name = "_at_angular-devkit_slash_core";
+ packageName = "@angular-devkit/core";
+ version = "11.2.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.6.tgz";
+ sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA==";
+ };
+ };
"@angular-devkit/schematics-11.2.0" = {
name = "_at_angular-devkit_slash_schematics";
packageName = "@angular-devkit/schematics";
@@ -67,6 +103,15 @@ let
sha512 = "x/IKgZDn6z/MzQ28WF2GTP2N+n78iySQhLu6n6bpmdrFp9noi9QASzN+mAFiqSNO8XpO9oyIB5y2ERl8KBrU1g==";
};
};
+ "@angular-devkit/schematics-11.2.6" = {
+ name = "_at_angular-devkit_slash_schematics";
+ packageName = "@angular-devkit/schematics";
+ version = "11.2.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.6.tgz";
+ sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA==";
+ };
+ };
"@angular-devkit/schematics-cli-0.1102.0" = {
name = "_at_angular-devkit_slash_schematics-cli";
packageName = "@angular-devkit/schematics-cli";
@@ -193,15 +238,6 @@ let
sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg==";
};
};
- "@apollo/federation-0.20.7" = {
- name = "_at_apollo_slash_federation";
- packageName = "@apollo/federation";
- version = "0.20.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.7.tgz";
- sha512 = "URIayksqBaJ+xlcJmyGCf+OqHP60lX2CYGv9fDWQ1KM48sEN1ABHGXkEa0vwgWMH0XUVo94lYDVY11BAJUsuCw==";
- };
- };
"@apollo/protobufjs-1.0.5" = {
name = "_at_apollo_slash_protobufjs";
packageName = "@apollo/protobufjs";
@@ -220,49 +256,13 @@ let
sha512 = "M50pk8oo3CGTu4waGOklIX3YtTZoPfWG9K/G9WB8NpyQGA1OwYTiBFv94XqUtKElTDoFwoMXpMQd3Wy5dINvxA==";
};
};
- "@apollographql/graphql-language-service-interface-2.0.2" = {
- name = "_at_apollographql_slash_graphql-language-service-interface";
- packageName = "@apollographql/graphql-language-service-interface";
- version = "2.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@apollographql/graphql-language-service-interface/-/graphql-language-service-interface-2.0.2.tgz";
- sha512 = "28wePK0hlIVjgmvMXMAUq8qRSjz9O+6lqFp4PzOTHtfJfSsjVe9EfjF98zTpHsTgT3HcOxmbqDZZy8jlXtOqEA==";
- };
- };
- "@apollographql/graphql-language-service-parser-2.0.2" = {
- name = "_at_apollographql_slash_graphql-language-service-parser";
- packageName = "@apollographql/graphql-language-service-parser";
- version = "2.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@apollographql/graphql-language-service-parser/-/graphql-language-service-parser-2.0.2.tgz";
- sha512 = "rpTPrEJu1PMaRQxz5P8BZWsixNNhYloS0H0dwTxNBuE3qctbARvR7o8UCKLsmKgTbo+cz3T3a6IAsWlkHgMWGg==";
- };
- };
- "@apollographql/graphql-language-service-types-2.0.2" = {
- name = "_at_apollographql_slash_graphql-language-service-types";
- packageName = "@apollographql/graphql-language-service-types";
- version = "2.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@apollographql/graphql-language-service-types/-/graphql-language-service-types-2.0.2.tgz";
- sha512 = "vE+Dz8pG+Xa1Z2nMl82LoO66lQ6JqBUjaXqLDvS3eMjvA3N4hf+YUDOWfPdNZ0zjhHhHXzUIIZCkax6bXfFbzQ==";
- };
- };
- "@apollographql/graphql-language-service-utils-2.0.2" = {
- name = "_at_apollographql_slash_graphql-language-service-utils";
- packageName = "@apollographql/graphql-language-service-utils";
- version = "2.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@apollographql/graphql-language-service-utils/-/graphql-language-service-utils-2.0.2.tgz";
- sha512 = "fDj5rWlTi/czvUS5t7V7I45Ai6bOO3Z7JARYj21Y2xxfbRGtJi6h8FvLX0N/EbzQgo/fiZc/HAhtfwn+OCjD7A==";
- };
- };
- "@apollographql/graphql-playground-html-1.6.26" = {
+ "@apollographql/graphql-playground-html-1.6.27" = {
name = "_at_apollographql_slash_graphql-playground-html";
packageName = "@apollographql/graphql-playground-html";
- version = "1.6.26";
+ version = "1.6.27";
src = fetchurl {
- url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz";
- sha512 = "XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ==";
+ url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz";
+ sha512 = "tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw==";
};
};
"@apollographql/graphql-upload-8-fork-8.1.3" = {
@@ -328,22 +328,22 @@ let
sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==";
};
};
- "@babel/compat-data-7.13.8" = {
+ "@babel/compat-data-7.13.12" = {
name = "_at_babel_slash_compat-data";
packageName = "@babel/compat-data";
- version = "7.13.8";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz";
- sha512 = "EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==";
+ url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz";
+ sha512 = "3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==";
};
};
- "@babel/core-7.13.8" = {
+ "@babel/core-7.13.10" = {
name = "_at_babel_slash_core";
packageName = "@babel/core";
- version = "7.13.8";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz";
- sha512 = "oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg==";
+ url = "https://registry.npmjs.org/@babel/core/-/core-7.13.10.tgz";
+ sha512 = "bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==";
};
};
"@babel/core-7.9.0" = {
@@ -355,15 +355,6 @@ let
sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==";
};
};
- "@babel/generator-7.12.11" = {
- name = "_at_babel_slash_generator";
- packageName = "@babel/generator";
- version = "7.12.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
- sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
- };
- };
"@babel/generator-7.13.9" = {
name = "_at_babel_slash_generator";
packageName = "@babel/generator";
@@ -391,22 +382,22 @@ let
sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==";
};
};
- "@babel/helper-compilation-targets-7.13.8" = {
+ "@babel/helper-compilation-targets-7.13.10" = {
name = "_at_babel_slash_helper-compilation-targets";
packageName = "@babel/helper-compilation-targets";
- version = "7.13.8";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz";
- sha512 = "pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==";
+ url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz";
+ sha512 = "/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==";
};
};
- "@babel/helper-create-class-features-plugin-7.13.8" = {
+ "@babel/helper-create-class-features-plugin-7.13.11" = {
name = "_at_babel_slash_helper-create-class-features-plugin";
packageName = "@babel/helper-create-class-features-plugin";
- version = "7.13.8";
+ version = "7.13.11";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz";
- sha512 = "qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==";
+ url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz";
+ sha512 = "ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw==";
};
};
"@babel/helper-create-regexp-features-plugin-7.12.17" = {
@@ -463,31 +454,31 @@ let
sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==";
};
};
- "@babel/helper-member-expression-to-functions-7.13.0" = {
+ "@babel/helper-member-expression-to-functions-7.13.12" = {
name = "_at_babel_slash_helper-member-expression-to-functions";
packageName = "@babel/helper-member-expression-to-functions";
- version = "7.13.0";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz";
- sha512 = "yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==";
+ url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz";
+ sha512 = "48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==";
};
};
- "@babel/helper-module-imports-7.12.13" = {
+ "@babel/helper-module-imports-7.13.12" = {
name = "_at_babel_slash_helper-module-imports";
packageName = "@babel/helper-module-imports";
- version = "7.12.13";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz";
- sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==";
+ url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz";
+ sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==";
};
};
- "@babel/helper-module-transforms-7.13.0" = {
+ "@babel/helper-module-transforms-7.13.12" = {
name = "_at_babel_slash_helper-module-transforms";
packageName = "@babel/helper-module-transforms";
- version = "7.13.0";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz";
- sha512 = "Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==";
+ url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz";
+ sha512 = "7zVQqMO3V+K4JOOj40kxiCrMf6xlQAkewBB0eu2b03OO/Q21ZutOzjpfD79A5gtE/2OWi1nv625MrDlGlkbknQ==";
};
};
"@babel/helper-optimise-call-expression-7.12.13" = {
@@ -517,22 +508,22 @@ let
sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==";
};
};
- "@babel/helper-replace-supers-7.13.0" = {
+ "@babel/helper-replace-supers-7.13.12" = {
name = "_at_babel_slash_helper-replace-supers";
packageName = "@babel/helper-replace-supers";
- version = "7.13.0";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz";
- sha512 = "Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==";
+ url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz";
+ sha512 = "Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==";
};
};
- "@babel/helper-simple-access-7.12.13" = {
+ "@babel/helper-simple-access-7.13.12" = {
name = "_at_babel_slash_helper-simple-access";
packageName = "@babel/helper-simple-access";
- version = "7.12.13";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz";
- sha512 = "0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==";
+ url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz";
+ sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==";
};
};
"@babel/helper-skip-transparent-expression-wrappers-7.12.1" = {
@@ -580,31 +571,40 @@ let
sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==";
};
};
- "@babel/helpers-7.13.0" = {
+ "@babel/helpers-7.13.10" = {
name = "_at_babel_slash_helpers";
packageName = "@babel/helpers";
- version = "7.13.0";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz";
- sha512 = "aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==";
+ url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz";
+ sha512 = "4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==";
};
};
- "@babel/highlight-7.13.8" = {
+ "@babel/highlight-7.13.10" = {
name = "_at_babel_slash_highlight";
packageName = "@babel/highlight";
- version = "7.13.8";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz";
- sha512 = "4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==";
+ url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz";
+ sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==";
};
};
- "@babel/parser-7.13.9" = {
+ "@babel/parser-7.13.12" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
- version = "7.13.9";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz";
- sha512 = "nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==";
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.12.tgz";
+ sha512 = "4T7Pb244rxH24yR116LAuJ+adxXXnHhZaLJjegJVKSdoNCe4x1eDBaud5YIcQFcqzsaD5BHvJw5BQ0AZapdCRw==";
+ };
+ };
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = {
+ name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining";
+ packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining";
+ version = "7.13.12";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz";
+ sha512 = "d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==";
};
};
"@babel/plugin-external-helpers-7.8.3" = {
@@ -724,13 +724,13 @@ let
sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==";
};
};
- "@babel/plugin-proposal-optional-chaining-7.13.8" = {
+ "@babel/plugin-proposal-optional-chaining-7.13.12" = {
name = "_at_babel_slash_plugin-proposal-optional-chaining";
packageName = "@babel/plugin-proposal-optional-chaining";
- version = "7.13.8";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz";
- sha512 = "hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz";
+ sha512 = "fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==";
};
};
"@babel/plugin-proposal-private-methods-7.13.0" = {
@@ -1147,13 +1147,13 @@ let
sha512 = "MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA==";
};
};
- "@babel/plugin-transform-react-jsx-7.12.17" = {
+ "@babel/plugin-transform-react-jsx-7.13.12" = {
name = "_at_babel_slash_plugin-transform-react-jsx";
packageName = "@babel/plugin-transform-react-jsx";
- version = "7.12.17";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz";
- sha512 = "mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz";
+ sha512 = "jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA==";
};
};
"@babel/plugin-transform-react-jsx-self-7.12.13" = {
@@ -1192,13 +1192,13 @@ let
sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==";
};
};
- "@babel/plugin-transform-runtime-7.13.9" = {
+ "@babel/plugin-transform-runtime-7.13.10" = {
name = "_at_babel_slash_plugin-transform-runtime";
packageName = "@babel/plugin-transform-runtime";
- version = "7.13.9";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.9.tgz";
- sha512 = "XCxkY/wBI6M6Jj2mlWxkmqbKPweRanszWbF3Tyut+hKh+PHcuIH/rSr/7lmmE7C3WW+HSIm2GT+d5jwmheuB0g==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.10.tgz";
+ sha512 = "Y5k8ipgfvz5d/76tx7JYbKQTcgFSU6VgJ3kKQv4zGTKr+a9T/KBvfRvGtSFgKDQGt/DBykQixV0vNWKIdzWErA==";
};
};
"@babel/plugin-transform-shorthand-properties-7.12.13" = {
@@ -1273,15 +1273,6 @@ let
sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==";
};
};
- "@babel/polyfill-7.12.1" = {
- name = "_at_babel_slash_polyfill";
- packageName = "@babel/polyfill";
- version = "7.12.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz";
- sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==";
- };
- };
"@babel/preset-env-7.12.17" = {
name = "_at_babel_slash_preset-env";
packageName = "@babel/preset-env";
@@ -1291,13 +1282,13 @@ let
sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg==";
};
};
- "@babel/preset-env-7.13.9" = {
+ "@babel/preset-env-7.13.12" = {
name = "_at_babel_slash_preset-env";
packageName = "@babel/preset-env";
- version = "7.13.9";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.9.tgz";
- sha512 = "mcsHUlh2rIhViqMG823JpscLMesRt3QbMsv1+jhopXEb3W2wXvQ9QoiOlZI9ZbR3XqPtaFpZwEZKYqGJnGMZTQ==";
+ url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz";
+ sha512 = "JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA==";
};
};
"@babel/preset-flow-7.12.13" = {
@@ -1354,13 +1345,13 @@ let
sha512 = "yCVtABcmvQjRsX2elcZFUV5Q5kDDpHdtXKKku22hNDma60lYuhKmtp1ykZ/okRCPLT2bR5S+cA1kvtBdAFlDTQ==";
};
};
- "@babel/runtime-7.12.5" = {
+ "@babel/runtime-7.13.10" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
- version = "7.12.5";
+ version = "7.13.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz";
- sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
+ url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz";
+ sha512 = "4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==";
};
};
"@babel/runtime-7.13.9" = {
@@ -1399,22 +1390,13 @@ let
sha512 = "xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==";
};
};
- "@babel/types-7.10.4" = {
+ "@babel/types-7.13.12" = {
name = "_at_babel_slash_types";
packageName = "@babel/types";
- version = "7.10.4";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz";
- sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==";
- };
- };
- "@babel/types-7.13.0" = {
- name = "_at_babel_slash_types";
- packageName = "@babel/types";
- version = "7.13.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz";
- sha512 = "hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==";
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.13.12.tgz";
+ sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA==";
};
};
"@braintree/sanitize-url-3.1.0" = {
@@ -1426,22 +1408,22 @@ let
sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg==";
};
};
- "@bugsnag/browser-7.7.0" = {
+ "@bugsnag/browser-7.9.0" = {
name = "_at_bugsnag_slash_browser";
packageName = "@bugsnag/browser";
- version = "7.7.0";
+ version = "7.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.7.0.tgz";
- sha512 = "o3Y/8ZINTCyCiDid01xF4RwAfRCtt4Ak65sbEUjuen90Lf62LcqNIrguRotum5/5GrXl/ktm8gk6Tp8XBiS79A==";
+ url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.9.0.tgz";
+ sha512 = "+W/oxEJJMgNRVrgcCGXYQKAf6Nu28JklU3v+w7zgPEaxnzxxUwsCj7s4534XQvj/jprP60281WsAlTDqFRprAQ==";
};
};
- "@bugsnag/core-7.7.0" = {
+ "@bugsnag/core-7.9.0" = {
name = "_at_bugsnag_slash_core";
packageName = "@bugsnag/core";
- version = "7.7.0";
+ version = "7.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.7.0.tgz";
- sha512 = "y6xY/ZjHRSD3h1ADdkgH4sUJeJ9TUjNjkui+pjdmQkG4asjA8lBNmjnqirGeAxgL00lg5xvbfLSq9iHdqFW9oQ==";
+ url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.9.0.tgz";
+ sha512 = "LjARVBusQ1ewNrHRPBrwY4ISsXf/aPjQHAixFe6fRMiLzAS0awxFweVlbdfm+Oj/ZE04J6O9n4re9TC6pVBpEA==";
};
};
"@bugsnag/cuid-3.0.0" = {
@@ -1453,22 +1435,22 @@ let
sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg==";
};
};
- "@bugsnag/js-7.8.0" = {
+ "@bugsnag/js-7.9.0" = {
name = "_at_bugsnag_slash_js";
packageName = "@bugsnag/js";
- version = "7.8.0";
+ version = "7.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.8.0.tgz";
- sha512 = "knSEXI4Znch4KzKooG3IgrYcZhKHYyTt/hGEmFhKCNmEiNGhGVisl0mbFCyjTBT+wYmWqqbv6kx4YOyGLCH0Yw==";
+ url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.9.0.tgz";
+ sha512 = "owMjgCdMMD/3zvojNUZRfnWcjbudmAZ0f+5oNqxUwB4oEUgDd70QfNz11/QgrfydIgQd1iAj2qLyNZ2aAdQgzg==";
};
};
- "@bugsnag/node-7.8.0" = {
+ "@bugsnag/node-7.9.0" = {
name = "_at_bugsnag_slash_node";
packageName = "@bugsnag/node";
- version = "7.8.0";
+ version = "7.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.8.0.tgz";
- sha512 = "2ZkXP5gmTE4LcPu2TB350BUmClbwsPZ1ZjYMiHqHDb2Xjoico0PNt6F9tBLjDRy9jS/pFGbjt/iOpyfr4GFm8A==";
+ url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.9.0.tgz";
+ sha512 = "ctTJLfeNgbWZAnKbqg4w1PMsabSnmkgAY199oZLonDuu/60UWlNOcDEicDEhULD9gt2vYTZy78QsYov4LDAojQ==";
};
};
"@bugsnag/safe-json-stringify-6.0.0" = {
@@ -1480,6 +1462,15 @@ let
sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA==";
};
};
+ "@cdktf/hcl2json-0.2.0" = {
+ name = "_at_cdktf_slash_hcl2json";
+ packageName = "@cdktf/hcl2json";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.2.0.tgz";
+ sha512 = "ipJDQ7S402bziTPKr6WH2rfUtvUdC82LGj5YnEHpSuGp7PySEZs0u7J4ERsUNxoXFL0ikMvRBgzH6fCi+j7LQA==";
+ };
+ };
"@chemzqm/neovim-5.2.13" = {
name = "_at_chemzqm_slash_neovim";
packageName = "@chemzqm/neovim";
@@ -1489,24 +1480,6 @@ let
sha512 = "Eo1NBUj0e2vtOdNA7fpHra6xviDtwDWbYZiPzH5BWGwPtbRa0XjNGPMggcDCCKKKFRJgp9AaAfmT0LaqIyQvyg==";
};
};
- "@cliqz-oss/firefox-client-0.3.1" = {
- name = "_at_cliqz-oss_slash_firefox-client";
- packageName = "@cliqz-oss/firefox-client";
- version = "0.3.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/@cliqz-oss/firefox-client/-/firefox-client-0.3.1.tgz";
- sha512 = "RO+Tops/wGnBzWoZYkCraqyh2JqOejqJq5/a4b54HhmjTNSKdUPwAOK17EGg/zPb0nWqkuB7QyZsI9bo+ev8Kw==";
- };
- };
- "@cliqz-oss/node-firefox-connect-1.2.1" = {
- name = "_at_cliqz-oss_slash_node-firefox-connect";
- packageName = "@cliqz-oss/node-firefox-connect";
- version = "1.2.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/@cliqz-oss/node-firefox-connect/-/node-firefox-connect-1.2.1.tgz";
- sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA==";
- };
- };
"@cnakazawa/watch-1.0.4" = {
name = "_at_cnakazawa_slash_watch";
packageName = "@cnakazawa/watch";
@@ -1534,6 +1507,15 @@ let
sha512 = "do5jDoX9oCR/dGHE4POVQ3PYDCmQ2Fow4CA72UL4WoE8zUImA/0lChczjfl+ucNjE4sXFWUnzoO6j4WzrUvLnw==";
};
};
+ "@cto.af/textdecoder-0.0.0" = {
+ name = "_at_cto.af_slash_textdecoder";
+ packageName = "@cto.af/textdecoder";
+ version = "0.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@cto.af/textdecoder/-/textdecoder-0.0.0.tgz";
+ sha512 = "sJpx3F5xcVV/9jNYJQtvimo4Vfld/nD3ph+ZWtQzZ03Zo8rJC7QKQTRcIGS13Rcz80DwFNthCWMrd58vpY4ZAQ==";
+ };
+ };
"@cycle/dom-18.3.0" = {
name = "_at_cycle_slash_dom";
packageName = "@cycle/dom";
@@ -1813,22 +1795,22 @@ let
sha512 = "6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg==";
};
};
- "@emmetio/abbreviation-2.2.1" = {
+ "@emmetio/abbreviation-2.2.2" = {
name = "_at_emmetio_slash_abbreviation";
packageName = "@emmetio/abbreviation";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.1.tgz";
- sha512 = "uUNwNgbH0JPlrdXhy8VQbNPLLG7abMvOaLVMblx22i68Rl9r+2N235ALgIYFUty1yXC9DkVw6xMbz/D4QVARcQ==";
+ url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.2.tgz";
+ sha512 = "TtE/dBnkTCct8+LntkqVrwqQao6EnPAs1YN3cUgxOxTaBlesBCY37ROUAVZrRlG64GNnVShdl/b70RfAI3w5lw==";
};
};
- "@emmetio/css-abbreviation-2.1.2" = {
+ "@emmetio/css-abbreviation-2.1.4" = {
name = "_at_emmetio_slash_css-abbreviation";
packageName = "@emmetio/css-abbreviation";
- version = "2.1.2";
+ version = "2.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.2.tgz";
- sha512 = "CvYTzJltVpLqJaCZ1Qn97LVAKsl2Uwl2fzir1EX/WuMY3xWxgc3BWRCheL6k65km6GyDrLVl6RhrrNb/pxOiAQ==";
+ url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz";
+ sha512 = "qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw==";
};
};
"@emmetio/extract-abbreviation-0.1.6" = {
@@ -1885,24 +1867,6 @@ let
sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==";
};
};
- "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" = {
- name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader";
- packageName = "@endemolshinegroup/cosmiconfig-typescript-loader";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.2.tgz";
- sha512 = "ZHkXKq2XFFmAUdmSZrmqUSIrRM4O9gtkdpxMmV+LQl7kScUnbo6pMnXu6+FTDgZ12aW6SDoZoOJfS56WD+Eu6A==";
- };
- };
- "@eslint/eslintrc-0.2.2" = {
- name = "_at_eslint_slash_eslintrc";
- packageName = "@eslint/eslintrc";
- version = "0.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz";
- sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==";
- };
- };
"@eslint/eslintrc-0.4.0" = {
name = "_at_eslint_slash_eslintrc";
packageName = "@eslint/eslintrc";
@@ -1939,22 +1903,22 @@ let
sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA==";
};
};
- "@expo/config-3.3.30" = {
+ "@expo/config-3.3.33" = {
name = "_at_expo_slash_config";
packageName = "@expo/config";
- version = "3.3.30";
+ version = "3.3.33";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/config/-/config-3.3.30.tgz";
- sha512 = "mOFebiAcowOD9MCpXGtZG/oMku1vAOazGx9BGaDnrod5YHjmrIN65W+hP+eK2dQBcJV1VjbU5K3VpkXO6aWwBA==";
+ url = "https://registry.npmjs.org/@expo/config/-/config-3.3.33.tgz";
+ sha512 = "8AJaBUlPOrIUfyy61N+/EfGegyddNyFnu2fifQGAhi8/bK61LpfbuRz7jBi4vnEDsOO0Hvwjm+mM6rK5RTjNOA==";
};
};
- "@expo/config-plugins-1.0.20" = {
+ "@expo/config-plugins-1.0.23" = {
name = "_at_expo_slash_config-plugins";
packageName = "@expo/config-plugins";
- version = "1.0.20";
+ version = "1.0.23";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.20.tgz";
- sha512 = "BucZQbi7edu8Pin8zFUNsaQeZAj/8ga7Ei3PKivKZKd5F53DdFU6Yb+ZDyQ0UeOGDi0hZlZWdaBzmQqHEg37TQ==";
+ url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.23.tgz";
+ sha512 = "LjglO6CHC69qYjOynRsDBKuVbL2W3UPJs6nghgJR5aNhQCZtQsc74p4NWbQEkbPEasNtGCb355PlsV2fQskFaQ==";
};
};
"@expo/config-types-40.0.0-beta.2" = {
@@ -1975,22 +1939,22 @@ let
sha512 = "HsukM03X5/EXSucVsLN/oLqyFq/1jAjpADkgU1HLaezFpkr+TOquI6yDwdDp1450kcm891PE/SYJ+mCdPxzDLw==";
};
};
- "@expo/dev-server-0.1.56" = {
+ "@expo/dev-server-0.1.59" = {
name = "_at_expo_slash_dev-server";
packageName = "@expo/dev-server";
- version = "0.1.56";
+ version = "0.1.59";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.56.tgz";
- sha512 = "BXKJW6KB7AckjJkDIM4mmuMhbiP9GQtmfsNoEsXg9Ci1NxJxu4vc/UdaL4tC+SLlDNpKgSIBvSNDY0AdPKUAeA==";
+ url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.59.tgz";
+ sha512 = "mDFUiJVQ1LWx7WQCGCdqiQTm/j+UooVuYZKE9OpJIjBBLPB+a/0rlu7OxU+0PyjA+xc0t5fGVgRCuij2mqzS+A==";
};
};
- "@expo/dev-tools-0.13.84" = {
+ "@expo/dev-tools-0.13.87" = {
name = "_at_expo_slash_dev-tools";
packageName = "@expo/dev-tools";
- version = "0.13.84";
+ version = "0.13.87";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.84.tgz";
- sha512 = "HmN5Gb+uSpLxIhHKjPgRSLZaAEJW8UmV6h2eQmVUrpc+VoT0M4roCHd50xJQv+OqLllgo9ZmmyWHnNckOd+RJA==";
+ url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.87.tgz";
+ sha512 = "tQF9NvKd1HsGVm2iNrLYa1hndJNSkilYTLSvJnCSNbgGQJzMCMMfcdZXpIn8Sc6iF0kQ1KIfIzeO8UL72qTNIA==";
};
};
"@expo/devcert-1.0.0" = {
@@ -2002,13 +1966,13 @@ let
sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ==";
};
};
- "@expo/image-utils-0.3.10" = {
+ "@expo/image-utils-0.3.11" = {
name = "_at_expo_slash_image-utils";
packageName = "@expo/image-utils";
- version = "0.3.10";
+ version = "0.3.11";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.10.tgz";
- sha512 = "EebukeUnzyk4ts1E1vMQSb0p8otYqWKsZNDZEoqHtERhxMSO7WhQLqa7/z2kB/YMHRJjrhaa3Aa2X5zjYot1kA==";
+ url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.11.tgz";
+ sha512 = "JH5/FExvEsz9H9QsgoOEN3QYqH9V50dKjpkwTkytXLutD5Z587xSRka57pbX+d4nkHqiQBT0W8buUkbma78NYg==";
};
};
"@expo/json-file-8.2.28-alpha.0" = {
@@ -2020,13 +1984,13 @@ let
sha512 = "cCQdw/Nfw8doXjN3onvUnWkuJjtVxx2iUjSOLMydvgI87YpW3x05uUXOVs4P+77YFVoFS6xbki+fmKK2JSCf8w==";
};
};
- "@expo/metro-config-0.1.56" = {
+ "@expo/metro-config-0.1.59" = {
name = "_at_expo_slash_metro-config";
packageName = "@expo/metro-config";
- version = "0.1.56";
+ version = "0.1.59";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.56.tgz";
- sha512 = "h7IBc8GWzqKhdv2OWqU9tU3i5ZMpoXU1gao+kZzvi02dEAV5GzKxvGPiZu9nsvXeeRlCIpzTHvzFPh5n5mtSnA==";
+ url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.59.tgz";
+ sha512 = "xg9ne3z9D2zjsS6rjdNnnvsljsgcqLdM4e3oc0dmn7Bq8q+rkbCDlm22w2d7NmFIykMMDAvJdpEhTO7Vqyu7Lg==";
};
};
"@expo/osascript-2.0.24" = {
@@ -2092,22 +2056,13 @@ let
sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==";
};
};
- "@expo/webpack-config-0.12.60" = {
+ "@expo/webpack-config-0.12.63" = {
name = "_at_expo_slash_webpack-config";
packageName = "@expo/webpack-config";
- version = "0.12.60";
+ version = "0.12.63";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.60.tgz";
- sha512 = "UieL5oLo4rm0jNx/Gzz6gs4fZ37THSdptvy4dQFsHGQrvZgxd1lCHEe4NNv56/Zs3H/FrX7vczpZ2fwS/LXvmQ==";
- };
- };
- "@expo/xdl-59.0.24" = {
- name = "_at_expo_slash_xdl";
- packageName = "@expo/xdl";
- version = "59.0.24";
- src = fetchurl {
- url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.24.tgz";
- sha512 = "rl0lJ3z4v0VPu8Z37Vl2sTYSupAVjD6MxUHAJd+FRKgQMb7kyJUTpWvBAlbYCgMM+WH5XZZSvgWdwCTLocwPtw==";
+ url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.63.tgz";
+ sha512 = "50hG1KeahBX88X7nhb+ZBL5wHSR6U9EDlHhmYXeGK4tQcNKsfONdieNOKoYKW7LgDr3mSSO+2j7SWfNbAGHEmw==";
};
};
"@fast-csv/format-4.3.5" = {
@@ -2155,22 +2110,22 @@ let
sha512 = "SMyoMFCPRNoDeHB5MMIi8W3loDxjXsSBeQfQaaKqmph7gVN48DCky6K/xBHHDJDeqJjcmEgwPTRP8qsuuLWnqw==";
};
};
- "@fluentui/react-7.162.1" = {
+ "@fluentui/react-7.165.1" = {
name = "_at_fluentui_slash_react";
packageName = "@fluentui/react";
- version = "7.162.1";
+ version = "7.165.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/react/-/react-7.162.1.tgz";
- sha512 = "egK9hEYePYlUGzh1Db7gxdUaiWZBRY5MG4Gb8jb5PzOq/Y0stP5pX+zfzLulp2Q0sWzP/03t6A9N84pnfcDYWQ==";
+ url = "https://registry.npmjs.org/@fluentui/react/-/react-7.165.1.tgz";
+ sha512 = "2l/481URLxucUxQBKsXgHXPKBkhQEpJCCpGjfWf3uWwPz3X5PNMy+pujyYN6Di2LLPOfdpLf5sWTNw+DJjy2jA==";
};
};
- "@fluentui/react-focus-7.17.5" = {
+ "@fluentui/react-focus-7.17.6" = {
name = "_at_fluentui_slash_react-focus";
packageName = "@fluentui/react-focus";
- version = "7.17.5";
+ version = "7.17.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.5.tgz";
- sha512 = "FBgvHMOpFnmMSGVV+QdlKNMQ61kEzqv2wjUObWxdpqxVUeFIk4rSAalCp2R8c2Sg8YxTGmH5ywhySQ6GQEM6sA==";
+ url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.6.tgz";
+ sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg==";
};
};
"@fluentui/react-window-provider-1.0.2" = {
@@ -2263,22 +2218,22 @@ let
sha512 = "RNhQk0jMz6fZB4Ilu37PZj6YUQgSEZJrppXlaHpw/xYyDelcjYKZg/z9eMvYo6rxQPR2mGXjoj6by+zew1WgOw==";
};
};
- "@graphql-tools/batch-execute-7.0.0" = {
+ "@graphql-tools/batch-execute-7.1.0" = {
name = "_at_graphql-tools_slash_batch-execute";
packageName = "@graphql-tools/batch-execute";
- version = "7.0.0";
+ version = "7.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.0.0.tgz";
- sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q==";
+ url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.1.0.tgz";
+ sha512 = "Yb4QRpHZqDk24+T4K3ARk/KFU26Dyl30XcbYeVvIrgIKcmeON/p3DfSeiB0+MaxYlsv+liQKvlxNbeC2hD31pA==";
};
};
- "@graphql-tools/delegate-7.0.10" = {
+ "@graphql-tools/delegate-7.1.1" = {
name = "_at_graphql-tools_slash_delegate";
packageName = "@graphql-tools/delegate";
- version = "7.0.10";
+ version = "7.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.10.tgz";
- sha512 = "6Di9ia5ohoDvrHuhj2cak1nJGhIefJmUsd3WKZcJ2nu2yZAFawWMxGvQImqv3N7iyaWKiVhrrK8Roi/JrYhdKg==";
+ url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.1.1.tgz";
+ sha512 = "+uV0KZPI070sEykf3uxy+AhirHOqZnqbVqTqcfhH8/97+vdoLPE5oVceCTvMQsC7bDapbcbNiwcpYd8T6OQ4KQ==";
};
};
"@graphql-tools/graphql-file-loader-6.2.7" = {
@@ -2317,13 +2272,13 @@ let
sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg==";
};
};
- "@graphql-tools/merge-6.2.10" = {
+ "@graphql-tools/merge-6.2.11" = {
name = "_at_graphql-tools_slash_merge";
packageName = "@graphql-tools/merge";
- version = "6.2.10";
+ version = "6.2.11";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.10.tgz";
- sha512 = "dM3n37PcslvhOAkCz7Cwk0BfoiSVKXGmCX+VMZkATbXk/0vlxUfNEpVfA5yF4IkP27F04SzFQSaNrbD0W2Rszw==";
+ url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.11.tgz";
+ sha512 = "temQABWkDTZb/qJwcIdrEbyJ5WkhaWZQeYxiuxGqZWlIOoFkYfqzfAP2qKl2Ry+ZkN+Q/Yozr1/ap//xjpwAlA==";
};
};
"@graphql-tools/schema-7.1.3" = {
@@ -2335,13 +2290,13 @@ let
sha512 = "ZY76hmcJlF1iyg3Im0sQ3ASRkiShjgv102vLTVcH22lEGJeCaCyyS/GF1eUHom418S60bS8Th6+autRUxfBiBg==";
};
};
- "@graphql-tools/url-loader-6.8.1" = {
+ "@graphql-tools/url-loader-6.8.2" = {
name = "_at_graphql-tools_slash_url-loader";
packageName = "@graphql-tools/url-loader";
- version = "6.8.1";
+ version = "6.8.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.1.tgz";
- sha512 = "iE/y9IAu0cZYL7o9IIDdGm5WjxacN25nGgVqjZINYlisW/wyuBxng7DMJBAp6yM6gkxkCpMno1ljA/52MXzVPQ==";
+ url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.2.tgz";
+ sha512 = "YzsXSCOwlSj8UqOMhQThPzgEChgS/MonyWV7f0WKmN9gAT/f3fPaUcYhVamsH0vGbvTkfNM4JdoZO/39amRs5Q==";
};
};
"@graphql-tools/utils-6.2.4" = {
@@ -2353,13 +2308,13 @@ let
sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg==";
};
};
- "@graphql-tools/utils-7.5.0" = {
+ "@graphql-tools/utils-7.7.1" = {
name = "_at_graphql-tools_slash_utils";
packageName = "@graphql-tools/utils";
- version = "7.5.0";
+ version = "7.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.5.0.tgz";
- sha512 = "8f//RSqHmKRdg9A3GHlZdxzlVfF/938ZD9edXLW7EriSABg1BXu3veru9W02VqORypArb2S/Tyeyvsk2gForqA==";
+ url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.7.1.tgz";
+ sha512 = "SFT4/dTfrwWer1wSOLU+jqgv3oa/xTR8q+MiNbE9nCH2FXyMsqIOaXKm9wHfKIWFWHozqBdcnwFkQZrdD7H2TQ==";
};
};
"@graphql-tools/wrap-7.0.5" = {
@@ -2380,6 +2335,15 @@ let
sha512 = "wj6GkNiorWYaPiIZ767xImmw7avMMVUweTvPFg4mJWOxz2180DKwfuxhJJZ7rpc1+7D3mX/v8vJdxTuIo71Ieg==";
};
};
+ "@grpc/grpc-js-1.2.12" = {
+ name = "_at_grpc_slash_grpc-js";
+ packageName = "@grpc/grpc-js";
+ version = "1.2.12";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.12.tgz";
+ sha512 = "+gPCklP1eqIgrNPyzddYQdt9+GvZqPlLpIjIo+TveE+gbtp74VV1A2ju8ExeO8ma8f7MbpaGZx/KJPYVWL9eDw==";
+ };
+ };
"@grpc/proto-loader-0.5.6" = {
name = "_at_grpc_slash_proto-loader";
packageName = "@grpc/proto-loader";
@@ -2407,6 +2371,15 @@ let
sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
};
};
+ "@handsontable/formulajs-2.0.2" = {
+ name = "_at_handsontable_slash_formulajs";
+ packageName = "@handsontable/formulajs";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@handsontable/formulajs/-/formulajs-2.0.2.tgz";
+ sha512 = "maIyMJtYjA5e/R9nyA22Qd7Yw73MBSxClJvle0a8XWAS/5l6shc/OFpQqrmwMy4IXUCmywJ9ER0gOGz/YA720w==";
+ };
+ };
"@hapi/address-2.1.4" = {
name = "_at_hapi_slash_address";
packageName = "@hapi/address";
@@ -3010,13 +2983,13 @@ let
sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==";
};
};
- "@jsii/spec-1.24.0" = {
+ "@jsii/spec-1.26.0" = {
name = "_at_jsii_slash_spec";
packageName = "@jsii/spec";
- version = "1.24.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.24.0.tgz";
- sha512 = "Km0va0ZBlzWPOijsNlo7SwozYT6Ej9h01xXYtBmoHw2CLccofOEQLV2Ig3+ydhU+aTW5yLKJrVPsAjJoaaBAgA==";
+ url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.26.0.tgz";
+ sha512 = "wh9Z/wfQYcWE5IgUfKNBYQ9Lhye9Xh/lsRsxMQluqEsgObNqb/8JreenWviqzHzBBcvTcHHyl+G30mpmyO1PWQ==";
};
};
"@kwsites/file-exists-1.1.1" = {
@@ -3595,13 +3568,13 @@ let
sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng==";
};
};
- "@mdn/browser-compat-data-2.0.7" = {
+ "@mdn/browser-compat-data-3.1.3" = {
name = "_at_mdn_slash_browser-compat-data";
packageName = "@mdn/browser-compat-data";
- version = "2.0.7";
+ version = "3.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz";
- sha512 = "GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw==";
+ url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.1.3.tgz";
+ sha512 = "Qdqeox4APsYwAQQSO68D1p75DL9an1wS8b/51m+nH98unN4jbS5bvg22WQrg+TMq2/3Mg/E5zprqfUzJD84qgw==";
};
};
"@medv/blessed-2.0.1" = {
@@ -3613,13 +3586,31 @@ let
sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q==";
};
};
- "@microsoft/load-themed-styles-1.10.149" = {
+ "@microsoft/load-themed-styles-1.10.153" = {
name = "_at_microsoft_slash_load-themed-styles";
packageName = "@microsoft/load-themed-styles";
- version = "1.10.149";
+ version = "1.10.153";
src = fetchurl {
- url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.149.tgz";
- sha512 = "XXd9GWLHAagjzVCnR17Mx3gQmWZbLD9sBFMaWc2h4fs5a1yig3AO274tFQTLsLoU1vwzBOFsI5wveh8baxBiZg==";
+ url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.153.tgz";
+ sha512 = "Rzc4FAYYyMbZN0TeTRcUN47H/8zXhoZUBcJd2eK/93ZNAitnWGXes0nHXVMFpn+pc9Ca/uq9rCOSURjJsmUrxw==";
+ };
+ };
+ "@mitmaro/errors-1.0.0" = {
+ name = "_at_mitmaro_slash_errors";
+ packageName = "@mitmaro/errors";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@mitmaro/errors/-/errors-1.0.0.tgz";
+ sha512 = "KUU0J4rgHsJiMsAj6Ndj+OTAlsKsX/fe3geQ0UB1jYm1DoaqFoanh1sBshb9rLNJpPjsD7yNQFykGajAsPciyw==";
+ };
+ };
+ "@mitmaro/http-authorization-header-1.0.0" = {
+ name = "_at_mitmaro_slash_http-authorization-header";
+ packageName = "@mitmaro/http-authorization-header";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@mitmaro/http-authorization-header/-/http-authorization-header-1.0.0.tgz";
+ sha512 = "cAm7w7S04aswBtsXAReyzHrq9EV7yNalYj8OObsnavCucDoxC10y14gE2Eg82UKnR5v2TWSJAVCLFea4gaiddQ==";
};
};
"@mozilla/readability-0.4.1" = {
@@ -3649,13 +3640,13 @@ let
sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg==";
};
};
- "@nestjs/schematics-7.2.8" = {
+ "@nestjs/schematics-7.3.0" = {
name = "_at_nestjs_slash_schematics";
packageName = "@nestjs/schematics";
- version = "7.2.8";
+ version = "7.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.8.tgz";
- sha512 = "cxs76Ia1SHTp18jXTusZtUucNjAmorlTzSaeKUH+71fri2pA0JOS4RJlfta5znDuA26gboolanPE6U0ZzaLM3A==";
+ url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.3.0.tgz";
+ sha512 = "yBlg3HV944CbbrXKFMZWs9KkMjIeBLcbgetZOjaiY2AUljwF4PyNoTbV6ulHLyt6ws9mMTPBYiEoF+7V05Lmcg==";
};
};
"@netflix/nerror-1.1.3" = {
@@ -3667,13 +3658,13 @@ let
sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
};
};
- "@netlify/build-9.8.5" = {
+ "@netlify/build-9.13.2" = {
name = "_at_netlify_slash_build";
packageName = "@netlify/build";
- version = "9.8.5";
+ version = "9.13.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/build/-/build-9.8.5.tgz";
- sha512 = "/lT+bfnMgaenYLVAdQd8T1GPyohpN4LR2JkvWLlnm4JEWkyiXF/W5DaMOPBGxGIzIZq4ml9wh+YFZ9lzq6J89g==";
+ url = "https://registry.npmjs.org/@netlify/build/-/build-9.13.2.tgz";
+ sha512 = "XhTk7Wm/l+GpE+bw7zZQpPBKV3Jsxjo1k3qCkMO3sWufN+pKmm+Z4DFRLhAKE+Vbev0wMf52HGhXEheroM5M1w==";
};
};
"@netlify/cache-utils-1.0.7" = {
@@ -3685,31 +3676,31 @@ let
sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA==";
};
};
- "@netlify/config-4.0.4" = {
+ "@netlify/config-4.3.0" = {
name = "_at_netlify_slash_config";
packageName = "@netlify/config";
- version = "4.0.4";
+ version = "4.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/config/-/config-4.0.4.tgz";
- sha512 = "e/F9faSp79QGgb3k4nLae8FSXGdmtIndlGthocrrYvLb0mLEvJke+veqKH4u825oOcOvQZaYw5UnOyLRu8hcXQ==";
+ url = "https://registry.npmjs.org/@netlify/config/-/config-4.3.0.tgz";
+ sha512 = "jS6u5Dm3asg8zF6cYNYWfvyH3+XB3dMMm0UpC/BOLrYuXKVjP6uiIoUoUI6IjIN7gxAcotTN6RKCA5jU2Ahy5w==";
};
};
- "@netlify/framework-info-2.3.0" = {
+ "@netlify/framework-info-3.2.0" = {
name = "_at_netlify_slash_framework-info";
packageName = "@netlify/framework-info";
- version = "2.3.0";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-2.3.0.tgz";
- sha512 = "vqy9wbBRP8qWnkzA/OQsThr1+cfqapMrORJ4hWcrjhIPRmXIJtwB6OWuLIUalMeSGCwqZjYpKfudc4BLuxxvjw==";
+ url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-3.2.0.tgz";
+ sha512 = "wvyTzcRMtg4Qlzn8rAjx+k4UD42TLbZdpF7dNqnL4+cBPeS04X0tc7Jhan7aigwnmiKUw6nufhkN40TInpiC6g==";
};
};
- "@netlify/functions-utils-1.3.17" = {
+ "@netlify/functions-utils-1.3.21" = {
name = "_at_netlify_slash_functions-utils";
packageName = "@netlify/functions-utils";
- version = "1.3.17";
+ version = "1.3.21";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.17.tgz";
- sha512 = "yRmM8/bKq2NCqJ8D3Fb46WQ0MkqV5tS3dcmKDuvbfElDU5y1rvzm11C/7CxiVvTbf2qXURumPng/m7coYzkRGA==";
+ url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.21.tgz";
+ sha512 = "Pe6DGnmOx6a/RMWCHteODdk7qYZiv4svjLbs1Uit+N2ISRbPJmaKoRFYrsnLICr1Oldcnqp6mA7CoHEpKrMsSw==";
};
};
"@netlify/git-utils-1.0.8" = {
@@ -3730,31 +3721,31 @@ let
sha512 = "GcCPXIWI8VDBsLN4nPvb6sKS9tbi4lrHLhex90hT27nwTDeu4HgGE93YilcsgZ1LLODJNxC5LdfTNLtvEHMKVg==";
};
};
- "@netlify/plugin-edge-handlers-1.11.5" = {
+ "@netlify/plugin-edge-handlers-1.11.6" = {
name = "_at_netlify_slash_plugin-edge-handlers";
packageName = "@netlify/plugin-edge-handlers";
- version = "1.11.5";
+ version = "1.11.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.5.tgz";
- sha512 = "R7oEvYjLOrvO8uSy484c4TrZeD5A1M2TN4dIM7dAdd2iHgpC+i3+RhlM9XFHFOqc8lsim+A+BcKMQYZ19z+j6A==";
+ url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.6.tgz";
+ sha512 = "7L5pkXlwPfyUrmm9cu2+nOQYW1FMx6waMbl2Uj5SmxjLz5Dvt2zkUYbNU2ImNmJ10mxziv3LABSFn2k2qy2nLw==";
};
};
- "@netlify/plugins-list-2.4.0" = {
+ "@netlify/plugins-list-2.5.0" = {
name = "_at_netlify_slash_plugins-list";
packageName = "@netlify/plugins-list";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.4.0.tgz";
- sha512 = "006JT4L3G36rzGkFnpHr/GOVaEfapSNAfWfsfS16tcPwjwz9fGSndfODeou7x4IU5IrHgEOJ6xQQKKqNjbfj4g==";
+ url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.5.0.tgz";
+ sha512 = "45BG3E6A+540BZDG4Dul5KmoOwzw+TwiwqQSP08bKiywWtyl3IDDFoozZRp+GjhRo1+CnNVN0L9FxdxvU82UDw==";
};
};
- "@netlify/run-utils-1.0.6" = {
+ "@netlify/run-utils-1.0.7" = {
name = "_at_netlify_slash_run-utils";
packageName = "@netlify/run-utils";
- version = "1.0.6";
+ version = "1.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.6.tgz";
- sha512 = "/A1LgWQfhiRcUyWI7FE7N1VjhxoFKtDekk9gu3zLwDcXvFsw3wND0//wKSMstrhGZzXTf39fwRe8qvP8Brr6Cw==";
+ url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.7.tgz";
+ sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA==";
};
};
"@netlify/traffic-mesh-agent-0.27.10" = {
@@ -3793,13 +3784,22 @@ let
sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g==";
};
};
- "@netlify/zip-it-and-ship-it-2.5.0" = {
+ "@netlify/zip-it-and-ship-it-2.7.1" = {
name = "_at_netlify_slash_zip-it-and-ship-it";
packageName = "@netlify/zip-it-and-ship-it";
- version = "2.5.0";
+ version = "2.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.5.0.tgz";
- sha512 = "TgI0eakD6melHIUBv3Ed/hN/6caiNg+UoeAAekrl5uTCBSxwEf730SzaDgYjKBKB71qP6ER8O0sGGz70gGiKxg==";
+ url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.7.1.tgz";
+ sha512 = "Tt37A8tyQcEw3h4YZ4g5/Cgqya4rf/BnweDjfwPDj0BFZmfjRSH8CIZvTJd2y+R2AvLJ1b89cXVYen9uwb2A9w==";
+ };
+ };
+ "@netlify/zip-it-and-ship-it-3.0.1" = {
+ name = "_at_netlify_slash_zip-it-and-ship-it";
+ packageName = "@netlify/zip-it-and-ship-it";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-3.0.1.tgz";
+ sha512 = "Wh3ajSR1uhtYTFCYJoevFGSvykF0hUAJwwOETC8SMfkx4H1xJ1Zt7Bs1OZ1Ee1PayJDy7vQYBwdIeWTJPz8efw==";
};
};
"@node-red/editor-api-1.2.9" = {
@@ -3946,13 +3946,13 @@ let
sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==";
};
};
- "@npmcli/run-script-1.8.3" = {
+ "@npmcli/run-script-1.8.4" = {
name = "_at_npmcli_slash_run-script";
packageName = "@npmcli/run-script";
- version = "1.8.3";
+ version = "1.8.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.3.tgz";
- sha512 = "ELPGWAVU/xyU+A+H3pEPj0QOvYwLTX71RArXcClFzeiyJ/b/McsZ+d0QxpznvfFtZzxGN/gz/1cvlqICR4/suQ==";
+ url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.4.tgz";
+ sha512 = "Yd9HXTtF1JGDXZw0+SOn+mWLYS0e7bHBHVC/2C8yqs4wUrs/k8rwBSinD7rfk+3WG/MFGRZKxjyoD34Pch2E/A==";
};
};
"@oclif/color-0.1.2" = {
@@ -4018,15 +4018,6 @@ let
sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA==";
};
};
- "@oclif/plugin-autocomplete-0.3.0" = {
- name = "_at_oclif_slash_plugin-autocomplete";
- packageName = "@oclif/plugin-autocomplete";
- version = "0.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.3.0.tgz";
- sha512 = "gCuIUCswvoU1BxDDvHSUGxW8rFagiacle8jHqE49+WnuniXD/N8NmJvnzmlNyc8qLE192CnKK+qYyAF+vaFQBg==";
- };
- };
"@oclif/plugin-help-1.2.11" = {
name = "_at_oclif_slash_plugin-help";
packageName = "@oclif/plugin-help";
@@ -4072,24 +4063,6 @@ let
sha512 = "lfHNiuuCrCUtH9A912T/ztxRA9lS1lCZm+gcmVWksIJG/gwKH/fMn+GdLTbRzU2k6ojtMhBblYk1RWKxUEJuzA==";
};
};
- "@oclif/plugin-plugins-1.9.5" = {
- name = "_at_oclif_slash_plugin-plugins";
- packageName = "@oclif/plugin-plugins";
- version = "1.9.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.5.tgz";
- sha512 = "8U1MKPTaitCBj4HPZpwFo7F5Krw9zEaNqKiX+QkvPz2wfftLqnSqariYvP38S/uo8CDwiR3zHPEYFSxu9CDQQA==";
- };
- };
- "@oclif/plugin-warn-if-update-available-1.7.0" = {
- name = "_at_oclif_slash_plugin-warn-if-update-available";
- packageName = "@oclif/plugin-warn-if-update-available";
- version = "1.7.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-1.7.0.tgz";
- sha512 = "Nwyz3BJ8RhsfQ+OmFSsJSPIfn5YJqMrCzPh72Zgo2jqIjKIBWD8N9vTTe4kZlpeUUn77SyXFfwlBQbNCL5OEuQ==";
- };
- };
"@oclif/screen-1.0.4" = {
name = "_at_oclif_slash_screen";
packageName = "@oclif/screen";
@@ -4117,13 +4090,13 @@ let
sha512 = "BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==";
};
};
- "@octokit/core-3.2.5" = {
+ "@octokit/core-3.3.1" = {
name = "_at_octokit_slash_core";
packageName = "@octokit/core";
- version = "3.2.5";
+ version = "3.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/core/-/core-3.2.5.tgz";
- sha512 = "+DCtPykGnvXKWWQI0E1XD+CCeWSBhB6kwItXqfFmNBlIlhczuDPbg+P6BtLnVBaRJDAjv+1mrUJuRsFSjktopg==";
+ url = "https://registry.npmjs.org/@octokit/core/-/core-3.3.1.tgz";
+ sha512 = "Dc5NNQOYjgZU5S1goN6A/E500yXOfDUFRGQB8/2Tl16AcfvS3H9PudyOe3ZNE/MaVyHPIfC0htReHMJb1tMrvw==";
};
};
"@octokit/endpoint-6.0.11" = {
@@ -4135,22 +4108,22 @@ let
sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==";
};
};
- "@octokit/graphql-4.6.0" = {
+ "@octokit/graphql-4.6.1" = {
name = "_at_octokit_slash_graphql";
packageName = "@octokit/graphql";
- version = "4.6.0";
+ version = "4.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.0.tgz";
- sha512 = "CJ6n7izLFXLvPZaWzCQDjU/RP+vHiZmWdOunaCS87v+2jxMsW9FB5ktfIxybRBxZjxuJGRnxk7xJecWTVxFUYQ==";
+ url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.1.tgz";
+ sha512 = "2lYlvf4YTDgZCTXTW4+OX+9WTLFtEUc6hGm4qM1nlZjzxj+arizM4aHWzBVBCxY9glh7GIs0WEuiSgbVzv8cmA==";
};
};
- "@octokit/openapi-types-5.3.1" = {
+ "@octokit/openapi-types-6.0.0" = {
name = "_at_octokit_slash_openapi-types";
packageName = "@octokit/openapi-types";
- version = "5.3.1";
+ version = "6.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.3.1.tgz";
- sha512 = "TvVk2QuIA0lQZcIMd6xbdGaGDVeNYIOa3l1ZVagAIk5K3t/WMYbcg4BISNDhzdVhm/TgQB26frAgd/GV81aHJA==";
+ url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.0.0.tgz";
+ sha512 = "CnDdK7ivHkBtJYzWzZm7gEkanA7gKH6a09Eguz7flHw//GacPJLmkHA3f3N++MJmlxD1Fl+mB7B32EEpSCwztQ==";
};
};
"@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -4171,13 +4144,13 @@ let
sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==";
};
};
- "@octokit/plugin-paginate-rest-2.11.0" = {
+ "@octokit/plugin-paginate-rest-2.13.3" = {
name = "_at_octokit_slash_plugin-paginate-rest";
packageName = "@octokit/plugin-paginate-rest";
- version = "2.11.0";
+ version = "2.13.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.11.0.tgz";
- sha512 = "7L9xQank2G3r1dGqrVPo1z62V5utbykOUzlmNHPz87Pww/JpZQ9KyG5CHtUzgmB4n5iDRKYNK/86A8D98HP0yA==";
+ url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz";
+ sha512 = "46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg==";
};
};
"@octokit/plugin-request-log-1.0.3" = {
@@ -4198,13 +4171,13 @@ let
sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==";
};
};
- "@octokit/plugin-rest-endpoint-methods-4.13.4" = {
+ "@octokit/plugin-rest-endpoint-methods-4.14.0" = {
name = "_at_octokit_slash_plugin-rest-endpoint-methods";
packageName = "@octokit/plugin-rest-endpoint-methods";
- version = "4.13.4";
+ version = "4.14.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.13.4.tgz";
- sha512 = "MGxptzVfiP8O+aydC/riheYzS/yJ9P16M29OuvtZep/sF5sKuOCQP8Wf83YCKXRsQF+ZpYfke2snbPPSIMZKzg==";
+ url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.14.0.tgz";
+ sha512 = "QoZ469GDvFALHuxhcRA4KFGTaPeu5Z0MILGPa7irTGfYE0WfL+LFqWmULm9tuFKaKNlTcEQ7c5uJ0p4k5uvmNQ==";
};
};
"@octokit/request-5.4.14" = {
@@ -4243,13 +4216,13 @@ let
sha512 = "ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ==";
};
};
- "@octokit/rest-18.3.4" = {
+ "@octokit/rest-18.4.0" = {
name = "_at_octokit_slash_rest";
packageName = "@octokit/rest";
- version = "18.3.4";
+ version = "18.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.3.4.tgz";
- sha512 = "NES0pHbwyFB1D0jrLkdnIXgEmze/gLE0JoSNgfAe4vwD77/qaQGO/lRWNuPPsoBVBjiW6mmA9CU5cYHujJTKQA==";
+ url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.4.0.tgz";
+ sha512 = "3bFg0vyD3O+6EukYzLTu4tUapMofSR4nYgMEOJc25sefippsatiWfNoOnx0QNj3PIXVJdW0riUjQnDwgS0JNWA==";
};
};
"@octokit/types-2.16.2" = {
@@ -4261,13 +4234,13 @@ let
sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==";
};
};
- "@octokit/types-6.12.1" = {
+ "@octokit/types-6.13.0" = {
name = "_at_octokit_slash_types";
packageName = "@octokit/types";
- version = "6.12.1";
+ version = "6.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/types/-/types-6.12.1.tgz";
- sha512 = "eZTTWJxGBon01Ra4EX86rvlMZGkU5SeJ8BtwQlsv2wEqZttpjtefLetJndZTVbJ25qFKoyKMWsRFnwlOx7ZaDQ==";
+ url = "https://registry.npmjs.org/@octokit/types/-/types-6.13.0.tgz";
+ sha512 = "W2J9qlVIU11jMwKHUp5/rbVUeErqelCsO5vW5PKNb7wAXQVUz87Rc+imjlEvpvbH8yUb+KHmv8NEjVZdsdpyxA==";
};
};
"@open-policy-agent/opa-wasm-1.2.0" = {
@@ -4864,6 +4837,15 @@ let
sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570";
};
};
+ "@putdotio/api-client-8.15.1" = {
+ name = "_at_putdotio_slash_api-client";
+ packageName = "@putdotio/api-client";
+ version = "8.15.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.15.1.tgz";
+ sha512 = "1ODxgqJJTWe+Sb6XL05oJWmHKt81nDerLtfbJH16LY5Z8dkzg9FS9K0DWrzPR8e9TmGg8rdnF4MBCDGzOJRgCA==";
+ };
+ };
"@react-native-community/cli-debugger-ui-4.13.1" = {
name = "_at_react-native-community_slash_cli-debugger-ui";
packageName = "@react-native-community/cli-debugger-ui";
@@ -4981,13 +4963,13 @@ let
sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
};
};
- "@schematics/angular-11.2.3" = {
+ "@schematics/angular-11.2.6" = {
name = "_at_schematics_slash_angular";
packageName = "@schematics/angular";
- version = "11.2.3";
+ version = "11.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.3.tgz";
- sha512 = "g+vc05FBebIrCQQvN0LcNPZLy8Y/5TfqgmV9M8djc+IZOzObt0Qp75PB2en84KAOx+2YsupAB5MVQHy+FzC8WA==";
+ url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.6.tgz";
+ sha512 = "NUtoX6Dfo2mUWVHt2zXEtlBsz88mo9N9fIPFAEpSY6U9x/jGSs+4rZ6sGRpkqm5UgVtYHzRyQINH7608HuGUuA==";
};
};
"@schematics/schematics-0.1102.0" = {
@@ -4999,13 +4981,13 @@ let
sha512 = "0mN6qGnI31GVNYAKDdZ6ISiJMtN8Z0rekpJ/xNHK/lDNl/QkoJVBHDf68oEcNE8dvWMq86ULpznCdT1IBQ7YFA==";
};
};
- "@schematics/update-0.1102.3" = {
+ "@schematics/update-0.1102.6" = {
name = "_at_schematics_slash_update";
packageName = "@schematics/update";
- version = "0.1102.3";
+ version = "0.1102.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.3.tgz";
- sha512 = "OQLdzokPmMyXT9x0vIfjcfanJHl9+/l/vMVIA4zbvRY5b5ujoaz7+sYQm3gnyq4oXxtNR3Yd9WEjjSIbvj90KA==";
+ url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.6.tgz";
+ sha512 = "JJ9pwGWI5NfwK7d09uQ6zHV63Ms+8r0NsvJHjZlHFlolY04J6yFe0X7TF7/mcjKsaVKCjYIpe5VuTeam/wk5QQ==";
};
};
"@segment/loosely-validate-event-2.0.0" = {
@@ -5035,13 +5017,13 @@ let
sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
};
};
- "@serverless/components-3.7.2" = {
+ "@serverless/components-3.7.7" = {
name = "_at_serverless_slash_components";
packageName = "@serverless/components";
- version = "3.7.2";
+ version = "3.7.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.2.tgz";
- sha512 = "3Fhy/d+3eMZfbPoR4h0atEUJQYdy+6tvYPvaZxOlzzcCEgYj6txAzLVKr617y/mMYqiw5XH91ojOOAtEfZVFWg==";
+ url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.7.tgz";
+ sha512 = "GMo0wOyrfMiekRKZuOI046bxinM/cSsAkLivaT6J0rAG6DV+C8yZHLis5090kya50XndidiSdfshlaP0lv21lQ==";
};
};
"@serverless/core-1.1.2" = {
@@ -5053,13 +5035,13 @@ let
sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
};
};
- "@serverless/enterprise-plugin-4.4.3" = {
+ "@serverless/enterprise-plugin-4.5.2" = {
name = "_at_serverless_slash_enterprise-plugin";
packageName = "@serverless/enterprise-plugin";
- version = "4.4.3";
+ version = "4.5.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.3.tgz";
- sha512 = "2HKtgzv4c9yr9dyecbTJlSnYWaIJL4TQJ4YtVORzeBAm812r8PDK1XS9X8tvLlk2+DF2gu+Tb/Umnxl2rqhqZg==";
+ url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.5.2.tgz";
+ sha512 = "Y/7WK0BAL7oVK3QDV9nL1qUKTC4p/gKWI8W1Ozp+P4RA9RPIqDHmdqmu8Uhc/rUS0nD64LijfLlapeXq2qITVg==";
};
};
"@serverless/event-mocks-1.1.1" = {
@@ -5071,40 +5053,22 @@ let
sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A==";
};
};
- "@serverless/platform-client-3.11.1" = {
+ "@serverless/platform-client-4.2.2" = {
name = "_at_serverless_slash_platform-client";
packageName = "@serverless/platform-client";
- version = "3.11.1";
+ version = "4.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.11.1.tgz";
- sha512 = "f5bo8P5+xAxsnOCUnyEyAmiGTs9sTG8v8t5dTDAdCqSxEEJyl3/Ro5djeW5L2MHzw1XnIMxxrtG38m7rNQSFFg==";
+ url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.2.tgz";
+ sha512 = "8jP72e0POFGEW7HKtDzK0qt1amYtvlB7bYSal8JUCXbeY2qk3xRJZuLWCZBBKRGz4ha4eBNjlz7iniACb9biLg==";
};
};
- "@serverless/platform-client-4.2.0" = {
- name = "_at_serverless_slash_platform-client";
- packageName = "@serverless/platform-client";
- version = "4.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.0.tgz";
- sha512 = "92/Mc09zQbJAw917KhJk0kM76Jpf3njoSevHEu9ASYx7OSjTbZw9B5VdOe4Z2m+4NvUwK0mWBNpSmCvd5uwOhg==";
- };
- };
- "@serverless/platform-client-china-2.1.7" = {
+ "@serverless/platform-client-china-2.1.9" = {
name = "_at_serverless_slash_platform-client-china";
packageName = "@serverless/platform-client-china";
- version = "2.1.7";
+ version = "2.1.9";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.7.tgz";
- sha512 = "XB5vTU1wsjb3gPzQ008gs5wms/NsR2xJRbLj7/Ly1Y8ytFtXp7vmENUFbR4RL/BVd+X4/K3bmVdnHS6dYSyrnw==";
- };
- };
- "@serverless/platform-sdk-2.3.2" = {
- name = "_at_serverless_slash_platform-sdk";
- packageName = "@serverless/platform-sdk";
- version = "2.3.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.3.2.tgz";
- sha512 = "JSX0/EphGVvnb4RAgZYewtBXPuVsU2TFCuXh6EEZ4jxK3WgUwNYeYdwB8EuVLrm1/dYqu/UWUC0rPKb+ZDycJg==";
+ url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.9.tgz";
+ sha512 = "PAqhHshlwY1PTeuwCaJeXfGB64w1Vg6C9FtpoFv7dkb7OAlYl86evJbugGUc4YlsdhQsgJvG3QSZpo7sYK1Ipw==";
};
};
"@serverless/template-1.1.4" = {
@@ -5134,6 +5098,15 @@ let
sha512 = "HhmnTtfGt4gKCNGHg0q9pioltChh+dWbdA7y1aP7vNqjwpZ/pUDAqJf/M3GFozTnhlFpwCY9Ik1tOpDkgP3oiA==";
};
};
+ "@serverless/utils-4.0.0" = {
+ name = "_at_serverless_slash_utils";
+ packageName = "@serverless/utils";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@serverless/utils/-/utils-4.0.0.tgz";
+ sha512 = "SNLjh3qFnKvqZZAljTHY9IuoS+UZytBqfAki+V5DsVjXEKZrAKzem1kpKF2zeARg8tHFDProM0LGFCxGDkkgxw==";
+ };
+ };
"@serverless/utils-china-1.0.14" = {
name = "_at_serverless_slash_utils-china";
packageName = "@serverless/utils-china";
@@ -5206,6 +5179,15 @@ let
sha512 = "QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ==";
};
};
+ "@skorfmann/ink-confirm-input-3.0.0" = {
+ name = "_at_skorfmann_slash_ink-confirm-input";
+ packageName = "@skorfmann/ink-confirm-input";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@skorfmann/ink-confirm-input/-/ink-confirm-input-3.0.0.tgz";
+ sha512 = "mPZe3gBAV4ZDeYZbEs6WpNZuHHj7Hse9p44z6lrKBcbAMWnvApVOC7zZUpeQsUuWPTOWQRu/QSYElDKNajQ2oA==";
+ };
+ };
"@skorfmann/terraform-cloud-1.9.1" = {
name = "_at_skorfmann_slash_terraform-cloud";
packageName = "@skorfmann/terraform-cloud";
@@ -5242,13 +5224,13 @@ let
sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA==";
};
};
- "@snyk/code-client-3.1.4" = {
+ "@snyk/code-client-3.1.5" = {
name = "_at_snyk_slash_code-client";
packageName = "@snyk/code-client";
- version = "3.1.4";
+ version = "3.1.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.1.4.tgz";
- sha512 = "ZZWPWAaKgNii/HYtyO9guFDVpi5T/SoCWQIo/B/RbLbXLrdZ5VIHsn0E4ztY7Y69GjQCyrus5pu7adlYrwQtEQ==";
+ url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.1.5.tgz";
+ sha512 = "bJb00zZ7956MzIjW/4DPaMolk2/r7eox+5Bvq0bpcu1NFUFYYQPZeEPsPgh5YzK4te2v6W5hZBtjUUNIY+AQYg==";
};
};
"@snyk/composer-lockfile-parser-1.4.1" = {
@@ -5260,13 +5242,13 @@ let
sha512 = "wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ==";
};
};
- "@snyk/dep-graph-1.23.1" = {
+ "@snyk/dep-graph-1.28.0" = {
name = "_at_snyk_slash_dep-graph";
packageName = "@snyk/dep-graph";
- version = "1.23.1";
+ version = "1.28.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.23.1.tgz";
- sha512 = "bSlTRVJP0PHtvoilhE463AMt0fhsf9PxCEqJ28VHCVSe5QFzIlgGdljtytV+2DheadGwu27BgLGqPDGMdTBHRQ==";
+ url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz";
+ sha512 = "Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg==";
};
};
"@snyk/docker-registry-v2-client-1.13.9" = {
@@ -5503,139 +5485,139 @@ let
sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg==";
};
};
- "@textlint/ast-node-types-4.4.1" = {
+ "@textlint/ast-node-types-4.4.2" = {
name = "_at_textlint_slash_ast-node-types";
packageName = "@textlint/ast-node-types";
- version = "4.4.1";
+ version = "4.4.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.1.tgz";
- sha512 = "2QBwlqi2SU83vTHibfdTxGiLdIqR0btNyMGfVl0bwA6FI85HnSYoGFLrdCnq2V0nxpbhuvwzcm2Ja81w0VkMGA==";
+ url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.2.tgz";
+ sha512 = "m5brKbI7UY/Q8sbIZ7z1KB8ls04nRILshz5fPQ4EZ04jL19qrrUHJR8A6nK3vJ/GelkDWl4I0VDYSAjLEFQV8g==";
};
};
- "@textlint/ast-tester-2.3.2" = {
+ "@textlint/ast-tester-2.3.4" = {
name = "_at_textlint_slash_ast-tester";
packageName = "@textlint/ast-tester";
- version = "2.3.2";
+ version = "2.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.3.2.tgz";
- sha512 = "4e1kyqsHks5POcQmuh7ITVrU/dbYyRUfQarQbeVRPP271n2HnlgnoYyZ10yV2Sb/Ksw+lQf7DPSnwNewXdCWww==";
+ url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.3.4.tgz";
+ sha512 = "2gIsnJ1Dmr5jjF+u/vusNRqk2bJi0WwwbjP9WV/op51DhDTi7BUNjVSiZtcP9NVxidvs51XNEg+EMTRoKP3Msg==";
};
};
- "@textlint/ast-traverse-2.3.2" = {
+ "@textlint/ast-traverse-2.3.4" = {
name = "_at_textlint_slash_ast-traverse";
packageName = "@textlint/ast-traverse";
- version = "2.3.2";
+ version = "2.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.3.2.tgz";
- sha512 = "Dt1s/6x0XWhUNFH2rAa9gL6ODtq232BZuBHuHiOg+SrVwzl+VjOfa3fMQ0LoYixGSyDtwqAlksWcC0KyLz0eSw==";
+ url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.3.4.tgz";
+ sha512 = "NcjPXCvP8r4D2/azeQhwjPvh2+099I9RRBUrg6IpMfTW4IUUJb4BwZOPgjW+XRIVc71Dhgm82VSIagDL90FYcg==";
};
};
- "@textlint/feature-flag-3.3.2" = {
+ "@textlint/feature-flag-3.3.4" = {
name = "_at_textlint_slash_feature-flag";
packageName = "@textlint/feature-flag";
- version = "3.3.2";
+ version = "3.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.3.2.tgz";
- sha512 = "7ErQ/UF0IBAd+PkQNBD7yYCDqL2o6leErMDENSWAgUHWLy5TcHr3Orn7qswtBMW5gIyXW9lh+EpllwLJ5qv35w==";
+ url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.3.4.tgz";
+ sha512 = "ULAqdD2y1sPAhbkaMjS2fltrZYCNQGsNDv/NQWFsCmDpQ1R8kxoUaTiXpebTM+nVuyvU5GfdkxhHyMarPIjmYw==";
};
};
- "@textlint/fixer-formatter-3.3.2" = {
+ "@textlint/fixer-formatter-3.3.4" = {
name = "_at_textlint_slash_fixer-formatter";
packageName = "@textlint/fixer-formatter";
- version = "3.3.2";
+ version = "3.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.3.2.tgz";
- sha512 = "aTEyH/rHSzxRLrluSjNhDnMSgIYK60J5AAgprKJCkb9h3dDRuNoiJ+BXh5FXVSSm1tGF0d8pu+Ph8OFBgQOchQ==";
+ url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.3.4.tgz";
+ sha512 = "H4i+N+uN7EiI5vRnfRIccFc5yekNHnO8795fiOK2TZPb6SzY3iwLOGZ2rDKvgu7ZKdyGW945w3T0elUF3Fkr5A==";
};
};
- "@textlint/kernel-3.4.2" = {
+ "@textlint/kernel-3.4.4" = {
name = "_at_textlint_slash_kernel";
packageName = "@textlint/kernel";
- version = "3.4.2";
+ version = "3.4.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.4.2.tgz";
- sha512 = "PpxAtvLGI9ewn+Dbt4j0KMfmMM39/AY3cikmZffu59nyTdIymXMeVMEVkpVZTEUk5OlL27RAON9FF+2u+0fshg==";
+ url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.4.4.tgz";
+ sha512 = "ro9TPnE16C6gtKkY3aOjTs8ZfzAxdXLCV9JD4BuV5P+xBiiu9NdiE2Hwm3LyEGQjMxaKnXjbm/DTCAxA4gz0Dg==";
};
};
- "@textlint/linter-formatter-3.3.2" = {
+ "@textlint/linter-formatter-3.3.4" = {
name = "_at_textlint_slash_linter-formatter";
packageName = "@textlint/linter-formatter";
- version = "3.3.2";
+ version = "3.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.3.2.tgz";
- sha512 = "MRa8D1/x6pWycKTwb1QLjtY7GyjgcsYRfV0Gu0Aze5szCa3UDwZSewHycpcAGlIqr8AkqPRfyXi653M47eJ0rA==";
+ url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.3.4.tgz";
+ sha512 = "k1lyvR+w7ctwr5dWhMVRTKk19GH99BAO2dLk8ZS0ZcYyKqKAKu6Iyb1cWEg/u3dT3KFbWwoegnAelfz5828SHQ==";
};
};
- "@textlint/markdown-to-ast-6.3.2" = {
+ "@textlint/markdown-to-ast-6.3.4" = {
name = "_at_textlint_slash_markdown-to-ast";
packageName = "@textlint/markdown-to-ast";
- version = "6.3.2";
+ version = "6.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.3.2.tgz";
- sha512 = "uwndF3PRJ48wTVAEDSy0IAEVJg/scxpdZ1r+QKeGuFfdtaGSrtcgROI6qiVU1g/WNyNfQw+DAA7F8HfM+pmleg==";
+ url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.3.4.tgz";
+ sha512 = "LLScbDRXov1l4U4OCLJ5clu9eWNonBG+rhuArwYAHpf0hwIoNoETfAQvrNtXZG/NZ96fdWv4PLtaN6dA4ldRdQ==";
};
};
- "@textlint/module-interop-1.2.2" = {
+ "@textlint/module-interop-1.2.4" = {
name = "_at_textlint_slash_module-interop";
packageName = "@textlint/module-interop";
- version = "1.2.2";
+ version = "1.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.2.2.tgz";
- sha512 = "B8HPS129lOqzEpRcafYl/OJ2TDxfBw1jGfEhebzwt3kGoMd5pQVih+hUIOl+SfAmLWqCDEniaKn0gw1s+hjSXA==";
+ url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.2.4.tgz";
+ sha512 = "/wUKvDbBEujrhpcuD7Et4Mcicm3SG2oAe/tyMruLxSJ86umGxd34dEcHRON8fJzou9qyt0gFoczcypd4k3hJow==";
};
};
- "@textlint/source-code-fixer-3.4.2" = {
+ "@textlint/source-code-fixer-3.4.4" = {
name = "_at_textlint_slash_source-code-fixer";
packageName = "@textlint/source-code-fixer";
- version = "3.4.2";
+ version = "3.4.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-3.4.2.tgz";
- sha512 = "mSGQNO8is21KcHgDh4S8Cx88r7uU+7xpzHLuEuzhgEZfgwz3+tnpk22TrEjNYe1V1+aseU9iCQegVQQr1wroKQ==";
+ url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-3.4.4.tgz";
+ sha512 = "GDHVin2EJ9PGJ33VMGlqtPcvUlY+pkTbaWs4jWv8oBaEK8UUBzS5ZpEc4xi7Xp5vIXnVsCSLKNC6bgvR9X/AoQ==";
};
};
- "@textlint/text-to-ast-3.3.2" = {
+ "@textlint/text-to-ast-3.3.4" = {
name = "_at_textlint_slash_text-to-ast";
packageName = "@textlint/text-to-ast";
- version = "3.3.2";
+ version = "3.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.3.2.tgz";
- sha512 = "+DKAP62ho21KID8IcKy1kP6K+kUZk+Z0MwvS9u2l39J0cK+vX523KI+sA6AXxEhOMDA8zhdIsBf3onGvrAtyhA==";
+ url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.3.4.tgz";
+ sha512 = "oDwGNQCAo7ROnHqaksPEogf8fxXGU3Z61C6NEv0n9vEWEkUX9oUVX4c9kh5UieZL5nN/xIdzVc3TrXywkkOK3g==";
};
};
- "@textlint/textlint-plugin-markdown-5.3.2" = {
+ "@textlint/textlint-plugin-markdown-5.3.4" = {
name = "_at_textlint_slash_textlint-plugin-markdown";
packageName = "@textlint/textlint-plugin-markdown";
- version = "5.3.2";
+ version = "5.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.3.2.tgz";
- sha512 = "6Ph7ESKR48tEz5Pnog3PpvF84LU3jkADvr4iBkkVz9vLQt3KbqGnmk8EV94Y0hLEX+UrZKWmH3cJfh6O1Zy/eA==";
+ url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.3.4.tgz";
+ sha512 = "g8KKuwhzzlRjvKrpq3SbGc+JJMAJoy5Xp0Ibvq7QKgNVxwN/f5WtmrJc8CdgFG7++jgtkDPlofz0c9xG63xKwQ==";
};
};
- "@textlint/textlint-plugin-text-4.3.2" = {
+ "@textlint/textlint-plugin-text-4.3.4" = {
name = "_at_textlint_slash_textlint-plugin-text";
packageName = "@textlint/textlint-plugin-text";
- version = "4.3.2";
+ version = "4.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.3.2.tgz";
- sha512 = "xnjad0bXaM6ZtgffuFKogHYkzXymUK3VTLP5MGA00kLitADlNUtwXQk82TebkXFcSPRhePU9+2XFipXNQDsg7g==";
+ url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.3.4.tgz";
+ sha512 = "ZtctKFR8V9mIZAMibS97xPWlt2lViizIRAy4oDaKCnxAwJ0uAjxm/OlHHdaFwNydGaEDtN60mcmarDqOOAZIiA==";
};
};
- "@textlint/types-1.5.2" = {
+ "@textlint/types-1.5.4" = {
name = "_at_textlint_slash_types";
packageName = "@textlint/types";
- version = "1.5.2";
+ version = "1.5.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.2.tgz";
- sha512 = "IdS0h2MCzdY+wjM0+qvl8IW/IxhmVFAVrGu5TmIBpJkihIV7WMa3ITFXIVb0oqwnePUmyLBRIVsCtC66E3QbfQ==";
+ url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.4.tgz";
+ sha512 = "bhSrOjW8AFSa/xf6lYZ2akE0j+4O/WEAA2S/R8RrjNMkA5Az2j57mxPNpqMhEeyHDkpzN/coIlqUwgYvcJHv1A==";
};
};
- "@textlint/utils-1.2.2" = {
+ "@textlint/utils-1.2.4" = {
name = "_at_textlint_slash_utils";
packageName = "@textlint/utils";
- version = "1.2.2";
+ version = "1.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.2.2.tgz";
- sha512 = "7Mqcl9G9YYrPBv5d/tZ2NlWC66hTUpQEQxZEHDMTdF3gPmQUSNRNGjqUR9mhw00Wy8Wo6i3LUWuxwMT6heHNBQ==";
+ url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.2.4.tgz";
+ sha512 = "FREWc8n6bJFsKehtUlHPtbqnXULWhdnlazqWiHMjiBtcxUfD+1kY3P7PNGbChdzeZGmwBkgFQyGkok8bAGnZOw==";
};
};
"@tokenizer/token-0.1.1" = {
@@ -5701,13 +5683,13 @@ let
sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA==";
};
};
- "@types/babel__core-7.1.12" = {
+ "@types/babel__core-7.1.14" = {
name = "_at_types_slash_babel__core";
packageName = "@types/babel__core";
- version = "7.1.12";
+ version = "7.1.14";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz";
- sha512 = "wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==";
+ url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz";
+ sha512 = "zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==";
};
};
"@types/babel__generator-7.6.2" = {
@@ -5728,13 +5710,13 @@ let
sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==";
};
};
- "@types/babel__traverse-7.11.0" = {
+ "@types/babel__traverse-7.11.1" = {
name = "_at_types_slash_babel__traverse";
packageName = "@types/babel__traverse";
- version = "7.11.0";
+ version = "7.11.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz";
- sha512 = "kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==";
+ url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz";
+ sha512 = "Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==";
};
};
"@types/babylon-6.16.5" = {
@@ -5989,13 +5971,22 @@ let
sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==";
};
};
- "@types/express-4.17.7" = {
+ "@types/estree-0.0.47" = {
+ name = "_at_types_slash_estree";
+ packageName = "@types/estree";
+ version = "0.0.47";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz";
+ sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==";
+ };
+ };
+ "@types/express-4.17.11" = {
name = "_at_types_slash_express";
packageName = "@types/express";
- version = "4.17.7";
+ version = "4.17.11";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/express/-/express-4.17.7.tgz";
- sha512 = "dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ==";
+ url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz";
+ sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==";
};
};
"@types/express-4.17.8" = {
@@ -6016,6 +6007,15 @@ let
sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
};
};
+ "@types/express-serve-static-core-4.17.19" = {
+ name = "_at_types_slash_express-serve-static-core";
+ packageName = "@types/express-serve-static-core";
+ version = "4.17.19";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz";
+ sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==";
+ };
+ };
"@types/fancy-log-1.3.0" = {
name = "_at_types_slash_fancy-log";
packageName = "@types/fancy-log";
@@ -6376,13 +6376,13 @@ let
sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
};
};
- "@types/minimatch-3.0.3" = {
+ "@types/minimatch-3.0.4" = {
name = "_at_types_slash_minimatch";
packageName = "@types/minimatch";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
- sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
+ url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz";
+ sha512 = "1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==";
};
};
"@types/minimist-1.2.0" = {
@@ -6439,13 +6439,13 @@ let
sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==";
};
};
- "@types/mocha-8.2.1" = {
+ "@types/mocha-8.2.2" = {
name = "_at_types_slash_mocha";
packageName = "@types/mocha";
- version = "8.2.1";
+ version = "8.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.1.tgz";
- sha512 = "NysN+bNqj6E0Hv4CTGWSlPzMW6vTKjDpOteycDkV4IWBsO+PU48JonrPzV9ODjiI2XrjmA05KInLgF5ivZ/YGQ==";
+ url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz";
+ sha512 = "Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw==";
};
};
"@types/multer-1.4.4" = {
@@ -6493,13 +6493,13 @@ let
sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ==";
};
};
- "@types/node-13.13.45" = {
+ "@types/node-13.13.47" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "13.13.45";
+ version = "13.13.47";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-13.13.45.tgz";
- sha512 = "703YTEp8AwQeapI0PTXDOj+Bs/mtdV/k9VcTP7z/de+lx6XjFMKdB+JhKnK+6PZ5za7omgZ3V6qm/dNkMj/Zow==";
+ url = "https://registry.npmjs.org/@types/node/-/node-13.13.47.tgz";
+ sha512 = "R6851wTjN1YJza8ZIeX6puNBSi/ZULHVh4WVleA7q256l+cP2EtXnKbO455fTs2ytQk3dL9qkU+Wh8l/uROdKg==";
};
};
"@types/node-14.11.1" = {
@@ -6520,6 +6520,15 @@ let
sha512 = "/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg==";
};
};
+ "@types/node-14.14.35" = {
+ name = "_at_types_slash_node";
+ packageName = "@types/node";
+ version = "14.14.35";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz";
+ sha512 = "Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==";
+ };
+ };
"@types/node-6.14.13" = {
name = "_at_types_slash_node";
packageName = "@types/node";
@@ -6646,15 +6655,6 @@ let
sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
};
};
- "@types/readline-sync-1.4.3" = {
- name = "_at_types_slash_readline-sync";
- packageName = "@types/readline-sync";
- version = "1.4.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/readline-sync/-/readline-sync-1.4.3.tgz";
- sha512 = "YP9NVli96E+qQLAF2db+VjnAUEeZcFVg4YnMgr8kpDUFwQBnj31rPLOVHmazbKQhaIkJ9cMHsZhpKdzUeL0KTg==";
- };
- };
"@types/request-2.48.5" = {
name = "_at_types_slash_request";
packageName = "@types/request";
@@ -6790,15 +6790,6 @@ let
sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA==";
};
};
- "@types/stream-buffers-3.0.3" = {
- name = "_at_types_slash_stream-buffers";
- packageName = "@types/stream-buffers";
- version = "3.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.3.tgz";
- sha512 = "NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ==";
- };
- };
"@types/superagent-3.8.2" = {
name = "_at_types_slash_superagent";
packageName = "@types/superagent";
@@ -6925,13 +6916,13 @@ let
sha512 = "LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==";
};
};
- "@types/websocket-1.0.1" = {
+ "@types/websocket-1.0.2" = {
name = "_at_types_slash_websocket";
packageName = "@types/websocket";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.1.tgz";
- sha512 = "f5WLMpezwVxCLm1xQe/kdPpQIOmL0TXYx2O15VYfYzc7hTIdxiOoOvez+McSIw3b7z/1zGovew9YSL7+h4h7/Q==";
+ url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.2.tgz";
+ sha512 = "B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ==";
};
};
"@types/ws-7.4.0" = {
@@ -6988,22 +6979,13 @@ let
sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==";
};
};
- "@types/zen-observable-0.8.2" = {
- name = "_at_types_slash_zen-observable";
- packageName = "@types/zen-observable";
- version = "0.8.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz";
- sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg==";
- };
- };
- "@typescript-eslint/eslint-plugin-4.16.1" = {
+ "@typescript-eslint/eslint-plugin-4.19.0" = {
name = "_at_typescript-eslint_slash_eslint-plugin";
packageName = "@typescript-eslint/eslint-plugin";
- version = "4.16.1";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.16.1.tgz";
- sha512 = "SK777klBdlkUZpZLC1mPvyOWk9yAFCWmug13eAjVQ4/Q1LATE/NbcQL1xDHkptQkZOLnPmLUA1Y54m8dqYwnoQ==";
+ url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz";
+ sha512 = "CRQNQ0mC2Pa7VLwKFbrGVTArfdVDdefS+gTw0oC98vSI98IX5A8EVH4BzJ2FOB0YlCmm8Im36Elad/Jgtvveaw==";
};
};
"@typescript-eslint/experimental-utils-3.10.1" = {
@@ -7015,13 +6997,13 @@ let
sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";
};
};
- "@typescript-eslint/experimental-utils-4.16.1" = {
+ "@typescript-eslint/experimental-utils-4.19.0" = {
name = "_at_typescript-eslint_slash_experimental-utils";
packageName = "@typescript-eslint/experimental-utils";
- version = "4.16.1";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz";
- sha512 = "0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==";
+ url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.19.0.tgz";
+ sha512 = "9/23F1nnyzbHKuoTqFN1iXwN3bvOm/PRIXSBR3qFAYotK/0LveEOHr5JT1WZSzcD6BESl8kPOG3OoDRKO84bHA==";
};
};
"@typescript-eslint/parser-3.10.1" = {
@@ -7033,22 +7015,22 @@ let
sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";
};
};
- "@typescript-eslint/parser-4.16.1" = {
+ "@typescript-eslint/parser-4.19.0" = {
name = "_at_typescript-eslint_slash_parser";
packageName = "@typescript-eslint/parser";
- version = "4.16.1";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.16.1.tgz";
- sha512 = "/c0LEZcDL5y8RyI1zLcmZMvJrsR6SM1uetskFkoh3dvqDKVXPsXI+wFB/CbVw7WkEyyTKobC1mUNp/5y6gRvXg==";
+ url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.19.0.tgz";
+ sha512 = "/uabZjo2ZZhm66rdAu21HA8nQebl3lAIDcybUoOxoI7VbZBYavLIwtOOmykKCJy+Xq6Vw6ugkiwn8Js7D6wieA==";
};
};
- "@typescript-eslint/scope-manager-4.16.1" = {
+ "@typescript-eslint/scope-manager-4.19.0" = {
name = "_at_typescript-eslint_slash_scope-manager";
packageName = "@typescript-eslint/scope-manager";
- version = "4.16.1";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz";
- sha512 = "6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==";
+ url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz";
+ sha512 = "GGy4Ba/hLXwJXygkXqMzduqOMc+Na6LrJTZXJWVhRrSuZeXmu8TAnniQVKgj8uTRKe4igO2ysYzH+Np879G75g==";
};
};
"@typescript-eslint/types-3.10.1" = {
@@ -7060,13 +7042,13 @@ let
sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";
};
};
- "@typescript-eslint/types-4.16.1" = {
+ "@typescript-eslint/types-4.19.0" = {
name = "_at_typescript-eslint_slash_types";
packageName = "@typescript-eslint/types";
- version = "4.16.1";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz";
- sha512 = "nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.19.0.tgz";
+ sha512 = "A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA==";
};
};
"@typescript-eslint/typescript-estree-2.34.0" = {
@@ -7087,13 +7069,13 @@ let
sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";
};
};
- "@typescript-eslint/typescript-estree-4.16.1" = {
+ "@typescript-eslint/typescript-estree-4.19.0" = {
name = "_at_typescript-eslint_slash_typescript-estree";
packageName = "@typescript-eslint/typescript-estree";
- version = "4.16.1";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz";
- sha512 = "m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==";
+ url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz";
+ sha512 = "3xqArJ/A62smaQYRv2ZFyTA+XxGGWmlDYrsfZG68zJeNbeqRScnhf81rUVa6QG4UgzHnXw5VnMT5cg75dQGDkA==";
};
};
"@typescript-eslint/visitor-keys-3.10.1" = {
@@ -7105,31 +7087,31 @@ let
sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
};
};
- "@typescript-eslint/visitor-keys-4.16.1" = {
+ "@typescript-eslint/visitor-keys-4.19.0" = {
name = "_at_typescript-eslint_slash_visitor-keys";
packageName = "@typescript-eslint/visitor-keys";
- version = "4.16.1";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz";
- sha512 = "s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==";
+ url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz";
+ sha512 = "aGPS6kz//j7XLSlgpzU2SeTqHPsmRYxFztj2vPuMMFJXZudpRSehE3WCV+BaxwZFvfAqMoSd86TEuM0PQ59E/A==";
};
};
- "@uifabric/foundation-7.9.25" = {
+ "@uifabric/foundation-7.9.26" = {
name = "_at_uifabric_slash_foundation";
packageName = "@uifabric/foundation";
- version = "7.9.25";
+ version = "7.9.26";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.25.tgz";
- sha512 = "E9YMzbbgvNtZEJx1/AZBJX6Ut2chgoA7/ODB9+el6QyUErL/WUeIlXHbl8TZungRL9e1T4Bma48CNvBT8Ul+Fg==";
+ url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.26.tgz";
+ sha512 = "1FLTb+jlH/Tuel2L9wT/zLl5ZW6W4Lbjrs5VUVjv81vWxzznvPnTf8+Ew0qkzaH7xDuMNMl7okswhV0IfJyheg==";
};
};
- "@uifabric/icons-7.5.22" = {
+ "@uifabric/icons-7.5.23" = {
name = "_at_uifabric_slash_icons";
packageName = "@uifabric/icons";
- version = "7.5.22";
+ version = "7.5.23";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.22.tgz";
- sha512 = "xJwgJG2IoEM/sFc4qzG5vXE/eY+vuz6IxPVXH0UoQ+9XY2KRb9p5pjBIx4SM/h0belCBMPF5rGnWYeg6hi14dQ==";
+ url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.23.tgz";
+ sha512 = "eIvUbH0EWgFgdfgFfINgqS2ZVZTyJ/9n5nR4bmcyAe75wsKxm4ser4WIT9IvaBF6+HFVfjUF/v6+VMD7y2LBng==";
};
};
"@uifabric/merge-styles-7.19.2" = {
@@ -7141,13 +7123,13 @@ let
sha512 = "kTlhwglDqwVgIaJq+0yXgzi65plGhmFcPrfme/rXUGMJZoU+qlGT5jXj5d3kuI59p6VB8jWEg9DAxHozhYeu0g==";
};
};
- "@uifabric/react-hooks-7.13.12" = {
+ "@uifabric/react-hooks-7.14.0" = {
name = "_at_uifabric_slash_react-hooks";
packageName = "@uifabric/react-hooks";
- version = "7.13.12";
+ version = "7.14.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.12.tgz";
- sha512 = "TVeBLMI9Cpo0duxt5NkyMAAPyTVsqYQSt+EmjDIZI92abptqBpuiLGXHnLaf+Egw8VgzBv5Vqs8ZRzMg6mhYkA==";
+ url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.14.0.tgz";
+ sha512 = "Ndu/DEKHF4gFXEZa2AGgSkdWaj+njVrsSyXbkWRh2UZReFWnH1LMko9p/ZCwk1i9kAd5CUmyIfURUzIEya9YCg==";
};
};
"@uifabric/set-version-7.0.24" = {
@@ -7159,13 +7141,13 @@ let
sha512 = "t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg==";
};
};
- "@uifabric/styling-7.18.1" = {
+ "@uifabric/styling-7.19.0" = {
name = "_at_uifabric_slash_styling";
packageName = "@uifabric/styling";
- version = "7.18.1";
+ version = "7.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.18.1.tgz";
- sha512 = "yLavWTQ4rAE3uZ3h/odlCKyun3amjlESZu+KAdEfQWnsMMV4VFpJXc1Mhqm/Rzf9rNySaiZMzJ2R4urWcHTJHQ==";
+ url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.19.0.tgz";
+ sha512 = "fXComDtGV7dHF4rP4cLHwI6fC+1f/nvPavpMBz4IQdySwixta9TVMKbzt0OA6i0mJztqZCVAd27F/sl9R/JmcQ==";
};
};
"@uifabric/utilities-7.33.5" = {
@@ -7195,13 +7177,13 @@ let
sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==";
};
};
- "@unicode/unicode-13.0.0-1.0.4" = {
+ "@unicode/unicode-13.0.0-1.0.6" = {
name = "_at_unicode_slash_unicode-13.0.0";
packageName = "@unicode/unicode-13.0.0";
- version = "1.0.4";
+ version = "1.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.4.tgz";
- sha512 = "0lYwG9JxFapUG1TguDx1PvJ8RhTuojnuRexG2Z2WWDXXAFlzIQgu+6Og7rXwvopU0I3fQK1f7Z+rGm9tD8rYbQ==";
+ url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.6.tgz";
+ sha512 = "ywSlML1wdeBSGH12b6PkblGtjzsQNMZ7+JlJj+eoPj0VuCeg52hcUTeVWfd4GmISU+zOQHWjNC6c0xmsIuVy8Q==";
};
};
"@uphold/request-logger-2.0.0" = {
@@ -7213,40 +7195,40 @@ let
sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084";
};
};
- "@vue/cli-shared-utils-4.5.11" = {
+ "@vue/cli-shared-utils-4.5.12" = {
name = "_at_vue_slash_cli-shared-utils";
packageName = "@vue/cli-shared-utils";
- version = "4.5.11";
+ version = "4.5.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.11.tgz";
- sha512 = "+aaQ+ThQG3+WMexfSWNl0y6f43edqVqRNbguE53F3TIH81I7saS5S750ayqXhZs2r6STJJyqorQnKtAWfHo29A==";
+ url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.12.tgz";
+ sha512 = "qnIQPJ4XckMoqYh9fJ0Y91QKMIb4Hiibrm9+k4E15QHpk5RaokuOpf10SsOr2NLPCXSWsHOLo3hduZSwHPGY/Q==";
};
};
- "@vue/cli-ui-4.5.11" = {
+ "@vue/cli-ui-4.5.12" = {
name = "_at_vue_slash_cli-ui";
packageName = "@vue/cli-ui";
- version = "4.5.11";
+ version = "4.5.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.11.tgz";
- sha512 = "hT9cukom8WkV+U3GL0yOFDvWXqG35vy5ddSLideUOK2Ylht0AW7P9DDfUls/cDCpQ172LfPnvKRO/8zADqSElg==";
+ url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.12.tgz";
+ sha512 = "TeP4ujkrUF3/l92R7fAIl6SbTyEw5CbrMpQggctgKrtOtMWorSGhWm17vGtP0C3PoZqzniOzDC7cdO83PL4n+g==";
};
};
- "@vue/cli-ui-addon-webpack-4.5.11" = {
+ "@vue/cli-ui-addon-webpack-4.5.12" = {
name = "_at_vue_slash_cli-ui-addon-webpack";
packageName = "@vue/cli-ui-addon-webpack";
- version = "4.5.11";
+ version = "4.5.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.11.tgz";
- sha512 = "k7Iv8ZfoiFtbHNDlntIUee1fCbS5PkQT9ZuI+tMV7eP7fbQXPSRDefsEOb0lAnrZ953tli+AF+hh2XhP6ihZig==";
+ url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.12.tgz";
+ sha512 = "sPAElJL00koP6BxUSGj5wntH96+IBuhLpu+0YPUYpIMeT/e/Hip/HnsjBzeiv88CvGQKomsjykPQRi26kR/Tjw==";
};
};
- "@vue/cli-ui-addon-widgets-4.5.11" = {
+ "@vue/cli-ui-addon-widgets-4.5.12" = {
name = "_at_vue_slash_cli-ui-addon-widgets";
packageName = "@vue/cli-ui-addon-widgets";
- version = "4.5.11";
+ version = "4.5.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.11.tgz";
- sha512 = "uUZIfWWfvFMAtfyzaJDtwRqN2vNzc2nnALEJliv2ccVRZHS8mwB/aLoaX0hL3h+RBJ8WV2PDiXmRFcESyDfKjA==";
+ url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.12.tgz";
+ sha512 = "GIh+ETKezlmEWmZ/MxKuuJqdfSgYk8DlnIsMnNpbUcdxhHZFbkV2mv/0UoQaH2y0BQhBXBOt9TBJ9j4OeN3DwA==";
};
};
"@vue/compiler-core-3.0.7" = {
@@ -7267,51 +7249,6 @@ let
sha512 = "VnIH9EbWQm/Tkcp+8dCaNVsVvhm/vxCrIKWRkXY9215hTqOqQOvejT8IMjd2kc++nIsYMsdQk6H9qqBvoLe/Cw==";
};
};
- "@vue/compiler-sfc-3.0.7" = {
- name = "_at_vue_slash_compiler-sfc";
- packageName = "@vue/compiler-sfc";
- version = "3.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.7.tgz";
- sha512 = "37/QILpGE+J3V+bP9Slg9e6xGqfk+MmS2Yj8ChR4fS0/qWUU/YoYHE0GPIzjmBdH0JVOOmJqunxowIXmqNiHng==";
- };
- };
- "@vue/compiler-ssr-3.0.7" = {
- name = "_at_vue_slash_compiler-ssr";
- packageName = "@vue/compiler-ssr";
- version = "3.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.7.tgz";
- sha512 = "nHRbHeSpfXwjypettjrA16TjgfDcPEwq3m/zHnGyLC1QqdLtklXmpSM43/CPwwTCRa/qdt0pldJf22MiCEuTSQ==";
- };
- };
- "@vue/reactivity-3.0.7" = {
- name = "_at_vue_slash_reactivity";
- packageName = "@vue/reactivity";
- version = "3.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.7.tgz";
- sha512 = "FotWcNNaKhqpFZrdgsUOZ1enlJ5lhTt01CNTtLSyK7jYFgZBTuw8vKsEutZKDYZ1XKotOfoeO8N3pZQqmM6Etw==";
- };
- };
- "@vue/runtime-core-3.0.7" = {
- name = "_at_vue_slash_runtime-core";
- packageName = "@vue/runtime-core";
- version = "3.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.7.tgz";
- sha512 = "DBAZAwVvdmMXuyd6/9qqj/kYr/GaLTmn1L2/QLxLwP+UfhIboiTSBc/tUUb8MRk7Bb98GzNeAWkkT6AfooS3dQ==";
- };
- };
- "@vue/runtime-dom-3.0.7" = {
- name = "_at_vue_slash_runtime-dom";
- packageName = "@vue/runtime-dom";
- version = "3.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.7.tgz";
- sha512 = "Oij4ruOtnpQpCj+/Q3JPzgpTJ1Q7+N67pA53A8KVITEtxfvKL46NN6dhAZ5NGqwX6RWZpYqWQNewITeF0pHr8g==";
- };
- };
"@vue/shared-3.0.7" = {
name = "_at_vue_slash_shared";
packageName = "@vue/shared";
@@ -8005,15 +7942,6 @@ let
sha512 = "k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw==";
};
};
- "@wry/context-0.4.4" = {
- name = "_at_wry_slash_context";
- packageName = "@wry/context";
- version = "0.4.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/@wry/context/-/context-0.4.4.tgz";
- sha512 = "LrKVLove/zw6h2Md/KZyWxIkFM6AoyKp71OqpH9Hiip1csjPVoD3tPxlbQUNxEnHENks3UGgNpSBCAfq9KWuag==";
- };
- };
"@wry/equality-0.1.11" = {
name = "_at_wry_slash_equality";
packageName = "@wry/equality";
@@ -8086,15 +8014,6 @@ let
sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
};
};
- "JSONSelect-0.2.1" = {
- name = "JSONSelect";
- packageName = "JSONSelect";
- version = "0.2.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/JSONSelect/-/JSONSelect-0.2.1.tgz";
- sha1 = "415418a526d33fe31d74b4defa3c836d485ec203";
- };
- };
"JSONStream-0.10.0" = {
name = "JSONStream";
packageName = "JSONStream";
@@ -8302,13 +8221,13 @@ let
sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
};
};
- "acorn-8.0.5" = {
+ "acorn-8.1.0" = {
name = "acorn";
packageName = "acorn";
- version = "8.0.5";
+ version = "8.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/acorn/-/acorn-8.0.5.tgz";
- sha512 = "v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg==";
+ url = "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz";
+ sha512 = "LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==";
};
};
"acorn-globals-1.0.9" = {
@@ -8446,22 +8365,22 @@ let
sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa";
};
};
- "addons-linter-2.13.1" = {
+ "addons-linter-2.21.0" = {
name = "addons-linter";
packageName = "addons-linter";
- version = "2.13.1";
+ version = "2.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.13.1.tgz";
- sha512 = "OWMuABpZRNeru38oOjn7QYOF0JOXJQXG9c3r4ILTRwTBeSu3LtfgCh9/7zLVgTYPbTs7Qy6h23u4Sel65uSnUQ==";
+ url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.21.0.tgz";
+ sha512 = "1XfqeVbvaEpjRlWJq/Ti0W6bH3RszaIDPeKl+4ZmXCx+C8ovRqy4CJmitqNffLr+2KpY4h5ei2eRygbvJYDyrw==";
};
};
- "addons-scanner-utils-4.0.0" = {
+ "addons-scanner-utils-4.2.0" = {
name = "addons-scanner-utils";
packageName = "addons-scanner-utils";
- version = "4.0.0";
+ version = "4.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.0.0.tgz";
- sha512 = "+BfePzqoo/7Nhum9LONGsga2xhNJYb+6k6j819pzcd2tqaaqDUJu+3lz4CQQYFcD8QoolB3ksfZcCPymleFq0A==";
+ url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.2.0.tgz";
+ sha512 = "VKLYNlKg2RCMvmOKmbWlu14hjdyk2vcTHscQGmDlnHfWcf6fAb8E7vY9/ajWdLykVVKZEUiGOoD5EIkIp1FyUA==";
};
};
"addr-to-ip-port-1.5.1" = {
@@ -8563,15 +8482,6 @@ let
sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==";
};
};
- "agent-base-5.1.1" = {
- name = "agent-base";
- packageName = "agent-base";
- version = "5.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz";
- sha512 = "TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==";
- };
- };
"agent-base-6.0.2" = {
name = "agent-base";
packageName = "agent-base";
@@ -8671,13 +8581,13 @@ let
sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==";
};
};
- "ajv-7.2.1" = {
+ "ajv-7.2.3" = {
name = "ajv";
packageName = "ajv";
- version = "7.2.1";
+ version = "7.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/ajv/-/ajv-7.2.1.tgz";
- sha512 = "+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ==";
+ url = "https://registry.npmjs.org/ajv/-/ajv-7.2.3.tgz";
+ sha512 = "idv5WZvKVXDqKralOImQgPM9v6WOdLNa0IY3B3doOjw/YxRGT8I+allIJ6kd7Uaj+SF1xZUSU+nPM5aDNBVtnw==";
};
};
"ajv-errors-1.0.1" = {
@@ -8761,6 +8671,15 @@ let
sha512 = "2Sy0hWhifVb8ycNFJgicL8fDPL2Ct1r62XOVxXnykn36z22MPZwnQlCmB2viQlY/lwfuO67GaQjUZ0rJgdVP7Q==";
};
};
+ "all-node-versions-8.0.0" = {
+ name = "all-node-versions";
+ packageName = "all-node-versions";
+ version = "8.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/all-node-versions/-/all-node-versions-8.0.0.tgz";
+ sha512 = "cF8ibgj23U7ai4qjSFzpeccwDXUlPFMzKe0Z6qf6gChR+9S0JMyzYz6oYz4n0nHi/FLH9BJIefsONsMH/WDM2w==";
+ };
+ };
"alphanum-sort-1.0.2" = {
name = "alphanum-sort";
packageName = "alphanum-sort";
@@ -8923,13 +8842,13 @@ let
sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
};
};
- "ansi-escapes-4.3.1" = {
+ "ansi-escapes-4.3.2" = {
name = "ansi-escapes";
packageName = "ansi-escapes";
- version = "4.3.1";
+ version = "4.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz";
- sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==";
+ url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz";
+ sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==";
};
};
"ansi-gray-0.1.1" = {
@@ -9202,24 +9121,6 @@ let
sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw==";
};
};
- "apollo-2.32.5" = {
- name = "apollo";
- packageName = "apollo";
- version = "2.32.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo/-/apollo-2.32.5.tgz";
- sha512 = "M2EWO9OZYbyziBUqYNSs5eYm9MNarYxLhZyZQp7mbJPdVN8i+w+KMBtD5rOS4e8oZN7lblhz/ooZtlNI2F6nwg==";
- };
- };
- "apollo-cache-1.3.5" = {
- name = "apollo-cache";
- packageName = "apollo-cache";
- version = "1.3.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.3.5.tgz";
- sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA==";
- };
- };
"apollo-cache-control-0.11.6" = {
name = "apollo-cache-control";
packageName = "apollo-cache-control";
@@ -9229,69 +9130,6 @@ let
sha512 = "YZ+uuIG+fPy+mkpBS2qKF0v1qlzZ3PW6xZVaDukeK3ed3iAs4L/2YnkTqau3OmoF/VPzX2FmSkocX/OVd59YSw==";
};
};
- "apollo-cache-inmemory-1.6.6" = {
- name = "apollo-cache-inmemory";
- packageName = "apollo-cache-inmemory";
- version = "1.6.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.6.tgz";
- sha512 = "L8pToTW/+Xru2FFAhkZ1OA9q4V4nuvfoPecBM34DecAugUZEBhI2Hmpgnzq2hTKZ60LAMrlqiASm0aqAY6F8/A==";
- };
- };
- "apollo-client-2.6.10" = {
- name = "apollo-client";
- packageName = "apollo-client";
- version = "2.6.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.10.tgz";
- sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA==";
- };
- };
- "apollo-codegen-core-0.39.3" = {
- name = "apollo-codegen-core";
- packageName = "apollo-codegen-core";
- version = "0.39.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.3.tgz";
- sha512 = "2nPwQz2u2NpmbFY5lDEg/vo33RbGAxFLQeZew8H6XfSVLPajWbz2Klest9ZVQhaUnBVZO5q2gQLX+MT2I6uNfA==";
- };
- };
- "apollo-codegen-flow-0.37.3" = {
- name = "apollo-codegen-flow";
- packageName = "apollo-codegen-flow";
- version = "0.37.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.3.tgz";
- sha512 = "gZZHQmGiSzNbJbolnYQPvjwC43/6GzETTo1nTi2JlnLw9jnVZR42kpqrxAeVAJKkquJ+4c2jwQkO4fVIYfdhaw==";
- };
- };
- "apollo-codegen-scala-0.38.3" = {
- name = "apollo-codegen-scala";
- packageName = "apollo-codegen-scala";
- version = "0.38.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.3.tgz";
- sha512 = "Zgg/zd/k8h/ei5UlYSCa27jJAJA4UE+wCb5+LOo2Iz73ZUZh7HRgzoKSfsP1qAiJV4Tqm9WySyU9nOqfajdK1A==";
- };
- };
- "apollo-codegen-swift-0.39.3" = {
- name = "apollo-codegen-swift";
- packageName = "apollo-codegen-swift";
- version = "0.39.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.3.tgz";
- sha512 = "kvIoHOiv5440tHvSdhDHzOUZrpBpdXA6M/QPiuYkpPuI8TAcJ+bTeS696/8t+FO699qYgjsqW7FMdIbi1LWV2g==";
- };
- };
- "apollo-codegen-typescript-0.39.3" = {
- name = "apollo-codegen-typescript";
- packageName = "apollo-codegen-typescript";
- version = "0.39.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.3.tgz";
- sha512 = "Yo/FVaBJbbrndVL75tluH16dNXRZ1M9ELP5AeAPnnw+yGIvYO34LXjfk4G3kqkAJ7puoGc+9muGJLjh6LV6zNA==";
- };
- };
"apollo-datasource-0.7.3" = {
name = "apollo-datasource";
packageName = "apollo-datasource";
@@ -9319,15 +9157,6 @@ let
sha512 = "ZRXAV+k+hboCVS+FW86FW/QgnDR7gm/xMUwJPGXEbV53OLGuQQdIT0NCYK7AzzVkCfsbb7NJ3mmEclkZY9uuxQ==";
};
};
- "apollo-language-server-1.25.2" = {
- name = "apollo-language-server";
- packageName = "apollo-language-server";
- version = "1.25.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.25.2.tgz";
- sha512 = "PGQZ1+nX/RSmf9eawqXloi+ZwJs6dQRdDiEKzSIij1ucd9r9jY5EyamVMi0tYgco1G4XJo1hBRXBm29sTGNfUQ==";
- };
- };
"apollo-link-1.2.1" = {
name = "apollo-link";
packageName = "apollo-link";
@@ -9346,69 +9175,6 @@ let
sha512 = "p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==";
};
};
- "apollo-link-context-1.0.20" = {
- name = "apollo-link-context";
- packageName = "apollo-link-context";
- version = "1.0.20";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.20.tgz";
- sha512 = "MLLPYvhzNb8AglNsk2NcL9AvhO/Vc9hn2ZZuegbhRHGet3oGr0YH9s30NS9+ieoM0sGT11p7oZ6oAILM/kiRBA==";
- };
- };
- "apollo-link-error-1.1.13" = {
- name = "apollo-link-error";
- packageName = "apollo-link-error";
- version = "1.1.13";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-link-error/-/apollo-link-error-1.1.13.tgz";
- sha512 = "jAZOOahJU6bwSqb2ZyskEK1XdgUY9nkmeclCrW7Gddh1uasHVqmoYc4CKdb0/H0Y1J9lvaXKle2Wsw/Zx1AyUg==";
- };
- };
- "apollo-link-http-1.5.17" = {
- name = "apollo-link-http";
- packageName = "apollo-link-http";
- version = "1.5.17";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.17.tgz";
- sha512 = "uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg==";
- };
- };
- "apollo-link-http-common-0.2.16" = {
- name = "apollo-link-http-common";
- packageName = "apollo-link-http-common";
- version = "0.2.16";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz";
- sha512 = "2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==";
- };
- };
- "apollo-link-persisted-queries-0.2.2" = {
- name = "apollo-link-persisted-queries";
- packageName = "apollo-link-persisted-queries";
- version = "0.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-link-persisted-queries/-/apollo-link-persisted-queries-0.2.2.tgz";
- sha512 = "YL7XBu/5QsSbbYaWUXgm87T2Hn/2AQZk5Wr8CLXGDr3Wl3E/TRhBhKgQQTly9xhaTi7jgBO+AeIyTH5wCBHA9w==";
- };
- };
- "apollo-link-state-0.4.2" = {
- name = "apollo-link-state";
- packageName = "apollo-link-state";
- version = "0.4.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-link-state/-/apollo-link-state-0.4.2.tgz";
- sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw==";
- };
- };
- "apollo-link-ws-1.0.20" = {
- name = "apollo-link-ws";
- packageName = "apollo-link-ws";
- version = "1.0.20";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.20.tgz";
- sha512 = "mjSFPlQxmoLArpHBeUb2Xj+2HDYeTaJqFGOqQ+I8NVJxgL9lJe84PDWcPah/yMLv3rB7QgBDSuZ0xoRFBPlySw==";
- };
- };
"apollo-reporting-protobuf-0.6.2" = {
name = "apollo-reporting-protobuf";
packageName = "apollo-reporting-protobuf";
@@ -9427,22 +9193,13 @@ let
sha512 = "iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ==";
};
};
- "apollo-server-core-2.21.0" = {
+ "apollo-server-core-2.21.2" = {
name = "apollo-server-core";
packageName = "apollo-server-core";
- version = "2.21.0";
+ version = "2.21.2";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.21.0.tgz";
- sha512 = "GtIiq2F0dVDLzzIuO5+dK/pGq/sGxYlKCqAuQQqzYg0fvZ7fukyluXtcTe0tMI+FJZjU0j0WnKgiLsboCoAlPQ==";
- };
- };
- "apollo-server-env-2.4.5" = {
- name = "apollo-server-env";
- packageName = "apollo-server-env";
- version = "2.4.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz";
- sha512 = "nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==";
+ url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.21.2.tgz";
+ sha512 = "jIXMVQPOUzIOl4El/mzSixxJ5IDrqSk3L9uJ1U+ncwiQj0IjtkkyDSuYngcgyEi+KfO2lAzxeOiAy9fIjjkC2A==";
};
};
"apollo-server-env-3.0.0" = {
@@ -9463,13 +9220,13 @@ let
sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ==";
};
};
- "apollo-server-express-2.21.0" = {
+ "apollo-server-express-2.21.2" = {
name = "apollo-server-express";
packageName = "apollo-server-express";
- version = "2.21.0";
+ version = "2.21.2";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.21.0.tgz";
- sha512 = "zbOSNGuxUjlOFZnRrbMpga3pKDEroitF4NAqoVxgBivx7v2hGsE7rljct3PucTx2cMN90AyYe3cU4oA8jBxZIQ==";
+ url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.21.2.tgz";
+ sha512 = "5aNE1i/My8c9eBJg5uRyZSvE/NThm1X/fewcs4U5WpuEAMdmg/vf0oZnSZ8Nvmj7H8R2E5xiMkTm6Mv+MKOl9A==";
};
};
"apollo-server-plugin-base-0.10.4" = {
@@ -9499,15 +9256,6 @@ let
sha512 = "SYN4o0C0wR1fyS3+P0FthyvsQVHFopdmN3IU64IaspR/RZScPxZ3Ae8uu++fTvkQflAkglnFM0aX6DkZERBp6w==";
};
};
- "apollo-upload-client-11.0.0" = {
- name = "apollo-upload-client";
- packageName = "apollo-upload-client";
- version = "11.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-11.0.0.tgz";
- sha512 = "JChTrBi1VSF8u6OPrkWUApJlyUvzwhw98kqRB3fSi7/CU6z0OUD42Mee9s5h8mfjKEfOanK6GNZhF4t2tIPXSw==";
- };
- };
"apollo-utilities-1.3.4" = {
name = "apollo-utilities";
packageName = "apollo-utilities";
@@ -9634,13 +9382,13 @@ let
sha512 = "B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ==";
};
};
- "archiver-5.0.2" = {
+ "archiver-5.2.0" = {
name = "archiver";
packageName = "archiver";
- version = "5.0.2";
+ version = "5.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/archiver/-/archiver-5.0.2.tgz";
- sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg==";
+ url = "https://registry.npmjs.org/archiver/-/archiver-5.2.0.tgz";
+ sha512 = "QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ==";
};
};
"archiver-5.3.0" = {
@@ -9688,15 +9436,6 @@ let
sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==";
};
};
- "arg-4.1.3" = {
- name = "arg";
- packageName = "arg";
- version = "4.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz";
- sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==";
- };
- };
"argparse-0.1.15" = {
name = "argparse";
packageName = "argparse";
@@ -10147,15 +9886,6 @@ let
sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==";
};
};
- "array.prototype.flatmap-1.2.4" = {
- name = "array.prototype.flatmap";
- packageName = "array.prototype.flatmap";
- version = "1.2.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz";
- sha512 = "r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==";
- };
- };
"arraybuffer.slice-0.0.6" = {
name = "arraybuffer.slice";
packageName = "arraybuffer.slice";
@@ -10237,6 +9967,15 @@ let
sha1 = "06a6604d6a55d4bf41a9a47d9872d7a78da31e73";
};
};
+ "asciichart-1.5.25" = {
+ name = "asciichart";
+ packageName = "asciichart";
+ version = "1.5.25";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asciichart/-/asciichart-1.5.25.tgz";
+ sha512 = "PNxzXIPPOtWq8T7bgzBtk9cI2lgS4SJZthUHEiQ1aoIc3lNzGfUvIvo9LiAnq26TACo9t1/4qP6KTGAUbzX9Xg==";
+ };
+ };
"asciidoctor.js-1.5.9" = {
name = "asciidoctor.js";
packageName = "asciidoctor.js";
@@ -10489,15 +10228,6 @@ let
sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
};
};
- "async-2.5.0" = {
- name = "async";
- packageName = "async";
- version = "2.5.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz";
- sha512 = "e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==";
- };
- };
"async-2.6.0" = {
name = "async";
packageName = "async";
@@ -10642,6 +10372,15 @@ let
sha1 = "1e762817d849ce44bfac07925a42036787061b15";
};
};
+ "asyncjs-util-1.2.3" = {
+ name = "asyncjs-util";
+ packageName = "asyncjs-util";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.3.tgz";
+ sha512 = "gwrRUMa6oZ1qssVupX4lgSey1PDCEbouUjCqa2/MRgaZ4gZmZfAVBZ/Nzple7r9BN+iVMJPIWrwVu00CRgjHgw==";
+ };
+ };
"asynckit-0.4.0" = {
name = "asynckit";
packageName = "asynckit";
@@ -10813,15 +10552,6 @@ let
sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q==";
};
};
- "await-to-js-2.1.1" = {
- name = "await-to-js";
- packageName = "await-to-js";
- version = "2.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/await-to-js/-/await-to-js-2.1.1.tgz";
- sha512 = "CHBC6gQGCIzjZ09tJ+XmpQoZOn4GdWePB4qUweCaKNJ0D3f115YdhmYVTZ4rMVpiJ3cFzZcTYK1VMYEICV4YXw==";
- };
- };
"aws-sdk-1.18.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
@@ -10840,13 +10570,13 @@ let
sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
};
};
- "aws-sdk-2.858.0" = {
+ "aws-sdk-2.871.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.858.0";
+ version = "2.871.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.858.0.tgz";
- sha512 = "VXNnGmPcZu4ZRc0yqw4F6d43edrMMKQwOmZX9/hQW/l5DFGqdGzvaDKljZyD1FHNbmaxXz09RfLzjVEmq+CVzA==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.871.0.tgz";
+ sha512 = "rFd2shGgYfCzQQQeqqgZRiLuPFUm3uUlHqM40nMtbqM1y7abuOUyuOMxTHsKsbY+Bu7gRESngPTf7Iknxq9/uQ==";
};
};
"aws-sign2-0.6.0" = {
@@ -10876,6 +10606,24 @@ let
sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
};
};
+ "aws4-1.9.1" = {
+ name = "aws4";
+ packageName = "aws4";
+ version = "1.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+ sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
+ };
+ };
+ "axios-0.19.2" = {
+ name = "axios";
+ packageName = "axios";
+ version = "0.19.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
+ sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
+ };
+ };
"axios-0.21.1" = {
name = "axios";
packageName = "axios";
@@ -11794,6 +11542,15 @@ let
sha512 = "s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==";
};
};
+ "bech32-2.0.0" = {
+ name = "bech32";
+ packageName = "bech32";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz";
+ sha512 = "LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg==";
+ };
+ };
"beeper-1.1.1" = {
name = "beeper";
packageName = "beeper";
@@ -11857,6 +11614,15 @@ let
sha512 = "yGQTG4NtwTciX0Bkgk1FqQL4p+NiCQKpTSFho2lrxvUkXIlzyJDwraj8aYxAxRZMnnOhRr7QlIBoMRPEnIR34Q==";
};
};
+ "bessel-1.0.2" = {
+ name = "bessel";
+ packageName = "bessel";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bessel/-/bessel-1.0.2.tgz";
+ sha512 = "Al3nHGQGqDYqqinXhQzmwmcRToe/3WyBv4N8aZc5Pef8xw2neZlR9VPi84Sa23JtgWcucu18HxVZrnI0fn2etw==";
+ };
+ };
"better-ajv-errors-0.6.7" = {
name = "better-ajv-errors";
packageName = "better-ajv-errors";
@@ -12109,6 +11875,15 @@ let
sha512 = "HpV5OMLLGTjSVblmrtYRfFFKuQB+GArM0+XP8HGWfJ5vxYBqo+DesvJwOdC2WJ3bCkZShGf0QIfoIpeomVzVdA==";
};
};
+ "bip65-1.0.3" = {
+ name = "bip65";
+ packageName = "bip65";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bip65/-/bip65-1.0.3.tgz";
+ sha512 = "RQ1nc7xtnLa5XltnCqkoR2zmhuz498RjMJwrLKQzOE049D1HUqnYfon7cVSbwS5UGm0/EQlC2CH+NY3MyITA4Q==";
+ };
+ };
"bip66-1.1.5" = {
name = "bip66";
packageName = "bip66";
@@ -12118,6 +11893,15 @@ let
sha1 = "01fa8748785ca70955d5011217d1b3139969ca22";
};
};
+ "bip68-1.0.4" = {
+ name = "bip68";
+ packageName = "bip68";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bip68/-/bip68-1.0.4.tgz";
+ sha512 = "O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ==";
+ };
+ };
"bipf-1.4.0" = {
name = "bipf";
packageName = "bipf";
@@ -12577,6 +12361,33 @@ let
sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==";
};
};
+ "bolt03-1.2.7" = {
+ name = "bolt03";
+ packageName = "bolt03";
+ version = "1.2.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.7.tgz";
+ sha512 = "gAlWFr+/4ARfCv7GS6+xjeW1hTylKeUvhjIhVwRM0t/hAZ2z+hnnG7ZmVsmCB9bxLTR09PC9j8dnt450uqiHUA==";
+ };
+ };
+ "bolt07-1.7.1" = {
+ name = "bolt07";
+ packageName = "bolt07";
+ version = "1.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bolt07/-/bolt07-1.7.1.tgz";
+ sha512 = "vZCX56PB0274YW8BuCE91xWgqCPkfndBkknYYZFajX6Zr/KByMDXKQ2t1KKSYVkzzTL0rqeLWyQKdL6gJU1zHA==";
+ };
+ };
+ "bolt09-0.1.3" = {
+ name = "bolt09";
+ packageName = "bolt09";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bolt09/-/bolt09-0.1.3.tgz";
+ sha512 = "xFfW/ix6qSzBVGGt3jgpG/SX1LgVvGUYxA/0yC6uaPAjgqbdqmbDZzNEqMRps7Z8Vp1H3yfO5JXQuX54n/GzZg==";
+ };
+ };
"bonjour-3.5.0" = {
name = "bonjour";
packageName = "bonjour";
@@ -13504,15 +13315,6 @@ let
sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797";
};
};
- "bunyan-1.8.14" = {
- name = "bunyan";
- packageName = "bunyan";
- version = "1.8.14";
- src = fetchurl {
- url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.14.tgz";
- sha512 = "LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg==";
- };
- };
"bunyan-1.8.15" = {
name = "bunyan";
packageName = "bunyan";
@@ -13666,13 +13468,13 @@ let
sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==";
};
};
- "cacache-15.0.5" = {
+ "cacache-15.0.6" = {
name = "cacache";
packageName = "cacache";
- version = "15.0.5";
+ version = "15.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz";
- sha512 = "lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==";
+ url = "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz";
+ sha512 = "g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==";
};
};
"cache-base-1.0.1" = {
@@ -13927,15 +13729,6 @@ let
sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
};
};
- "camelcase-6.0.0" = {
- name = "camelcase";
- packageName = "camelcase";
- version = "6.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz";
- sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==";
- };
- };
"camelcase-6.2.0" = {
name = "camelcase";
packageName = "camelcase";
@@ -13990,13 +13783,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001197" = {
+ "caniuse-lite-1.0.30001204" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001197";
+ version = "1.0.30001204";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz";
- sha512 = "8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz";
+ sha512 = "JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ==";
};
};
"canvas-2.7.0" = {
@@ -14008,13 +13801,13 @@ let
sha512 = "pzCxtkHb+5su5MQjTtepMDlIOtaXo277x0C0u3nMOxtkhTyQ+h2yNKhlROAaDllWgRyePAUitC08sXw26Eb6aw==";
};
};
- "capital-case-1.0.4" = {
- name = "capital-case";
- packageName = "capital-case";
- version = "1.0.4";
+ "caporal-1.4.0" = {
+ name = "caporal";
+ packageName = "caporal";
+ version = "1.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz";
- sha512 = "ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==";
+ url = "https://registry.npmjs.org/caporal/-/caporal-1.4.0.tgz";
+ sha512 = "3pWfIwKVdIbB/gWmpLloO6iGAXTRi9mcTinPOwvHfzH3BYjOhLgq2XRG3hKtp+F6vBcBXxMgCobUzBAx1d8T4A==";
};
};
"capture-exit-2.0.0" = {
@@ -14107,6 +13900,15 @@ let
sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==";
};
};
+ "cbor-7.0.3" = {
+ name = "cbor";
+ packageName = "cbor";
+ version = "7.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cbor/-/cbor-7.0.3.tgz";
+ sha512 = "Io+lJytjYBJKgJqZQUz2bFaMPj+HtlsnT9kHSUiIJFqzWa05lm5/ycQ+NiZWpks3DR2Fz7j7axiTGeT57w/syg==";
+ };
+ };
"ccount-1.1.0" = {
name = "ccount";
packageName = "ccount";
@@ -14125,13 +13927,13 @@ let
sha512 = "zyvxm1kyklUbrCD475ULXPUM+VfOU2u8UN0rSFjJN8Tziv6w6lCUxRBAeJCF/Dn00M29dWmu/F9Nda0mUb8Jcg==";
};
};
- "cdktf-0.1.0" = {
+ "cdktf-0.2.0" = {
name = "cdktf";
packageName = "cdktf";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/cdktf/-/cdktf-0.1.0.tgz";
- sha512 = "6PKMz7dkou3qrHD+rnj7fa8U+XujkRUVHsWcVaH7faCxBCIGSxUz0TFb8KeY//o0MHg285Agt1NTCgFIpJ7Clg==";
+ url = "https://registry.npmjs.org/cdktf/-/cdktf-0.2.0.tgz";
+ sha512 = "0sW2NFq4AW9WdnGbQXJylZ/m9smUv5YeExjvCrEk/7hDMeEqhAue/3PWNmASG3zwBUuoC+pZ24b+OUmBXJsp+w==";
};
};
"center-align-0.1.3" = {
@@ -14143,13 +13945,22 @@ let
sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
};
};
- "chai-4.3.3" = {
+ "cert-info-1.5.1" = {
+ name = "cert-info";
+ packageName = "cert-info";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cert-info/-/cert-info-1.5.1.tgz";
+ sha512 = "eoQC/yAgW3gKTKxjzyClvi+UzuY97YCjcl+lSqbsGIy7HeGaWxCPOQFivhUYm27hgsBMhsJJFya3kGvK6PMIcQ==";
+ };
+ };
+ "chai-4.3.4" = {
name = "chai";
packageName = "chai";
- version = "4.3.3";
+ version = "4.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/chai/-/chai-4.3.3.tgz";
- sha512 = "MPSLOZwxxnA0DhLE84klnGPojWFK5KuhP7/j5dTsxpr2S3XlkqJP5WbyYl1gCTWvG2Z5N+HD4F472WsbEZL6Pw==";
+ url = "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz";
+ sha512 = "yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==";
};
};
"chai-as-promised-7.1.1" = {
@@ -14260,15 +14071,6 @@ let
sha512 = "g9YLQVHVZS/3F+zIicfB58vjcxopvYQRp7xHzvyDFDhXH1aRZI/JhwSAO0X5qYiQluoGnaNAU6wByD2KTxJN1A==";
};
};
- "change-case-4.1.2" = {
- name = "change-case";
- packageName = "change-case";
- version = "4.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz";
- sha512 = "bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==";
- };
- };
"character-entities-1.2.4" = {
name = "character-entities";
packageName = "character-entities";
@@ -14683,13 +14485,13 @@ let
sha1 = "04a106672c18b085ab774d983dfa3ea138f22205";
};
};
- "chunk-store-stream-4.2.0" = {
+ "chunk-store-stream-4.3.0" = {
name = "chunk-store-stream";
packageName = "chunk-store-stream";
- version = "4.2.0";
+ version = "4.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.2.0.tgz";
- sha512 = "90iueoPoqT2isnmy1fyqwzgFy5FokuaxQuijOQG1VgC/6DaXRfeYN0da8iWENkzqElWhqLxo8pWc7pH9dmxlcA==";
+ url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.3.0.tgz";
+ sha512 = "qby+/RXoiMoTVtPiylWZt7KFF1jy6M829TzMi2hxZtBIH9ptV19wxcft6zGiXLokJgCbuZPGNGab6DWHqiSEKw==";
};
};
"ci-info-1.6.0" = {
@@ -14827,13 +14629,13 @@ let
sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==";
};
};
- "clean-css-5.1.1" = {
+ "clean-css-5.1.2" = {
name = "clean-css";
packageName = "clean-css";
- version = "5.1.1";
+ version = "5.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.1.tgz";
- sha512 = "GQ6HdEyJN0543mRTA/TkZ7RPoMXGWKq1shs9H86F2kLuixR0RI+xd4JfhJxWUW08FGKQXTKAKpVjKQXu5zkFNA==";
+ url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz";
+ sha512 = "QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==";
};
};
"clean-deep-3.4.0" = {
@@ -15007,22 +14809,22 @@ let
sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==";
};
};
- "cli-spinners-2.5.0" = {
+ "cli-spinners-2.6.0" = {
name = "cli-spinners";
packageName = "cli-spinners";
- version = "2.5.0";
+ version = "2.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz";
- sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==";
+ url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz";
+ sha512 = "t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==";
};
};
- "cli-table-0.3.5" = {
+ "cli-table-0.3.6" = {
name = "cli-table";
packageName = "cli-table";
- version = "0.3.5";
+ version = "0.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.5.tgz";
- sha512 = "7uo2+RMNQUZ13M199udxqwk1qxTOS53EUak4gmu/aioUpdH5RvBz0JkJslcWz6ABKedZNqXXzikMZgHh+qF16A==";
+ url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz";
+ sha512 = "ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==";
};
};
"cli-table3-0.5.1" = {
@@ -15151,13 +14953,13 @@ let
sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc";
};
};
- "clipboard-2.0.7" = {
+ "clipboard-2.0.8" = {
name = "clipboard";
packageName = "clipboard";
- version = "2.0.7";
+ version = "2.0.8";
src = fetchurl {
- url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.7.tgz";
- sha512 = "8M8WEZcIvs0hgOma+wAPkrUxpv0PMY1L6VsAJh/2DOKARIMpyWe6ZLcEoe1qktl6/ced5ceYHs+oGedSbgZ3sg==";
+ url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz";
+ sha512 = "Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==";
};
};
"clipboardy-1.2.3" = {
@@ -15565,13 +15367,13 @@ let
sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg==";
};
};
- "codemaker-1.24.0" = {
+ "codemaker-1.26.0" = {
name = "codemaker";
packageName = "codemaker";
- version = "1.24.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/codemaker/-/codemaker-1.24.0.tgz";
- sha512 = "oKi5BNSyH0LBtFoxWKRvWnTut8NRdRgOzIF6/YKCaNnVECqq0oMqUpEBKNgcS+sOxfJfI/tkORpSdNGGVE0tmA==";
+ url = "https://registry.npmjs.org/codemaker/-/codemaker-1.26.0.tgz";
+ sha512 = "oK0SdWi3CUHL7hVcDpXVBQc2xm31RCJSqg7I1wviMifD89zbvu3boAz/s5aoXbcVDKKxLOZn2w55WlGCih9HOw==";
};
};
"codepage-1.4.0" = {
@@ -15736,15 +15538,6 @@ let
sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96";
};
};
- "colors-0.5.1" = {
- name = "colors";
- packageName = "colors";
- version = "0.5.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
- sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774";
- };
- };
"colors-0.6.2" = {
name = "colors";
packageName = "colors";
@@ -15970,15 +15763,6 @@ let
sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==";
};
};
- "commander-2.18.0" = {
- name = "commander";
- packageName = "commander";
- version = "2.18.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz";
- sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==";
- };
- };
"commander-2.19.0" = {
name = "commander";
packageName = "commander";
@@ -16087,6 +15871,15 @@ let
sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
};
};
+ "commander-7.0.0" = {
+ name = "commander";
+ packageName = "commander";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz";
+ sha512 = "ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==";
+ };
+ };
"commander-7.1.0" = {
name = "commander";
packageName = "commander";
@@ -16096,6 +15889,15 @@ let
sha512 = "pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==";
};
};
+ "commander-7.2.0" = {
+ name = "commander";
+ packageName = "commander";
+ version = "7.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz";
+ sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==";
+ };
+ };
"commandpost-1.4.0" = {
name = "commandpost";
packageName = "commandpost";
@@ -16375,6 +16177,15 @@ let
sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==";
};
};
+ "conf-6.2.4" = {
+ name = "conf";
+ packageName = "conf";
+ version = "6.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz";
+ sha512 = "GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ==";
+ };
+ };
"conf-7.1.2" = {
name = "conf";
packageName = "conf";
@@ -16573,24 +16384,6 @@ let
sha1 = "5a25047bc76f73072667c8cb52c989888f494c63";
};
};
- "consolidate-0.16.0" = {
- name = "consolidate";
- packageName = "consolidate";
- version = "0.16.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz";
- sha512 = "Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==";
- };
- };
- "constant-case-3.0.4" = {
- name = "constant-case";
- packageName = "constant-case";
- version = "3.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz";
- sha512 = "I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==";
- };
- };
"constantinople-3.1.2" = {
name = "constantinople";
packageName = "constantinople";
@@ -16618,13 +16411,13 @@ let
sha512 = "5AKrTtmiioQWloJ3WRFZb0/uR1lrRboaVE9go++XZltvRnZkN2/kQjaZ0gtFxynU5u5k9mWVtk8mNcgJ9yoRbQ==";
};
};
- "constructs-3.3.61" = {
+ "constructs-3.3.71" = {
name = "constructs";
packageName = "constructs";
- version = "3.3.61";
+ version = "3.3.71";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-3.3.61.tgz";
- sha512 = "9zg2/Bl9y0Z/9eQ3NO8BcCWlAVs6hXGCcRH2bQLSqExyrE54qzh50Vtb7ULrKOkC5nT974VG+cWdeXrcC6JDqA==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-3.3.71.tgz";
+ sha512 = "3KFtTsA7OV27m/+pJhN4iJkKzHbPIPvyvEX5BQ/JCAWjfCHOQEVpIgxHLpT4i8L1OFta+pJrzcEVAHo6UitwqA==";
};
};
"consume-http-header-1.0.0" = {
@@ -16862,13 +16655,13 @@ let
sha1 = "7e3e48bbe6d997b1417ddca2868204b4d3d85715";
};
};
- "convict-6.0.0" = {
+ "convict-6.0.1" = {
name = "convict";
packageName = "convict";
- version = "6.0.0";
+ version = "6.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/convict/-/convict-6.0.0.tgz";
- sha512 = "osfPkv5yjVoZqrTWBXuh/ABGpFoaJplbt0WXr0CodR4CSWt8UnzY4PSUyRz/+5BX5YUtWcToG29Kr0B6xhdIMg==";
+ url = "https://registry.npmjs.org/convict/-/convict-6.0.1.tgz";
+ sha512 = "M4YNNq5NV4/VS8JhvBSHAokwvQRL4evEuU0VFe1GNPiqnj9TAkLXpf39ImCCVZlsp3CFp04bc/kRSWPGsJGJWg==";
};
};
"cookie-0.0.4" = {
@@ -17006,13 +16799,13 @@ let
sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
};
};
- "copy-props-2.0.4" = {
+ "copy-props-2.0.5" = {
name = "copy-props";
packageName = "copy-props";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz";
- sha512 = "7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==";
+ url = "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz";
+ sha512 = "XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==";
};
};
"copy-template-dir-1.4.0" = {
@@ -17096,13 +16889,13 @@ let
sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
};
};
- "core-js-3.6.5" = {
+ "core-js-3.8.3" = {
name = "core-js";
packageName = "core-js";
- version = "3.6.5";
+ version = "3.8.3";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz";
- sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==";
+ url = "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz";
+ sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==";
};
};
"core-js-3.9.1" = {
@@ -17249,6 +17042,15 @@ let
sha1 = "868fd9092f439d1ef95f4a85e5fa4b9f07efc95c";
};
};
+ "cpus-1.0.3" = {
+ name = "cpus";
+ packageName = "cpus";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cpus/-/cpus-1.0.3.tgz";
+ sha512 = "PXHBvGLuL69u55IkLa5e5838fLhIMHxmkV4ge42a8alGyn7BtawYgI0hQ849EedvtHIOLNNH3i6eQU1BiE9SUA==";
+ };
+ };
"cpy-8.1.2" = {
name = "cpy";
packageName = "cpy";
@@ -17411,6 +17213,24 @@ let
sha512 = "KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==";
};
};
+ "cross-fetch-3.1.1" = {
+ name = "cross-fetch";
+ packageName = "cross-fetch";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.1.tgz";
+ sha512 = "eIF+IHQpRzoGd/0zPrwQmHwDC90mdvjk+hcbYhKoaRrEk4GEIDqdjs/MljmdPPoHTQudbmWS+f0hZsEpFaEvWw==";
+ };
+ };
+ "cross-fetch-3.1.2" = {
+ name = "cross-fetch";
+ packageName = "cross-fetch";
+ version = "3.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.2.tgz";
+ sha512 = "+JhD65rDNqLbGmB3Gzs3HrEKC0aQnD+XA3SY6RjgkF88jV2q5cTc5+CwxlS3sdmLk98gpPt5CF9XRnPdlxZe6w==";
+ };
+ };
"cross-spawn-4.0.2" = {
name = "cross-spawn";
packageName = "cross-spawn";
@@ -17510,6 +17330,15 @@ let
sha1 = "fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8";
};
};
+ "crypto-js-4.0.0" = {
+ name = "crypto-js";
+ packageName = "crypto-js";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz";
+ sha512 = "bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg==";
+ };
+ };
"crypto-random-string-1.0.0" = {
name = "crypto-random-string";
packageName = "crypto-random-string";
@@ -17888,15 +17717,6 @@ let
sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==";
};
};
- "csstype-2.6.16" = {
- name = "csstype";
- packageName = "csstype";
- version = "2.6.16";
- src = fetchurl {
- url = "https://registry.npmjs.org/csstype/-/csstype-2.6.16.tgz";
- sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==";
- };
- };
"csurf-1.11.0" = {
name = "csurf";
packageName = "csurf";
@@ -17933,6 +17753,15 @@ let
sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490";
};
};
+ "csv-parse-4.15.3" = {
+ name = "csv-parse";
+ packageName = "csv-parse";
+ version = "4.15.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.15.3.tgz";
+ sha512 = "jlTqDvLdHnYMSr08ynNfk4IAUSJgJjTKy2U5CQBSu4cN9vQOJonLVZP4Qo4gKKrIgIQ5dr07UwOJdi+lRqT12w==";
+ };
+ };
"csv-parser-1.12.1" = {
name = "csv-parser";
packageName = "csv-parser";
@@ -18086,13 +17915,13 @@ let
sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==";
};
};
- "d3-array-2.11.0" = {
+ "d3-array-2.12.1" = {
name = "d3-array";
packageName = "d3-array";
- version = "2.11.0";
+ version = "2.12.1";
src = fetchurl {
- url = "https://registry.npmjs.org/d3-array/-/d3-array-2.11.0.tgz";
- sha512 = "26clcwmHQEdsLv34oNKq5Ia9tQ26Y/4HqS3dQzF42QBUqymZJ+9PORcN1G52bt37NsL2ABoX4lvyYZc+A9Y0zw==";
+ url = "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz";
+ sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==";
};
};
"d3-axis-1.0.12" = {
@@ -18428,13 +18257,13 @@ let
sha512 = "EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==";
};
};
- "d3-shape-2.0.0" = {
+ "d3-shape-2.1.0" = {
name = "d3-shape";
packageName = "d3-shape";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/d3-shape/-/d3-shape-2.0.0.tgz";
- sha512 = "djpGlA779ua+rImicYyyjnOjeubyhql1Jyn1HK0bTyawuH76UQRWXd+pftr67H6Fa8hSwetkgb/0id3agKWykw==";
+ url = "https://registry.npmjs.org/d3-shape/-/d3-shape-2.1.0.tgz";
+ sha512 = "PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA==";
};
};
"d3-time-1.1.0" = {
@@ -18869,6 +18698,24 @@ let
sha512 = "mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==";
};
};
+ "debounce-1.2.1" = {
+ name = "debounce";
+ packageName = "debounce";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz";
+ sha512 = "XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==";
+ };
+ };
+ "debounce-fn-3.0.1" = {
+ name = "debounce-fn";
+ packageName = "debounce-fn";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz";
+ sha512 = "aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q==";
+ };
+ };
"debounce-fn-4.0.0" = {
name = "debounce-fn";
packageName = "debounce-fn";
@@ -19562,6 +19409,15 @@ let
sha512 = "aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ==";
};
};
+ "delay-5.0.0" = {
+ name = "delay";
+ packageName = "delay";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz";
+ sha512 = "ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==";
+ };
+ };
"delayed-stream-1.0.0" = {
name = "delayed-stream";
packageName = "delayed-stream";
@@ -19769,13 +19625,13 @@ let
sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==";
};
};
- "detect-node-2.0.4" = {
+ "detect-node-2.0.5" = {
name = "detect-node";
packageName = "detect-node";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz";
- sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==";
+ url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz";
+ sha512 = "qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==";
};
};
"detect-port-alt-1.1.6" = {
@@ -19805,13 +19661,13 @@ let
sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==";
};
};
- "detective-amd-3.0.1" = {
+ "detective-amd-3.1.0" = {
name = "detective-amd";
packageName = "detective-amd";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.1.tgz";
- sha512 = "vJgluSKkPyo+/McW9hzwmZwY1VPA3BS0VS1agdpPAWAhr65HwC1ox4Ig82rVfGYDYCa4GcKQON5JWBk++2Kf1Q==";
+ url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.1.0.tgz";
+ sha512 = "G7wGWT6f0VErjUkE2utCm7IUshT7nBh7aBBH2VBOiY9Dqy2DMens5iiOvYCuhstoIxRKLrnOvVAz4/EyPIAjnw==";
};
};
"detective-cjs-3.1.1" = {
@@ -19886,13 +19742,13 @@ let
sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg==";
};
};
- "devtools-protocol-0.0.847576" = {
+ "devtools-protocol-0.0.854822" = {
name = "devtools-protocol";
packageName = "devtools-protocol";
- version = "0.0.847576";
+ version = "0.0.854822";
src = fetchurl {
- url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.847576.tgz";
- sha512 = "0M8kobnSQE0Jmly7Mhbeq0W/PpZfnuK+WjN2ZRVPbGqYwCHCioAVp84H0TcLimgECcN5H976y5QiXMGBC9JKmg==";
+ url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.854822.tgz";
+ sha512 = "xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg==";
};
};
"dezalgo-1.0.3" = {
@@ -20147,13 +20003,13 @@ let
sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ==";
};
};
- "dispensary-0.59.0" = {
+ "dispensary-0.61.0" = {
name = "dispensary";
packageName = "dispensary";
- version = "0.59.0";
+ version = "0.61.0";
src = fetchurl {
- url = "https://registry.npmjs.org/dispensary/-/dispensary-0.59.0.tgz";
- sha512 = "JSnh4AhtYgwoyUHtunZbAhklkD9IeNacK1IDlrAJSZjzBMGFoTp9+Nggg+ITJ+F1geXc04DZ55ixnjFr5Ozknw==";
+ url = "https://registry.npmjs.org/dispensary/-/dispensary-0.61.0.tgz";
+ sha512 = "5BK13jrYQ+0bHgZBv7IOQsff5ydeNcnp87w3c7T8x5im21RDFQyiHrTlH0DoouZDyAVHILpat4Ytf7gRuhMRgw==";
};
};
"diveSync-0.3.0" = {
@@ -20282,6 +20138,15 @@ let
sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ==";
};
};
+ "dockerfile-ast-0.2.0" = {
+ name = "dockerfile-ast";
+ packageName = "dockerfile-ast";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.2.0.tgz";
+ sha512 = "iQyp12k1A4tF3sEfLAq2wfFPKdpoiGTJeuiu2Y1bdEqIZu0DfSSL2zm0fk7a/UHeQkngnYaRRGuON+C+2LO1Fw==";
+ };
+ };
"dockerfile-language-service-0.2.0" = {
name = "dockerfile-language-service";
packageName = "dockerfile-language-service";
@@ -20507,13 +20372,13 @@ let
sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==";
};
};
- "dompurify-2.2.6" = {
+ "dompurify-2.2.7" = {
name = "dompurify";
packageName = "dompurify";
- version = "2.2.6";
+ version = "2.2.7";
src = fetchurl {
- url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.6.tgz";
- sha512 = "7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ==";
+ url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.7.tgz";
+ sha512 = "jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg==";
};
};
"domutils-1.4.3" = {
@@ -20543,13 +20408,13 @@ let
sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
};
};
- "domutils-2.4.4" = {
+ "domutils-2.5.0" = {
name = "domutils";
packageName = "domutils";
- version = "2.4.4";
+ version = "2.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz";
- sha512 = "jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==";
+ url = "https://registry.npmjs.org/domutils/-/domutils-2.5.0.tgz";
+ sha512 = "Ho16rzNMOFk2fPwChGh3D2D9OEHAfG19HgmRR2l+WLSsIstNsAYBzePH412bL0y5T44ejABIVfTHQ8nqi/tBCg==";
};
};
"dot-case-3.0.4" = {
@@ -21038,13 +20903,13 @@ let
sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ==";
};
};
- "electron-to-chromium-1.3.682" = {
+ "electron-to-chromium-1.3.699" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.682";
+ version = "1.3.699";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.682.tgz";
- sha512 = "zok2y37qR00U14uM6qBz/3iIjWHom2eRfC2S1StA0RslP7x34jX+j4mxv80t8OEOHLJPVG54ZPeaFxEI7gPrwg==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.699.tgz";
+ sha512 = "fjt43CPXdPYwD9ybmKbNeLwZBmCVdLY2J5fGZub7/eMPuiqQznOGNXv/wurnpXIlE7ScHnvG9Zi+H4/i6uMKmw==";
};
};
"electrum-client-git://github.com/janoside/electrum-client" = {
@@ -21139,13 +21004,13 @@ let
sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==";
};
};
- "emmet-2.3.2" = {
+ "emmet-2.3.4" = {
name = "emmet";
packageName = "emmet";
- version = "2.3.2";
+ version = "2.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/emmet/-/emmet-2.3.2.tgz";
- sha512 = "PRHGy5RfLp7+WBgoNq0QYtjSbbG1g28PtnN8McPhlEMoPwZWBDftVIz4vDNUNvQFSBtekuYZxB7J0vLgodZxFw==";
+ url = "https://registry.npmjs.org/emmet/-/emmet-2.3.4.tgz";
+ sha512 = "3IqSwmO+N2ZGeuhDyhV/TIOJFUbkChi53bcasSNRE7Yd+4eorbbYz4e53TpMECt38NtYkZNupQCZRlwdAYA42A==";
};
};
"emoji-named-characters-1.0.2" = {
@@ -21391,6 +21256,15 @@ let
sha512 = "t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w==";
};
};
+ "engine.io-5.0.0" = {
+ name = "engine.io";
+ packageName = "engine.io";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io/-/engine.io-5.0.0.tgz";
+ sha512 = "BATIdDV3H1SrE9/u2BAotvsmjJg0t1P4+vGedImSs1lkFAtQdvk4Ev1y4LDiPF7BPWgXWEG+NDY+nLvW3UrMWw==";
+ };
+ };
"engine.io-client-1.3.1" = {
name = "engine.io-client";
packageName = "engine.io-client";
@@ -21553,15 +21427,6 @@ let
sha512 = "5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg==";
};
};
- "env-ci-5.0.2" = {
- name = "env-ci";
- packageName = "env-ci";
- version = "5.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/env-ci/-/env-ci-5.0.2.tgz";
- sha512 = "Xc41mKvjouTXD3Oy9AqySz1IeyvJvHZ20Twf5ZLYbNpPPIuCnL/qHCmNlD01LoNy0JTunw9HPYVptD19Ac7Mbw==";
- };
- };
"env-editor-0.4.2" = {
name = "env-editor";
packageName = "env-editor";
@@ -21580,13 +21445,13 @@ let
sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0";
};
};
- "env-paths-2.2.0" = {
+ "env-paths-2.2.1" = {
name = "env-paths";
packageName = "env-paths";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz";
- sha512 = "6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==";
+ url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz";
+ sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==";
};
};
"env-variable-0.0.6" = {
@@ -21904,6 +21769,15 @@ let
sha512 = "j02SFrUwFTRUqiY0Kjplwjm1psuzO1d6AjaXKuOR9hrY0HuPsT6sV42B6myW34h1q4CRy+Y3g4RU/cGJeI/nNA==";
};
};
+ "esbuild-0.9.7" = {
+ name = "esbuild";
+ packageName = "esbuild";
+ version = "0.9.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esbuild/-/esbuild-0.9.7.tgz";
+ sha512 = "VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg==";
+ };
+ };
"esc-exit-2.0.2" = {
name = "esc-exit";
packageName = "esc-exit";
@@ -22084,15 +21958,6 @@ let
sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==";
};
};
- "eslint-7.14.0" = {
- name = "eslint";
- packageName = "eslint";
- version = "7.14.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz";
- sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
- };
- };
"eslint-7.21.0" = {
name = "eslint";
packageName = "eslint";
@@ -22102,6 +21967,15 @@ let
sha512 = "W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==";
};
};
+ "eslint-7.22.0" = {
+ name = "eslint";
+ packageName = "eslint";
+ version = "7.22.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint/-/eslint-7.22.0.tgz";
+ sha512 = "3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==";
+ };
+ };
"eslint-plugin-no-unsanitized-3.1.4" = {
name = "eslint-plugin-no-unsanitized";
packageName = "eslint-plugin-no-unsanitized";
@@ -22111,15 +21985,6 @@ let
sha512 = "WF1+eZo2Sh+bQNjZuVNwT0dA61zuJORsLh+1Sww7+O6GOPw+WPWIIRfTWNqrmaXaDMhM4SXAqYPcNlhRMiH13g==";
};
};
- "eslint-plugin-react-7.22.0" = {
- name = "eslint-plugin-react";
- packageName = "eslint-plugin-react";
- version = "7.22.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz";
- sha512 = "p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA==";
- };
- };
"eslint-plugin-vue-6.2.2" = {
name = "eslint-plugin-vue";
packageName = "eslint-plugin-vue";
@@ -22129,13 +21994,13 @@ let
sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==";
};
};
- "eslint-plugin-vue-7.7.0" = {
+ "eslint-plugin-vue-7.8.0" = {
name = "eslint-plugin-vue";
packageName = "eslint-plugin-vue";
- version = "7.7.0";
+ version = "7.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.7.0.tgz";
- sha512 = "mYz4bpLGv5jx6YG/GvKkqbGSfV7uma2u1P3mLA41Q5vQl8W1MeuTneB8tfsLq6xxxesFubcrOC0BZBJ5R+eaCQ==";
+ url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.8.0.tgz";
+ sha512 = "OGrnPz+PuYL2HmVyBHxm4mRjxW2kfFCQE6Hw9G6qOHs/Pcu0srOlCCW0FMa8SLzIEqxl8WuKoBSPcMnrjUG2vw==";
};
};
"eslint-scope-3.7.3" = {
@@ -22201,15 +22066,6 @@ let
sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==";
};
};
- "esm-3.2.25" = {
- name = "esm";
- packageName = "esm";
- version = "3.2.25";
- src = fetchurl {
- url = "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz";
- sha512 = "U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==";
- };
- };
"esmangle-1.0.1" = {
name = "esmangle";
packageName = "esmangle";
@@ -22255,15 +22111,6 @@ let
sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==";
};
};
- "espree-7.3.0" = {
- name = "espree";
- packageName = "espree";
- version = "7.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz";
- sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==";
- };
- };
"espree-7.3.1" = {
name = "espree";
packageName = "espree";
@@ -22408,6 +22255,15 @@ let
sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==";
};
};
+ "estree-util-is-identifier-name-1.1.0" = {
+ name = "estree-util-is-identifier-name";
+ packageName = "estree-util-is-identifier-name";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz";
+ sha512 = "OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ==";
+ };
+ };
"estree-walker-0.6.1" = {
name = "estree-walker";
packageName = "estree-walker";
@@ -22687,13 +22543,13 @@ let
sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
};
};
- "eventsource-1.0.7" = {
+ "eventsource-1.1.0" = {
name = "eventsource";
packageName = "eventsource";
- version = "1.0.7";
+ version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz";
- sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==";
+ url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz";
+ sha512 = "VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==";
};
};
"everyauth-0.4.5" = {
@@ -22732,13 +22588,13 @@ let
sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==";
};
};
- "exec-sh-0.3.4" = {
+ "exec-sh-0.3.6" = {
name = "exec-sh";
packageName = "exec-sh";
- version = "0.3.4";
+ version = "0.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz";
- sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==";
+ url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz";
+ sha512 = "nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==";
};
};
"execa-0.1.1" = {
@@ -22966,13 +22822,13 @@ let
sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
};
};
- "expo-pwa-0.0.66" = {
+ "expo-pwa-0.0.69" = {
name = "expo-pwa";
packageName = "expo-pwa";
- version = "0.0.66";
+ version = "0.0.69";
src = fetchurl {
- url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.66.tgz";
- sha512 = "9+Pv5qL/W3PnInyXTYhCQ6ukzo2IFzQEJDss9b6frNvxBJzAJWR7F7dsvIaCOr5WrtMBStf4SVdWvGTdssi+XA==";
+ url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.69.tgz";
+ sha512 = "M+pDqlgHNtPmDu0lxxKl9K/gWa0Ul7CBQtbTVe4I3EWI+rtRn+5VfEVH+1iUkavczC/vS14ovQxIlLEdfxF/pg==";
};
};
"express-2.5.11" = {
@@ -23254,15 +23110,6 @@ let
sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==";
};
};
- "extract-files-5.0.1" = {
- name = "extract-files";
- packageName = "extract-files";
- version = "5.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/extract-files/-/extract-files-5.0.1.tgz";
- sha512 = "qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w==";
- };
- };
"extract-files-9.0.0" = {
name = "extract-files";
packageName = "extract-files";
@@ -23614,13 +23461,13 @@ let
sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==";
};
};
- "fastpriorityqueue-0.6.3" = {
+ "fastpriorityqueue-0.7.0" = {
name = "fastpriorityqueue";
packageName = "fastpriorityqueue";
- version = "0.6.3";
+ version = "0.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.6.3.tgz";
- sha512 = "l4Whw9/MDkl/0XuqZEzGE/sw9T7dIxuUnxqq4ZJDLt8AE45j8wkx4/nBRZm50aQ9kN71NB9mwQzglLsvQGROsw==";
+ url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.7.0.tgz";
+ sha512 = "L5Je6LktYDK5aRJIAHO4NEyQXsihwe/+VEaI2qwyoxvuTPcyooLi9+MeLJnOzvEDwijxAXrrqqkV4cNgW55Rog==";
};
};
"fastq-1.11.0" = {
@@ -23731,6 +23578,15 @@ let
sha1 = "b2497f47a57d9026b3907c09756acf5f4bd34e8b";
};
};
+ "fetch-node-website-5.0.3" = {
+ name = "fetch-node-website";
+ packageName = "fetch-node-website";
+ version = "5.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fetch-node-website/-/fetch-node-website-5.0.3.tgz";
+ sha512 = "O86T46FUWSOq4AWON39oaT8H90QFKAbmjfOVBhgaS87AFfeW00txz73KTv7QopPWtHBbGdI1S8cIT1VK1OQYLg==";
+ };
+ };
"fields-0.1.24" = {
name = "fields";
packageName = "fields";
@@ -24244,13 +24100,13 @@ let
sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==";
};
};
- "firefox-profile-4.0.0" = {
+ "firefox-profile-4.1.0" = {
name = "firefox-profile";
packageName = "firefox-profile";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-4.0.0.tgz";
- sha512 = "Vw31AsjfLDbcApMDwwnhZcz3tWjV6lxB9BNf84FaV44rZXtU87cVbFMBzPEtrJdUDbwPYiuYzprp6yksYGwjSw==";
+ url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-4.1.0.tgz";
+ sha512 = "n+0jsWhW57i7cAmdHg67W6u5vVSoIJN9D+d7M3w1MzhFLE5X/QxBfP80ksjNvNQDFXGdJQAnW9YupLkzgCxaFQ==";
};
};
"first-chunk-stream-2.0.0" = {
@@ -24442,13 +24298,13 @@ let
sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
};
};
- "flow-parser-0.146.0" = {
+ "flow-parser-0.147.0" = {
name = "flow-parser";
packageName = "flow-parser";
- version = "0.146.0";
+ version = "0.147.0";
src = fetchurl {
- url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.146.0.tgz";
- sha512 = "lMaDIdcEsdtKL0B+VFp8et/AjnB+cU1HJ6KDrp4Lw3Gsq0Ck0cmWRDgWfUQxxDvY99ntQyA/IdyFxFK4izKo4g==";
+ url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.147.0.tgz";
+ sha512 = "z+b/pgp2QLvsWJkzhKXU8yC5TmaNyXGRmHac3x0Swmn9uQESRXhNIJq9TPHKPPeWgFym33OLO+5BlIdy/tXRCQ==";
};
};
"fluent-ffmpeg-2.1.2" = {
@@ -24622,6 +24478,15 @@ let
sha512 = "DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==";
};
};
+ "follow-redirects-1.5.10" = {
+ name = "follow-redirects";
+ packageName = "follow-redirects";
+ version = "1.5.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
+ sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
+ };
+ };
"font-awesome-filetypes-2.1.0" = {
name = "font-awesome-filetypes";
packageName = "font-awesome-filetypes";
@@ -24784,6 +24649,15 @@ let
sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==";
};
};
+ "form-data-3.0.0" = {
+ name = "form-data";
+ packageName = "form-data";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz";
+ sha512 = "CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==";
+ };
+ };
"form-data-3.0.1" = {
name = "form-data";
packageName = "form-data";
@@ -25252,15 +25126,6 @@ let
sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
};
};
- "fsevents-2.2.1" = {
- name = "fsevents";
- packageName = "fsevents";
- version = "2.2.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz";
- sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==";
- };
- };
"fsevents-2.3.2" = {
name = "fsevents";
packageName = "fsevents";
@@ -25495,15 +25360,6 @@ let
sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
};
};
- "generic-names-2.0.1" = {
- name = "generic-names";
- packageName = "generic-names";
- version = "2.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz";
- sha512 = "kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ==";
- };
- };
"gensync-1.0.0-beta.2" = {
name = "gensync";
packageName = "gensync";
@@ -25774,13 +25630,13 @@ let
sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
};
};
- "getenv-0.7.0" = {
+ "getenv-1.0.0" = {
name = "getenv";
packageName = "getenv";
- version = "0.7.0";
+ version = "1.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/getenv/-/getenv-0.7.0.tgz";
- sha1 = "39b91838707e2086fd1cf6ef8777d1c93e14649e";
+ url = "https://registry.npmjs.org/getenv/-/getenv-1.0.0.tgz";
+ sha512 = "7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg==";
};
};
"getmac-5.17.0" = {
@@ -25882,15 +25738,6 @@ let
sha1 = "c57d1145eec16465ab9bfbdf575262b1691624d6";
};
};
- "git-parse-1.0.4" = {
- name = "git-parse";
- packageName = "git-parse";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/git-parse/-/git-parse-1.0.4.tgz";
- sha512 = "NSC71SqG6jN0XYPbib8t/mgguVLddw+xvkkLv2EsCFvHfsZjO+ZqMcGoGHHMqfhZllCDDAkOwZESkZEmICj9ZA==";
- };
- };
"git-raw-commits-2.0.10" = {
name = "git-raw-commits";
packageName = "git-raw-commits";
@@ -25927,15 +25774,6 @@ let
sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==";
};
};
- "git-rev-sync-2.1.0" = {
- name = "git-rev-sync";
- packageName = "git-rev-sync";
- version = "2.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-2.1.0.tgz";
- sha512 = "qZWv4D3GBm9sHEq5Jvc2rGuwQbz52mJoNAhe/zZS+rlwft7n8BGAG0QCgXt6m+jxn82IwlpOT3UXY81LkFJufA==";
- };
- };
"git-semver-tags-4.1.1" = {
name = "git-semver-tags";
packageName = "git-semver-tags";
@@ -25981,15 +25819,6 @@ let
sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ==";
};
};
- "git-url-parse-11.4.3" = {
- name = "git-url-parse";
- packageName = "git-url-parse";
- version = "11.4.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.3.tgz";
- sha512 = "LZTTk0nqJnKN48YRtOpR8H5SEfp1oM2tls90NuZmBxN95PnCvmuXGzqQ4QmVirBgKx2KPYfPGteX3/raWjKenQ==";
- };
- };
"git-url-parse-11.4.4" = {
name = "git-url-parse";
packageName = "git-url-parse";
@@ -26116,15 +25945,6 @@ let
sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
};
};
- "glob-7.1.5" = {
- name = "glob";
- packageName = "glob";
- version = "7.1.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz";
- sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==";
- };
- };
"glob-7.1.6" = {
name = "glob";
packageName = "glob";
@@ -26251,6 +26071,15 @@ let
sha512 = "wYGh6O3Xkx1LsMXQpObr/uu3PsFpbWhpbslgn9Xq52rbDZ6YOwJcQtU5R4lSEQgCDtXLItV9EH5X1F/VnBTAlw==";
};
};
+ "global-cache-dir-2.0.0" = {
+ name = "global-cache-dir";
+ packageName = "global-cache-dir";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/global-cache-dir/-/global-cache-dir-2.0.0.tgz";
+ sha512 = "30pvU3e8muclEhc9tt+jRMaywOS3QfNdURflJ5Zv0bohjhcVQpBe5bwRHghGSJORLOKW81/n+3iJvHRHs+/S1Q==";
+ };
+ };
"global-dirs-0.1.1" = {
name = "global-dirs";
packageName = "global-dirs";
@@ -26378,6 +26207,15 @@ let
sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==";
};
};
+ "globals-13.7.0" = {
+ name = "globals";
+ packageName = "globals";
+ version = "13.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globals/-/globals-13.7.0.tgz";
+ sha512 = "Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==";
+ };
+ };
"globals-9.18.0" = {
name = "globals";
packageName = "globals";
@@ -26423,13 +26261,13 @@ let
sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==";
};
};
- "globby-11.0.2" = {
+ "globby-11.0.3" = {
name = "globby";
packageName = "globby";
- version = "11.0.2";
+ version = "11.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz";
- sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==";
+ url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz";
+ sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==";
};
};
"globby-4.1.0" = {
@@ -26522,6 +26360,15 @@ let
sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777";
};
};
+ "goldengate-10.0.2" = {
+ name = "goldengate";
+ packageName = "goldengate";
+ version = "10.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.2.tgz";
+ sha512 = "lPzyIIgEIMC9mDfUQ/F3+5Y+UlJKxvmWOSEjomb9oNyQ25D3oaMmqv2TIPjJe9nS2hP9XzTRHImh4WQKWE3Wmw==";
+ };
+ };
"gonzales-pe-4.3.0" = {
name = "gonzales-pe";
packageName = "gonzales-pe";
@@ -26549,13 +26396,13 @@ let
sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ==";
};
};
- "google-auth-library-7.0.2" = {
+ "google-auth-library-7.0.3" = {
name = "google-auth-library";
packageName = "google-auth-library";
- version = "7.0.2";
+ version = "7.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.2.tgz";
- sha512 = "vjyNZR3pDLC0u7GHLfj+Hw9tGprrJwoMwkYGqURCXYITjCrP9HprOyxVV+KekdLgATtWGuDkQG2MTh0qpUPUgg==";
+ url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.3.tgz";
+ sha512 = "6wJNYqY1QUr5I2lWaUkkzOT2b9OCNhNQrdFOt/bsBbGb7T7NCdEvrBsXraUm+KTUGk2xGlQ7m9RgUd4Llcw8NQ==";
};
};
"google-closure-compiler-js-20170910.0.1" = {
@@ -26567,13 +26414,13 @@ let
sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew==";
};
};
- "google-gax-2.10.3" = {
+ "google-gax-2.11.2" = {
name = "google-gax";
packageName = "google-gax";
- version = "2.10.3";
+ version = "2.11.2";
src = fetchurl {
- url = "https://registry.npmjs.org/google-gax/-/google-gax-2.10.3.tgz";
- sha512 = "jESs/ME9WgMzfGQKJDu9ea2mEKjznKByRL+5xb8mKfHlbUfS/LxNLNCg/35RgXwVXcNSCqkEY90z8wHxvgdd/Q==";
+ url = "https://registry.npmjs.org/google-gax/-/google-gax-2.11.2.tgz";
+ sha512 = "PNqXv7Oi5XBMgoMWVxLZHUidfMv7cPHrDSDXqLyEd6kY6pqFnVKC8jt2T1df4JPSc2+VLPdeo6L7X9mbdQG8Xw==";
};
};
"google-p12-pem-3.0.3" = {
@@ -26720,15 +26567,6 @@ let
sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==";
};
};
- "graceful-fs-4.1.15" = {
- name = "graceful-fs";
- packageName = "graceful-fs";
- version = "4.1.15";
- src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
- sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
- };
- };
"graceful-fs-4.2.6" = {
name = "graceful-fs";
packageName = "graceful-fs";
@@ -26810,15 +26648,6 @@ let
sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w==";
};
};
- "graphql-anywhere-4.2.7" = {
- name = "graphql-anywhere";
- packageName = "graphql-anywhere";
- version = "4.2.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.2.7.tgz";
- sha512 = "fJHvVywWVWjiHuPIMs16Nfjf4zdQUwSO1LKycwBJCWIPeoeQ8LqXK2BgYoZAHkhKEFktZZeYyzS4o/uIUG0z5A==";
- };
- };
"graphql-config-3.0.3" = {
name = "graphql-config";
packageName = "graphql-config";
@@ -26846,22 +26675,13 @@ let
sha512 = "95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g==";
};
};
- "graphql-tag-2.11.0" = {
+ "graphql-tag-2.12.3" = {
name = "graphql-tag";
packageName = "graphql-tag";
- version = "2.11.0";
+ version = "2.12.3";
src = fetchurl {
- url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.11.0.tgz";
- sha512 = "VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA==";
- };
- };
- "graphql-tag-2.12.1" = {
- name = "graphql-tag";
- packageName = "graphql-tag";
- version = "2.12.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.1.tgz";
- sha512 = "LPewEE1vzGkHnCO8zdOGogKsHHBdtpGyihow1UuMwp6RnZa0lAS7NcbvltLOuo4pi5diQCPASAXZkQq44ffixA==";
+ url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.3.tgz";
+ sha512 = "5wJMjSvj30yzdciEuk9dPuUBUR56AqDi3xncoYQl1i42pGdSqOJrJsdb/rz5BDoy+qoGvQwABcBeF0xXY3TrKw==";
};
};
"graphql-tools-3.0.0" = {
@@ -26900,13 +26720,13 @@ let
sha512 = "zsrDtu5gCbQFDWsNa5bMB4nf1LpKX9KDgh+f8oL1288ijV4RxeckhVozAjqjXAfRpxOHD1xOESsh6zq8SjdgjA==";
};
};
- "graphql-ws-4.1.5" = {
+ "graphql-ws-4.2.2" = {
name = "graphql-ws";
packageName = "graphql-ws";
- version = "4.1.5";
+ version = "4.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.1.5.tgz";
- sha512 = "yUQ1AjegD1Y9jDS699kyw7Mw+9H+rILm2HoS8N5a5B5YTH93xy3yifFhAJpKGc2wb/8yGdlVy8gTcud0TPqi6Q==";
+ url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.2.2.tgz";
+ sha512 = "b6TLtWLAmKunD72muL9EeItRGpio9+V3Cx4zJsBkRA+3wxzTWXDvQr9/3qSwJ3D/2abz0ys2KHTM6lB1uH7KIQ==";
};
};
"gray-matter-2.1.1" = {
@@ -27170,6 +26990,15 @@ let
sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
};
};
+ "har-validator-5.1.3" = {
+ name = "har-validator";
+ packageName = "har-validator";
+ version = "5.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
+ sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
+ };
+ };
"har-validator-5.1.5" = {
name = "har-validator";
packageName = "har-validator";
@@ -27683,15 +27512,6 @@ let
sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";
};
};
- "header-case-2.0.4" = {
- name = "header-case";
- packageName = "header-case";
- version = "2.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz";
- sha512 = "H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==";
- };
- };
"headless-0.1.7" = {
name = "headless";
packageName = "headless";
@@ -27773,13 +27593,13 @@ let
sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653";
};
};
- "highlight.js-10.6.0" = {
+ "highlight.js-10.7.1" = {
name = "highlight.js";
packageName = "highlight.js";
- version = "10.6.0";
+ version = "10.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.6.0.tgz";
- sha512 = "8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==";
+ url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.1.tgz";
+ sha512 = "S6G97tHGqJ/U8DsXcEdnACbirtbx58Bx9CzIVeYli8OuswCfYI/LsXH2EiGcoGio1KAC3x4mmUwulOllJ2ZyRA==";
};
};
"highlight.js-8.2.0" = {
@@ -27926,6 +27746,24 @@ let
sha512 = "aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==";
};
};
+ "hosted-git-info-4.0.2" = {
+ name = "hosted-git-info";
+ packageName = "hosted-git-info";
+ version = "4.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz";
+ sha512 = "c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==";
+ };
+ };
+ "hot-formula-parser-4.0.0" = {
+ name = "hot-formula-parser";
+ packageName = "hot-formula-parser";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hot-formula-parser/-/hot-formula-parser-4.0.0.tgz";
+ sha512 = "diG1UvuQ3HxtfezVUIpvndk/bVkqZJ9Rfv10MdVF7pJEj8P2Jd4iCZSMJCN3lDhnLegaVlfSYSA6+szYNFQUKg==";
+ };
+ };
"hot-shots-6.8.7" = {
name = "hot-shots";
packageName = "hot-shots";
@@ -28368,6 +28206,15 @@ let
sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
};
};
+ "http-signature-1.3.1" = {
+ name = "http-signature";
+ packageName = "http-signature";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.1.tgz";
+ sha512 = "Y29YKEc8MQsjch/VzkUVJ+2MXd9WcR42fK5u36CZf4G8bXw2DXMTWuESiB0R6m59JAWxlPPw5/Fri/t/AyyueA==";
+ };
+ };
"http-signature-1.3.5" = {
name = "http-signature";
packageName = "http-signature";
@@ -28449,15 +28296,6 @@ let
sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==";
};
};
- "https-proxy-agent-4.0.0" = {
- name = "https-proxy-agent";
- packageName = "https-proxy-agent";
- version = "4.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz";
- sha512 = "zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==";
- };
- };
"https-proxy-agent-5.0.0" = {
name = "https-proxy-agent";
packageName = "https-proxy-agent";
@@ -28665,15 +28503,6 @@ let
sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==";
};
};
- "icss-utils-5.1.0" = {
- name = "icss-utils";
- packageName = "icss-utils";
- version = "5.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz";
- sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==";
- };
- };
"idb-kv-store-4.5.0" = {
name = "idb-kv-store";
packageName = "idb-kv-store";
@@ -29034,15 +28863,6 @@ let
sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216";
};
};
- "inflected-2.1.0" = {
- name = "inflected";
- packageName = "inflected";
- version = "2.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/inflected/-/inflected-2.1.0.tgz";
- sha512 = "hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w==";
- };
- };
"inflight-1.0.6" = {
name = "inflight";
packageName = "inflight";
@@ -29142,15 +28962,6 @@ let
sha512 = "PO64kVeArePvhX7Ff0jVWkpnE1DfGRvaWcStYrPugcJz9twQGYibagKJuIMHCX7ENcp0M6LJlcjLBuLD5KeJMg==";
};
};
- "ink-2.7.1" = {
- name = "ink";
- packageName = "ink";
- version = "2.7.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/ink/-/ink-2.7.1.tgz";
- sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA==";
- };
- };
"ink-3.0.8" = {
name = "ink";
packageName = "ink";
@@ -29160,31 +28971,13 @@ let
sha512 = "ubMFylXYaG4IkXQVhPautbhV/p6Lo0GlvAMI/jh8cGJQ39yeznJbaTTJP2CqZXezA4GOHzalpwCWqux/NEY38w==";
};
};
- "ink-confirm-input-2.0.0" = {
- name = "ink-confirm-input";
- packageName = "ink-confirm-input";
- version = "2.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/ink-confirm-input/-/ink-confirm-input-2.0.0.tgz";
- sha512 = "YCd7a9XW0DIIbOhF3XiLo3WF86mOart9qI1qN56wT5IDJxU+j8BanEZh5/QXoazyIPSv1iXlHPIlRB5cbZIMIA==";
- };
- };
- "ink-spinner-3.1.0" = {
+ "ink-spinner-4.0.1" = {
name = "ink-spinner";
packageName = "ink-spinner";
- version = "3.1.0";
+ version = "4.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/ink-spinner/-/ink-spinner-3.1.0.tgz";
- sha512 = "sPqmE4qeJ43vJFk9DGLd0wIqhMBAr3129ZqHPt7b847fVl+YTZ3g96khI82Db+FYE7v/Fc5B3lp4ZNtJfqpRUg==";
- };
- };
- "ink-text-input-3.3.0" = {
- name = "ink-text-input";
- packageName = "ink-text-input";
- version = "3.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-3.3.0.tgz";
- sha512 = "gO4wrOf2ie3YuEARTIwGlw37lMjFn3Gk6CKIDrMlHb46WFMagZU7DplohjM24zynlqfnXA5UDEIfC2NBcvD8kg==";
+ url = "https://registry.npmjs.org/ink-spinner/-/ink-spinner-4.0.1.tgz";
+ sha512 = "2eYtzzUPb22Z0Cn2bGvE4BteYjcqDhgrHnCzGJM81EHXXlyNU7aYfucPgZs2CZPy0LWz/5hwoecFhd0mj1hrbw==";
};
};
"ink-text-input-4.0.1" = {
@@ -29313,6 +29106,15 @@ let
sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==";
};
};
+ "inquirer-8.0.0" = {
+ name = "inquirer";
+ packageName = "inquirer";
+ version = "8.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inquirer/-/inquirer-8.0.0.tgz";
+ sha512 = "ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA==";
+ };
+ };
"inquirer-autocomplete-prompt-1.3.0" = {
name = "inquirer-autocomplete-prompt";
packageName = "inquirer-autocomplete-prompt";
@@ -29466,22 +29268,13 @@ let
sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==";
};
};
- "internal-slot-1.0.3" = {
- name = "internal-slot";
- packageName = "internal-slot";
- version = "1.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz";
- sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==";
- };
- };
- "internmap-1.0.0" = {
+ "internmap-1.0.1" = {
name = "internmap";
packageName = "internmap";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/internmap/-/internmap-1.0.0.tgz";
- sha512 = "SdoDWwNOTE2n4JWUsLn4KXZGuZPjPF9yyOGc8bnfWnBQh7BD/l80rzSznKc/r4Y0aQ7z3RTk9X+tV4tHBpu+dA==";
+ url = "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz";
+ sha512 = "lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==";
};
};
"interpret-1.1.0" = {
@@ -29574,6 +29367,15 @@ let
sha512 = "CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==";
};
};
+ "invoices-1.1.6" = {
+ name = "invoices";
+ packageName = "invoices";
+ version = "1.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/invoices/-/invoices-1.1.6.tgz";
+ sha512 = "/rNd9R/qcq+4QakROCQGnOJbiQ9BKwtOVF+OWu+3pYVYgPydnAMA++VCcKxZYFCGDC70Ee+9oUvIlXI8UQoiqQ==";
+ };
+ };
"iota-array-1.0.0" = {
name = "iota-array";
packageName = "iota-array";
@@ -29934,15 +29736,6 @@ let
sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
};
};
- "is-ci-3.0.0" = {
- name = "is-ci";
- packageName = "is-ci";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz";
- sha512 = "kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==";
- };
- };
"is-color-stop-1.1.0" = {
name = "is-color-stop";
packageName = "is-color-stop";
@@ -30933,6 +30726,15 @@ let
sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==";
};
};
+ "is-unicode-supported-0.1.0" = {
+ name = "is-unicode-supported";
+ packageName = "is-unicode-supported";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz";
+ sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==";
+ };
+ };
"is-url-1.2.4" = {
name = "is-url";
packageName = "is-url";
@@ -31185,6 +30987,15 @@ let
sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
};
};
+ "isnumber-1.0.0" = {
+ name = "isnumber";
+ packageName = "isnumber";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz";
+ sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01";
+ };
+ };
"isobject-2.1.0" = {
name = "isobject";
packageName = "isobject";
@@ -31392,15 +31203,6 @@ let
sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==";
};
};
- "java-properties-1.0.2" = {
- name = "java-properties";
- packageName = "java-properties";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/java-properties/-/java-properties-1.0.2.tgz";
- sha512 = "qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==";
- };
- };
"javascript-stringify-1.6.0" = {
name = "javascript-stringify";
packageName = "javascript-stringify";
@@ -31428,6 +31230,15 @@ let
sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==";
};
};
+ "jest-get-type-25.2.6" = {
+ name = "jest-get-type";
+ packageName = "jest-get-type";
+ version = "25.2.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz";
+ sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==";
+ };
+ };
"jest-haste-map-25.5.1" = {
name = "jest-haste-map";
packageName = "jest-haste-map";
@@ -31473,6 +31284,15 @@ let
sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==";
};
};
+ "jest-validate-25.5.0" = {
+ name = "jest-validate";
+ packageName = "jest-validate";
+ version = "25.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz";
+ sha512 = "okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==";
+ };
+ };
"jest-worker-25.5.0" = {
name = "jest-worker";
packageName = "jest-worker";
@@ -31491,15 +31311,6 @@ let
sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==";
};
};
- "jetpack-id-1.0.0" = {
- name = "jetpack-id";
- packageName = "jetpack-id";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/jetpack-id/-/jetpack-id-1.0.0.tgz";
- sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6";
- };
- };
"jimp-0.12.1" = {
name = "jimp";
packageName = "jimp";
@@ -31509,13 +31320,13 @@ let
sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw==";
};
};
- "jitdb-2.3.3" = {
+ "jitdb-2.3.4" = {
name = "jitdb";
packageName = "jitdb";
- version = "2.3.3";
+ version = "2.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/jitdb/-/jitdb-2.3.3.tgz";
- sha512 = "wSB+iNzPm/Qcp1lKg8olKL0zeZdAhDVXLpWLKLWtqWN/vpHeu7vKmYxClsxhmV4YhZ/Hjzzi0oXBY8hVqKHQTA==";
+ url = "https://registry.npmjs.org/jitdb/-/jitdb-2.3.4.tgz";
+ sha512 = "KK20bNiuzIekY7KzH4DvKDMGOu4yGAfiPFLE6GbFZUWurXOQJAbfjvbqKmNHOTE6FA5o8pPg2dz8OvJyjByWEQ==";
};
};
"jju-1.4.0" = {
@@ -31689,15 +31500,6 @@ let
sha512 = "pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA==";
};
};
- "js-select-0.6.0" = {
- name = "js-select";
- packageName = "js-select";
- version = "0.6.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/js-select/-/js-select-0.6.0.tgz";
- sha1 = "c284e22824d5927aec962dcdf247174aefb0d190";
- };
- };
"js-string-escape-1.0.1" = {
name = "js-string-escape";
packageName = "js-string-escape";
@@ -31824,13 +31626,13 @@ let
sha512 = "xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ==";
};
};
- "jscodeshift-0.10.0" = {
+ "jscodeshift-0.11.0" = {
name = "jscodeshift";
packageName = "jscodeshift";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.10.0.tgz";
- sha512 = "xpH2FVSEepXoNr6+cPlPHzPzBY1W9bPulufhCHOShzk8+CTCzAOQKytuOXT0b/9PvmO4biRi0g/ZIylVew815w==";
+ url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.11.0.tgz";
+ sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g==";
};
};
"jsdom-11.12.0" = {
@@ -31869,13 +31671,13 @@ let
sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==";
};
};
- "jsdom-16.5.0" = {
+ "jsdom-16.5.1" = {
name = "jsdom";
packageName = "jsdom";
- version = "16.5.0";
+ version = "16.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/jsdom/-/jsdom-16.5.0.tgz";
- sha512 = "QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==";
+ url = "https://registry.npmjs.org/jsdom/-/jsdom-16.5.1.tgz";
+ sha512 = "pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==";
};
};
"jsdom-7.2.2" = {
@@ -31914,49 +31716,49 @@ let
sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==";
};
};
- "jsii-1.24.0" = {
+ "jsii-1.26.0" = {
name = "jsii";
packageName = "jsii";
- version = "1.24.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii/-/jsii-1.24.0.tgz";
- sha512 = "ROCFFFdbs2o8OgQEWvpMY/UMXshndkGr8TunG0NQx8kQfONYeCjgNFqMcbcyXuhlR+DI1MUGVVOzw6zc9geyGA==";
+ url = "https://registry.npmjs.org/jsii/-/jsii-1.26.0.tgz";
+ sha512 = "ZUu5N8+u12VyNkPgSgvVzIhZ+aEAd531zDZK4qkth7UsGNhSy4zBz9BJMSSKnaVV0oR6Pvehhg5DJ3dCu8qJrw==";
};
};
- "jsii-pacmak-1.24.0" = {
+ "jsii-pacmak-1.26.0" = {
name = "jsii-pacmak";
packageName = "jsii-pacmak";
- version = "1.24.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.24.0.tgz";
- sha512 = "8L5AOOy2LU3Y8tLy+KBTdmtxfu+Kn6g54htj+d1g3dVCxApC/G83C1DudhkYCxM3gDavsLPHhG6+fyopdTVV5A==";
+ url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.26.0.tgz";
+ sha512 = "KOKOIazxddh8CuyuLMoBURW2bj3prhzyT0qF5ojUhHrbZeuH3eulF/Sn5PaIAadmQdmCiu69DYJe2JIwY/zwjw==";
};
};
- "jsii-reflect-1.24.0" = {
+ "jsii-reflect-1.26.0" = {
name = "jsii-reflect";
packageName = "jsii-reflect";
- version = "1.24.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.24.0.tgz";
- sha512 = "LWWReRtLhmyUMRD5NOFDV+HJHP/ChHRa6alccSPU9vTL5tm9HtMW0oO2XaVj4a2YPujvQ+sH7APzndj60Qgzqw==";
+ url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.26.0.tgz";
+ sha512 = "mlu97Xs2M+YCq3Z8z2vzLYOe3XVC3T0YBabvJjkKoNYdH6F/S5zQMVdGwfHEXv1asFv7PrrVu46Zf/dKnqULcw==";
};
};
- "jsii-rosetta-1.24.0" = {
+ "jsii-rosetta-1.26.0" = {
name = "jsii-rosetta";
packageName = "jsii-rosetta";
- version = "1.24.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.24.0.tgz";
- sha512 = "BMYxIjYG62wctUZFjYc5xKPNTgzTRRw2Fp8R9p4o0VeFE224ntyHgy9y7oKuCu+K1ev917NRoCLj7f2tyGTMAg==";
+ url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.26.0.tgz";
+ sha512 = "J/VQR8j/mD4Q5qGF0JmfvOJeNWIx0I158nvo6FsnC8aYmHyIpBPmlpKWZzUGC8fHxoD3mC8oeiFLp2Yv8BNtvQ==";
};
};
- "jsii-srcmak-0.1.252" = {
+ "jsii-srcmak-0.1.255" = {
name = "jsii-srcmak";
packageName = "jsii-srcmak";
- version = "0.1.252";
+ version = "0.1.255";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.252.tgz";
- sha512 = "nRQ2JdGUgAi5YXkxQwJ4lM3K4oTeGzVTIT+4nQ6FBLC0/eHQrJYbqNbX27xb/JzqidVzv7y7C0ykZGiBDByKSQ==";
+ url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.255.tgz";
+ sha512 = "vWIcR+z9HmqHX4lwJI9TFkGhBsZK2tPlgnvANJ09+SwrrLdBFOBFOJB298U5vMyQ/2mf0VFGlFFoJO9mA/6B4A==";
};
};
"json-bigint-0.2.3" = {
@@ -32238,6 +32040,15 @@ let
sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ==";
};
};
+ "json2csv-5.0.6" = {
+ name = "json2csv";
+ packageName = "json2csv";
+ version = "5.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json2csv/-/json2csv-5.0.6.tgz";
+ sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
+ };
+ };
"json2jsii-0.1.188" = {
name = "json2jsii";
packageName = "json2jsii";
@@ -32490,6 +32301,15 @@ let
sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
};
};
+ "jstat-1.9.4" = {
+ name = "jstat";
+ packageName = "jstat";
+ version = "1.9.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jstat/-/jstat-1.9.4.tgz";
+ sha512 = "IiTPlI7pcrsq41EpDzrghlA1fhiC9GXxNqO4k5ogsjsM1XAWQ8zESH/bZsExLVgQsYpXE+7c11kEbbuxTLUpJQ==";
+ };
+ };
"jstransform-10.1.0" = {
name = "jstransform";
packageName = "jstransform";
@@ -32517,15 +32337,6 @@ let
sha1 = "69ec30ce4518bed5997b38f027648e8c285e92f7";
};
};
- "jsx-ast-utils-3.2.0" = {
- name = "jsx-ast-utils";
- packageName = "jsx-ast-utils";
- version = "3.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz";
- sha512 = "EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==";
- };
- };
"jszip-2.6.1" = {
name = "jszip";
packageName = "jszip";
@@ -32878,13 +32689,13 @@ let
sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==";
};
};
- "khroma-1.2.0" = {
+ "khroma-1.3.0" = {
name = "khroma";
packageName = "khroma";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/khroma/-/khroma-1.2.0.tgz";
- sha512 = "DlKk5y243dujy8fOH02aRnnewLfiHJV0s8aXaVrCohgBf3s7fEAn6gc6LLQ21agODlFZS8ufrn+juu70uCA9Tw==";
+ url = "https://registry.npmjs.org/khroma/-/khroma-1.3.0.tgz";
+ sha512 = "fpi0vIulP3FrM3BQOsEs+0ujWUNrg/YyHtEAcnvPxIHbASHNXEKEsDHtU2mADnJss7KvEdz7z2pUCQAEfFaFbA==";
};
};
"killable-1.0.1" = {
@@ -33553,6 +33364,15 @@ let
sha512 = "wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw==";
};
};
+ "lightning-3.2.20" = {
+ name = "lightning";
+ packageName = "lightning";
+ version = "3.2.20";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lightning/-/lightning-3.2.20.tgz";
+ sha512 = "VbuYUKrESdUd2mWzFannAn/Bd0DZ0fkO73LeemJ7JS2JaIItXHoEZTAHWg+Ekf+r2rk4+v7NLurrfCmGpNdD8A==";
+ };
+ };
"limit-spawn-0.0.3" = {
name = "limit-spawn";
packageName = "limit-spawn";
@@ -33679,6 +33499,42 @@ let
sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==";
};
};
+ "ln-accounting-4.2.6" = {
+ name = "ln-accounting";
+ packageName = "ln-accounting";
+ version = "4.2.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.2.6.tgz";
+ sha512 = "q8Z9hAkl0Dmkj5kJuQDUWkEFT2Ja5YDQrpvBEpS5Pe4NNrI1PSHM6jYb3t9cDqhq/qkKyCNHZBY7QDLWtXJABg==";
+ };
+ };
+ "ln-service-51.3.1" = {
+ name = "ln-service";
+ packageName = "ln-service";
+ version = "51.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ln-service/-/ln-service-51.3.1.tgz";
+ sha512 = "V5Q1rZbN4GY1PfxosQ1pWyyhZF/qPWivf5whL0lDWBrJ4xgsemYRkg5ce4YaUNLYv/BXfMrQVyw09w+tyq+QnQ==";
+ };
+ };
+ "ln-sync-0.4.4" = {
+ name = "ln-sync";
+ packageName = "ln-sync";
+ version = "0.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.4.tgz";
+ sha512 = "E9Smgc7vzhUn1wSQ8CzUXBfPqD2PNdXOM84nfVv/kbRSdJ87JvCbE0ksxv76X3CjgwbnC++B1946bR96ymK+Ig==";
+ };
+ };
+ "ln-telegram-3.2.1" = {
+ name = "ln-telegram";
+ packageName = "ln-telegram";
+ version = "3.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.1.tgz";
+ sha512 = "LpnCfPrafA95mjyYnmoJI03bgGOX3X/2uG8BVZRNOSGrqVKjGVUL6cx849L7lRoHLtbWM6Rge3uZ901Fkx5Bfg==";
+ };
+ };
"load-bmfont-1.4.1" = {
name = "load-bmfont";
packageName = "load-bmfont";
@@ -34597,15 +34453,6 @@ let
sha1 = "6694cffa65fef931f7c31ce86c74597cf560f4f1";
};
};
- "lodash.identity-3.0.0" = {
- name = "lodash.identity";
- packageName = "lodash.identity";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/lodash.identity/-/lodash.identity-3.0.0.tgz";
- sha1 = "ad7bc6a4e647d79c972e1b80feef7af156267876";
- };
- };
"lodash.includes-4.3.0" = {
name = "lodash.includes";
packageName = "lodash.includes";
@@ -34957,15 +34804,6 @@ let
sha1 = "52f05610fff9ded422611441ed1fc123a03001b3";
};
};
- "lodash.pickby-4.6.0" = {
- name = "lodash.pickby";
- packageName = "lodash.pickby";
- version = "4.6.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz";
- sha1 = "7dea21d8c18d7703a27c704c15d3b84a67e33aff";
- };
- };
"lodash.reduce-4.6.0" = {
name = "lodash.reduce";
packageName = "lodash.reduce";
@@ -35200,15 +35038,6 @@ let
sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347";
};
};
- "lodash.xorby-4.7.0" = {
- name = "lodash.xorby";
- packageName = "lodash.xorby";
- version = "4.7.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/lodash.xorby/-/lodash.xorby-4.7.0.tgz";
- sha1 = "9c19a6f9f063a6eb53dd03c1b6871799801463d7";
- };
- };
"lodash.zip-4.2.0" = {
name = "lodash.zip";
packageName = "lodash.zip";
@@ -35281,6 +35110,15 @@ let
sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==";
};
};
+ "log-symbols-4.1.0" = {
+ name = "log-symbols";
+ packageName = "log-symbols";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz";
+ sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==";
+ };
+ };
"log-update-1.0.2" = {
name = "log-update";
packageName = "log-update";
@@ -35695,6 +35533,15 @@ let
sha512 = "O6oWF0xe1AFvOCjU8uOZBZ/lhjaMNwHfVNaqVMqmoQXlRwBcFWpCAToiZOdXcKVMdo/5s/D0a2QgA5laMErxHQ==";
};
};
+ "macaroon-3.0.4" = {
+ name = "macaroon";
+ packageName = "macaroon";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/macaroon/-/macaroon-3.0.4.tgz";
+ sha512 = "Tja2jvupseKxltPZbu5RPSz2Pgh6peYA3O46YCTcYL8PI1VqtGwDqRhGfP8pows26xx9wTiygk+en62Bq+Y8JA==";
+ };
+ };
"machine-10.4.0" = {
name = "machine";
packageName = "machine";
@@ -35839,15 +35686,6 @@ let
sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==";
};
};
- "make-error-1.3.6" = {
- name = "make-error";
- packageName = "make-error";
- version = "1.3.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz";
- sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
- };
- };
"make-fetch-happen-8.0.14" = {
name = "make-fetch-happen";
packageName = "make-fetch-happen";
@@ -35956,13 +35794,13 @@ let
sha1 = "a65cd29087a92598b8791257a523e021222ac1f9";
};
};
- "map-obj-4.1.0" = {
+ "map-obj-4.2.0" = {
name = "map-obj";
packageName = "map-obj";
- version = "4.1.0";
+ version = "4.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz";
- sha512 = "glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==";
+ url = "https://registry.npmjs.org/map-obj/-/map-obj-4.2.0.tgz";
+ sha512 = "NAq0fCmZYGz9UFEQyndp7sisrow4GroyGeKluyKC/chuITZsPyOyC1UJZPJlVFImhXdROIP5xqouRLThT3BbpQ==";
};
};
"map-stream-0.0.7" = {
@@ -36208,15 +36046,6 @@ let
sha512 = "1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==";
};
};
- "markdown-table-2.0.0" = {
- name = "markdown-table";
- packageName = "markdown-table";
- version = "2.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz";
- sha512 = "Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==";
- };
- };
"marked-0.3.19" = {
name = "marked";
packageName = "marked";
@@ -36487,15 +36316,6 @@ let
sha512 = "3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg==";
};
};
- "mdast-util-compact-2.0.1" = {
- name = "mdast-util-compact";
- packageName = "mdast-util-compact";
- version = "2.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz";
- sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==";
- };
- };
"mdast-util-from-markdown-0.8.5" = {
name = "mdast-util-from-markdown";
packageName = "mdast-util-from-markdown";
@@ -36505,6 +36325,42 @@ let
sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==";
};
};
+ "mdast-util-mdx-0.1.1" = {
+ name = "mdast-util-mdx";
+ packageName = "mdast-util-mdx";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-0.1.1.tgz";
+ sha512 = "9nncdnHNYSb4HNxY3AwE6gU632jhbXsDGXe9PkkJoEawYWJ8tTwmEOHGlGa2TCRidtkd6FF5I8ogDU9pTDlQyA==";
+ };
+ };
+ "mdast-util-mdx-expression-0.1.1" = {
+ name = "mdast-util-mdx-expression";
+ packageName = "mdast-util-mdx-expression";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-0.1.1.tgz";
+ sha512 = "SoO8y1B9NjMOYlNdwXMchuTVvqSTlUmXm1P5QvZNPv7OH7aa8qJV+3aA+vl1DHK9Vk1uZAlgwokjvDQhS6bINA==";
+ };
+ };
+ "mdast-util-mdx-jsx-0.1.4" = {
+ name = "mdast-util-mdx-jsx";
+ packageName = "mdast-util-mdx-jsx";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-0.1.4.tgz";
+ sha512 = "67KOAvCmypBSpr+AJEAVQg1Obig5Wnguo4ETTxASe5WVP4TLt57bZjDX/9EW5sWYQsO4gPqLxkUOlypVn5rkhg==";
+ };
+ };
+ "mdast-util-mdxjs-esm-0.1.1" = {
+ name = "mdast-util-mdxjs-esm";
+ packageName = "mdast-util-mdxjs-esm";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-0.1.1.tgz";
+ sha512 = "kBiYeashz+nuhfv+712nc4THQhzXIH2gBFUDbuLxuDCqU/fZeg+9FAcdRBx9E13dkpk1p2Xwufzs3wsGJ+mISQ==";
+ };
+ };
"mdast-util-to-markdown-0.6.5" = {
name = "mdast-util-to-markdown";
packageName = "mdast-util-to-markdown";
@@ -36658,13 +36514,13 @@ let
sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q==";
};
};
- "mem-8.0.0" = {
+ "mem-8.1.0" = {
name = "mem";
packageName = "mem";
- version = "8.0.0";
+ version = "8.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mem/-/mem-8.0.0.tgz";
- sha512 = "qrcJOe6uD+EW8Wrci1Vdiua/15Xw3n/QnaNXE7varnB6InxSk7nu3/i5jfy3S6kWxr8WYJ6R1o0afMUtvorTsA==";
+ url = "https://registry.npmjs.org/mem/-/mem-8.1.0.tgz";
+ sha512 = "FIkgXo0kTi3XpvaznV5Muk6Y6w8SkdmRXcY7ZLonQesuYezp59UooLxAVBcGuN6PH2tXN84mR3vyzSc6oSMUfA==";
};
};
"mem-fs-1.2.0" = {
@@ -36802,13 +36658,13 @@ let
sha512 = "51j4kUedbqkWGby44hAhf5f/hj8GOvHoLX00/YHURBNxOMf5k8JbPuGfmeNpZEXhc3vrmfnFben4+rOOx3HjEQ==";
};
};
- "memorystore-1.6.5" = {
+ "memorystore-1.6.6" = {
name = "memorystore";
packageName = "memorystore";
- version = "1.6.5";
+ version = "1.6.6";
src = fetchurl {
- url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.5.tgz";
- sha512 = "2RD1kTZhF0nywVtps2NoQgbMiPO6o1+dIRUAi2cRQDxMyCKwOZdBrC/Lk9/ttlF6lHn3T6uCPwSbgWxEef9djQ==";
+ url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.6.tgz";
+ sha512 = "EbLl1xg9+DlnjXkZK/eMUoWyhZ1IxcWMpSuFyqyA/Z4BNuH7BR+E0yC40WbLZZ6G8LxHiUZ2DPhqV8DR8+9UQQ==";
};
};
"memorystream-0.3.1" = {
@@ -36910,6 +36766,15 @@ let
sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
};
};
+ "merge-options-3.0.4" = {
+ name = "merge-options";
+ packageName = "merge-options";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz";
+ sha512 = "2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==";
+ };
+ };
"merge-source-map-1.0.4" = {
name = "merge-source-map";
packageName = "merge-source-map";
@@ -36919,15 +36784,6 @@ let
sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f";
};
};
- "merge-source-map-1.1.0" = {
- name = "merge-source-map";
- packageName = "merge-source-map";
- version = "1.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz";
- sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==";
- };
- };
"merge-stream-2.0.0" = {
name = "merge-stream";
packageName = "merge-stream";
@@ -36964,13 +36820,13 @@ let
sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081";
};
};
- "mermaid-8.9.1" = {
+ "mermaid-8.9.2" = {
name = "mermaid";
packageName = "mermaid";
- version = "8.9.1";
+ version = "8.9.2";
src = fetchurl {
- url = "https://registry.npmjs.org/mermaid/-/mermaid-8.9.1.tgz";
- sha512 = "0XFtH3TazlWQ6hKqBDeOfXglPBAfNDreC63NKjrmgzLG+aIY3yJZNdkl22JH4LniqQDx+7oZFmD7t0PnEymkew==";
+ url = "https://registry.npmjs.org/mermaid/-/mermaid-8.9.2.tgz";
+ sha512 = "XWEaraDRDlHZexdeHSSr/MH4VJAOksRSPudchi69ecZJ7IUjjlzHsg32n4ZwJUh6lFO+NMYLHwHNNYUyxIjGPg==";
};
};
"mersenne-0.0.4" = {
@@ -37153,6 +37009,60 @@ let
sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==";
};
};
+ "micromark-extension-mdx-0.2.1" = {
+ name = "micromark-extension-mdx";
+ packageName = "micromark-extension-mdx";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromark-extension-mdx/-/micromark-extension-mdx-0.2.1.tgz";
+ sha512 = "J+nZegf1ExPz1Ft6shxu8M9WfRom1gwRIx6gpJK1SEEqKzY5LjOR1d/WHRtjwV4KoMXrL53+PoN7T1Rw1euJew==";
+ };
+ };
+ "micromark-extension-mdx-expression-0.3.2" = {
+ name = "micromark-extension-mdx-expression";
+ packageName = "micromark-extension-mdx-expression";
+ version = "0.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-0.3.2.tgz";
+ sha512 = "Sh8YHLSAlbm/7TZkVKEC4wDcJE8XhVpZ9hUXBue1TcAicrrzs/oXu7PHH3NcyMemjGyMkiVS34Y0AHC5KG3y4A==";
+ };
+ };
+ "micromark-extension-mdx-jsx-0.3.3" = {
+ name = "micromark-extension-mdx-jsx";
+ packageName = "micromark-extension-mdx-jsx";
+ version = "0.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-0.3.3.tgz";
+ sha512 = "kG3VwaJlzAPdtIVDznfDfBfNGMTIzsHqKpTmMlew/iPnUCDRNkX+48ElpaOzXAtK5axtpFKE3Hu3VBriZDnRTQ==";
+ };
+ };
+ "micromark-extension-mdx-md-0.1.1" = {
+ name = "micromark-extension-mdx-md";
+ packageName = "micromark-extension-mdx-md";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromark-extension-mdx-md/-/micromark-extension-mdx-md-0.1.1.tgz";
+ sha512 = "emlFQEyfx/2aPhwyEqeNDfKE6jPH1cvLTb5ANRo4qZBjaUObnzjLRdzK8RJ4Xc8+/dOmKN8TTRxFnOYF5/EAwQ==";
+ };
+ };
+ "micromark-extension-mdxjs-0.3.0" = {
+ name = "micromark-extension-mdxjs";
+ packageName = "micromark-extension-mdxjs";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromark-extension-mdxjs/-/micromark-extension-mdxjs-0.3.0.tgz";
+ sha512 = "NQuiYA0lw+eFDtSG4+c7ao3RG9dM4P0Kx/sn8OLyPhxtIc6k+9n14k5VfLxRKfAxYRTo8c5PLZPaRNmslGWxJw==";
+ };
+ };
+ "micromark-extension-mdxjs-esm-0.3.0" = {
+ name = "micromark-extension-mdxjs-esm";
+ packageName = "micromark-extension-mdxjs-esm";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-0.3.0.tgz";
+ sha512 = "ZkI/cneSGQFdmB3iOT34n9Zq0Gc6vknAd1o2G7SaiCUY5D9a5ZCvGP/vCjHmlB7f2Y4b4+O1YMLywxYmQeUFwQ==";
+ };
+ };
"micromatch-2.3.11" = {
name = "micromatch";
packageName = "micromatch";
@@ -37180,6 +37090,15 @@ let
sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==";
};
};
+ "micromist-1.1.0" = {
+ name = "micromist";
+ packageName = "micromist";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromist/-/micromist-1.1.0.tgz";
+ sha512 = "+CQ76pabE9egniSEdmDuH+j2cYyIBKP97kujG8ZLZyLCRq5ExwtIy4DPHPFrq4jVbhMRBnyjuH50KU9Ohs8QCg==";
+ };
+ };
"middleware-handler-0.2.0" = {
name = "middleware-handler";
packageName = "middleware-handler";
@@ -37279,6 +37198,15 @@ let
sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==";
};
};
+ "mime-db-1.43.0" = {
+ name = "mime-db";
+ packageName = "mime-db";
+ version = "1.43.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+ sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
+ };
+ };
"mime-db-1.44.0" = {
name = "mime-db";
packageName = "mime-db";
@@ -37306,6 +37234,15 @@ let
sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==";
};
};
+ "mime-types-2.1.26" = {
+ name = "mime-types";
+ packageName = "mime-types";
+ version = "2.1.26";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+ sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
+ };
+ };
"mime-types-2.1.27" = {
name = "mime-types";
packageName = "mime-types";
@@ -37828,13 +37765,13 @@ let
sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==";
};
};
- "mocha-8.3.1" = {
+ "mocha-8.3.2" = {
name = "mocha";
packageName = "mocha";
- version = "8.3.1";
+ version = "8.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/mocha/-/mocha-8.3.1.tgz";
- sha512 = "5SBMxANWqOv5bw3Hx+HVgaWlcWcFEQDUdaUAr1AUU+qwtx6cowhn7gEDT/DwQP7uYxnvShdUOVLbTYAHOEGfDQ==";
+ url = "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz";
+ sha512 = "UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg==";
};
};
"mock-require-3.0.3" = {
@@ -37900,13 +37837,13 @@ let
sha512 = "7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw==";
};
};
- "moize-6.0.0" = {
+ "moize-6.0.1" = {
name = "moize";
packageName = "moize";
- version = "6.0.0";
+ version = "6.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/moize/-/moize-6.0.0.tgz";
- sha512 = "/GXPWgxfgQAeM2S7IPh29MDbhK9ZF1YjzP6QRcJ1QcYrqehe6eFpAQZ88Xk/s4dy/wYhMY5axT1vaaWC+lllZA==";
+ url = "https://registry.npmjs.org/moize/-/moize-6.0.1.tgz";
+ sha512 = "Bl91P98A6Xba35mn9XoAW9DuGoQb3HyoY888TxrvQbMr9+1v3dzBzi9n4Guh5Lne8ENdqbXjQ0a8mf7UUvZ9wg==";
};
};
"mold-source-map-0.4.0" = {
@@ -38161,13 +38098,13 @@ let
sha1 = "dd3c50b26f059f25e7edee3644418358e2a9ad89";
};
};
- "msgpack5-3.6.0" = {
+ "msgpack5-3.6.1" = {
name = "msgpack5";
packageName = "msgpack5";
- version = "3.6.0";
+ version = "3.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz";
- sha512 = "6HuCZHA57WtNUzrKIvjJ8OMxigzveJ6D5i13y6TsgGu3X3zxABpuBvChpppOoGdB9SyWZcmqUs1fwUV/PpSQ7Q==";
+ url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.1.tgz";
+ sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg==";
};
};
"multer-1.4.2" = {
@@ -38638,6 +38575,15 @@ let
sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==";
};
};
+ "nanoid-3.1.22" = {
+ name = "nanoid";
+ packageName = "nanoid";
+ version = "3.1.22";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz";
+ sha512 = "/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==";
+ };
+ };
"nanolru-1.0.0" = {
name = "nanolru";
packageName = "nanolru";
@@ -39008,13 +38954,13 @@ let
sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==";
};
};
- "netlify-6.1.13" = {
+ "netlify-6.1.16" = {
name = "netlify";
packageName = "netlify";
- version = "6.1.13";
+ version = "6.1.16";
src = fetchurl {
- url = "https://registry.npmjs.org/netlify/-/netlify-6.1.13.tgz";
- sha512 = "B6NYBc7qXqtTyUIcWhA5hLi3TkV7AGwkyVJ7RGosZoqZuHOfilb+USplb9kEIX/bVRKG2Z07x6Efd+SvcKk01g==";
+ url = "https://registry.npmjs.org/netlify/-/netlify-6.1.16.tgz";
+ sha512 = "hRIUwdJAkFnQNY6H274Sa1xU4LnBkoMJdhRnxD3YQcdmdn8i1Mns54xweLY3+F0Pg9g9lLtmqsZcm68gG/Fxvw==";
};
};
"netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = {
@@ -39026,13 +38972,13 @@ let
sha512 = "5Rvi17CKgPpZTazEV2wkSj4IbS2zJpoKuytaYCyvemV/CMVeZUUPRwNPWm7+NjxObqJHgzUyi2FmWql8HfWhGA==";
};
};
- "netlify-redirect-parser-3.0.4" = {
+ "netlify-redirect-parser-3.0.7" = {
name = "netlify-redirect-parser";
packageName = "netlify-redirect-parser";
- version = "3.0.4";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.4.tgz";
- sha512 = "l5OJ3EBh9twiBbsHdAmufoAnkS5FRDbY67p3Q0ukDD94ZSC2esXiN3kZd5lMuHqcpOBJlmjrG/xSCWBjVTbe/g==";
+ url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.7.tgz";
+ sha512 = "/I4/5P8KhSVKxX3CdCscWBgxKBvsu4c7LTZtsNqdRwRaWq+pyQ5sZqC3CUtenIlhkTpqoDHPpriWZP4VzsNnKQ==";
};
};
"netlify-redirector-0.2.1" = {
@@ -39260,6 +39206,15 @@ let
sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==";
};
};
+ "node-addon-api-2.0.2" = {
+ name = "node-addon-api";
+ packageName = "node-addon-api";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz";
+ sha512 = "Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==";
+ };
+ };
"node-addon-api-3.1.0" = {
name = "node-addon-api";
packageName = "node-addon-api";
@@ -39314,6 +39269,15 @@ let
sha1 = "5f5665d93351335caabef8f1c554516cf5f1e4e5";
};
};
+ "node-downloader-helper-1.0.17" = {
+ name = "node-downloader-helper";
+ packageName = "node-downloader-helper";
+ version = "1.0.17";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.17.tgz";
+ sha512 = "EnaY0uBSdVo4kYfSmkDlTJG8GqmS8fbfoOau/OsTnikCwt9vsU0w8REVxwWbVz7DzNtHSEBKpU6jV1hmtlx0Dg==";
+ };
+ };
"node-emoji-1.10.0" = {
name = "node-emoji";
packageName = "node-emoji";
@@ -39522,13 +39486,13 @@ let
sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40";
};
};
- "node-notifier-8.0.1" = {
+ "node-notifier-8.0.2" = {
name = "node-notifier";
packageName = "node-notifier";
- version = "8.0.1";
+ version = "8.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz";
- sha512 = "BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==";
+ url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz";
+ sha512 = "oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==";
};
};
"node-notifier-9.0.0" = {
@@ -39540,6 +39504,15 @@ let
sha512 = "SkwNwGnMMlSPrcoeH4CSo9XyWe72acAHEJGDdPdB+CyBVHsIYaTQ4U/1wk3URsyzC75xZLg2vzU2YaALlqDF1Q==";
};
};
+ "node-notifier-9.0.1" = {
+ name = "node-notifier";
+ packageName = "node-notifier";
+ version = "9.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.1.tgz";
+ sha512 = "fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg==";
+ };
+ };
"node-persist-2.1.0" = {
name = "node-persist";
packageName = "node-persist";
@@ -39711,6 +39684,15 @@ let
sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
};
};
+ "node-version-alias-1.0.1" = {
+ name = "node-version-alias";
+ packageName = "node-version-alias";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-version-alias/-/node-version-alias-1.0.1.tgz";
+ sha512 = "E9EhoJkpIIZyYplB298W8ZfhcojQrnKnUPcaOgJqVqICUZwPZkuj10nTzEscwdziOOj545v4tGPvNBG3ieUbSw==";
+ };
+ };
"node-wsfederation-0.1.1" = {
name = "node-wsfederation";
packageName = "node-wsfederation";
@@ -39756,6 +39738,15 @@ let
sha512 = "VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ==";
};
};
+ "nofilter-2.0.3" = {
+ name = "nofilter";
+ packageName = "nofilter";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nofilter/-/nofilter-2.0.3.tgz";
+ sha512 = "FbuXC+lK+GU2+63D1kC1ETiZo+Z7SIi7B+mxKTCH1byrh6WFvfBCN/wpherFz0a0bjGd7EKTst/cz0yLeNngug==";
+ };
+ };
"nomnom-1.8.1" = {
name = "nomnom";
packageName = "nomnom";
@@ -39855,6 +39846,15 @@ let
sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==";
};
};
+ "normalize-node-version-10.0.0" = {
+ name = "normalize-node-version";
+ packageName = "normalize-node-version";
+ version = "10.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-node-version/-/normalize-node-version-10.0.0.tgz";
+ sha512 = "/gVbS/qAnowVxr2fJy3F0MxmCvx8QdXJDl8XUE7HT3vsDeDjQfZkX9OiPahF+51Hgy93cKG1hP6uyBjQsMCvWQ==";
+ };
+ };
"normalize-package-data-2.5.0" = {
name = "normalize-package-data";
packageName = "normalize-package-data";
@@ -39864,13 +39864,13 @@ let
sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
};
};
- "normalize-package-data-3.0.0" = {
+ "normalize-package-data-3.0.2" = {
name = "normalize-package-data";
packageName = "normalize-package-data";
- version = "3.0.0";
+ version = "3.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz";
- sha512 = "6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==";
+ url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz";
+ sha512 = "6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==";
};
};
"normalize-path-2.1.1" = {
@@ -40071,13 +40071,13 @@ let
sha512 = "/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig==";
};
};
- "npm-package-arg-8.1.1" = {
+ "npm-package-arg-8.1.2" = {
name = "npm-package-arg";
packageName = "npm-package-arg";
- version = "8.1.1";
+ version = "8.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz";
- sha512 = "CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==";
+ url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.2.tgz";
+ sha512 = "6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA==";
};
};
"npm-packlist-1.4.8" = {
@@ -40107,6 +40107,15 @@ let
sha512 = "ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==";
};
};
+ "npm-pick-manifest-6.1.1" = {
+ name = "npm-pick-manifest";
+ packageName = "npm-pick-manifest";
+ version = "6.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz";
+ sha512 = "dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==";
+ };
+ };
"npm-prefix-1.2.0" = {
name = "npm-prefix";
packageName = "npm-prefix";
@@ -40567,13 +40576,13 @@ let
sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w==";
};
};
- "object-treeify-1.1.31" = {
+ "object-treeify-1.1.33" = {
name = "object-treeify";
packageName = "object-treeify";
- version = "1.1.31";
+ version = "1.1.33";
src = fetchurl {
- url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.31.tgz";
- sha512 = "kt2UuyHDTH+J6w0pv2c+3uuEApGuwgfjWogbqPWAvk4nOM/T3No0SzDtp6CuJ/XBUy//nFNuerb8ms7CqjD9Tw==";
+ url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.33.tgz";
+ sha512 = "EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==";
};
};
"object-visit-1.0.1" = {
@@ -40621,15 +40630,6 @@ let
sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==";
};
};
- "object.fromentries-2.0.4" = {
- name = "object.fromentries";
- packageName = "object.fromentries";
- version = "2.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz";
- sha512 = "EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==";
- };
- };
"object.getownpropertydescriptors-2.1.2" = {
name = "object.getownpropertydescriptors";
packageName = "object.getownpropertydescriptors";
@@ -40747,13 +40747,13 @@ let
sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
};
};
- "office-ui-fabric-react-7.162.1" = {
+ "office-ui-fabric-react-7.165.1" = {
name = "office-ui-fabric-react";
packageName = "office-ui-fabric-react";
- version = "7.162.1";
+ version = "7.165.1";
src = fetchurl {
- url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.162.1.tgz";
- sha512 = "ZJrjJsvnpgNHXdi8uCBigkF436Bj2cLYC8XMngUBU6Ha+IefCgXUbsIQhlfeWpt++l/8/tAFmu8vUnVj+GlhCQ==";
+ url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.165.1.tgz";
+ sha512 = "a8H0KGwhfEps7v0Ia+kU9kQyRtj3qVMWbkDmMhZ2iTnPXcMs6gF1X+1x3xuMQblJXpp/fqyCLpuU1DUSOMbmhw==";
};
};
"omggif-1.0.10" = {
@@ -40927,13 +40927,13 @@ let
sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==";
};
};
- "oo-ascii-tree-1.24.0" = {
+ "oo-ascii-tree-1.26.0" = {
name = "oo-ascii-tree";
packageName = "oo-ascii-tree";
- version = "1.24.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.24.0.tgz";
- sha512 = "rJYspYyrr2lDCDnybz4/70eml5cen98r4u2uw8sGodROePXiKKE+2Al8tfiS6uYx7vUEozEHCLoNQ/2jpxa7gw==";
+ url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.26.0.tgz";
+ sha512 = "JcRUxvHG+QAheXnxx9cwtgDJY6aXc70UAvgoFxKtRz+KfWEU47z/X2HHb81O/aZ3mN4fRnnnnwQhaTUuQRw2Ag==";
};
};
"opal-runtime-1.0.11" = {
@@ -41305,15 +41305,6 @@ let
sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==";
};
};
- "optimism-0.10.3" = {
- name = "optimism";
- packageName = "optimism";
- version = "0.10.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/optimism/-/optimism-0.10.3.tgz";
- sha512 = "9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw==";
- };
- };
"optimist-0.2.8" = {
name = "optimist";
packageName = "optimist";
@@ -41485,6 +41476,15 @@ let
sha512 = "zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==";
};
};
+ "ora-5.4.0" = {
+ name = "ora";
+ packageName = "ora";
+ version = "5.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ora/-/ora-5.4.0.tgz";
+ sha512 = "1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==";
+ };
+ };
"ordered-read-streams-1.0.1" = {
name = "ordered-read-streams";
packageName = "ordered-read-streams";
@@ -41692,13 +41692,13 @@ let
sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
};
};
- "p-cancelable-2.0.0" = {
+ "p-cancelable-2.1.0" = {
name = "p-cancelable";
packageName = "p-cancelable";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz";
- sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==";
+ url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.0.tgz";
+ sha512 = "HAZyB3ZodPo+BDpb4/Iu7Jv4P6cSazBz9ZM0ChhEXp70scx834aWCEjQRwgt41UzzejUAPdbqqONfRWTPYrPAQ==";
};
};
"p-debounce-1.0.0" = {
@@ -41746,6 +41746,15 @@ let
sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==";
};
};
+ "p-every-2.0.0" = {
+ name = "p-every";
+ packageName = "p-every";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-every/-/p-every-2.0.0.tgz";
+ sha512 = "MCz9DqD5opPC48Zsd+BHm56O/HfhYIQQtupfDzhXoVgQdg/Ux4F8/JcdRuQ+arq7zD5fB6zP3axbH3d9Nr8dlw==";
+ };
+ };
"p-filter-2.1.0" = {
name = "p-filter";
packageName = "p-filter";
@@ -42169,13 +42178,13 @@ let
sha512 = "GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ==";
};
};
- "pacote-11.2.7" = {
+ "pacote-11.3.1" = {
name = "pacote";
packageName = "pacote";
- version = "11.2.7";
+ version = "11.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/pacote/-/pacote-11.2.7.tgz";
- sha512 = "ogxPor11v/rnU9ukwLlI2dPx22q9iob1+yZyqSwerKsOvBMhU9e+SJHtxY4y2N0MRH4/5jGsGiRLsZeJWyM4dQ==";
+ url = "https://registry.npmjs.org/pacote/-/pacote-11.3.1.tgz";
+ sha512 = "TymtwoAG12cczsJIrwI/euOQKtjrQHlD0k0oyt9QSmZGpqa+KdlxKdWR/YUjYizkixaVyztxt/Wsfo8bL3A6Fg==";
};
};
"pad-0.0.5" = {
@@ -42457,15 +42466,6 @@ let
sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
};
};
- "parse-json-5.0.1" = {
- name = "parse-json";
- packageName = "parse-json";
- version = "5.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz";
- sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==";
- };
- };
"parse-json-5.2.0" = {
name = "parse-json";
packageName = "parse-json";
@@ -42916,15 +42916,6 @@ let
sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==";
};
};
- "path-case-3.0.4" = {
- name = "path-case";
- packageName = "path-case";
- version = "3.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz";
- sha512 = "qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==";
- };
- };
"path-dirname-1.0.2" = {
name = "path-dirname";
packageName = "path-dirname";
@@ -43474,13 +43465,22 @@ let
sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
};
};
- "pino-6.7.0" = {
+ "pino-6.11.1" = {
name = "pino";
packageName = "pino";
- version = "6.7.0";
+ version = "6.11.1";
src = fetchurl {
- url = "https://registry.npmjs.org/pino/-/pino-6.7.0.tgz";
- sha512 = "vPXJ4P9rWCwzlTJt+f0Ni4THc3DWyt8iDDCO4edQ8narTu6hnpzdXu8FqeSJCGndl1W6lfbYQUQihUO54y66Lw==";
+ url = "https://registry.npmjs.org/pino/-/pino-6.11.1.tgz";
+ sha512 = "PoDR/4jCyaP1k2zhuQ4N0NuhaMtei+C9mUHBRRJQujexl/bq3JkeL2OC23ada6Np3zeUMHbO4TGzY2D/rwZX3w==";
+ };
+ };
+ "pino-6.9.0" = {
+ name = "pino";
+ packageName = "pino";
+ version = "6.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pino/-/pino-6.9.0.tgz";
+ sha512 = "9RrRJsKOsgj50oGoR/y4EEVyUjMb/eRu8y4hjwPqM6q214xsxSxY/IKB+aEEv0slqNd4U0RVRfivKfy83UxgUQ==";
};
};
"pino-std-serializers-2.5.0" = {
@@ -43492,6 +43492,15 @@ let
sha512 = "wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg==";
};
};
+ "pino-std-serializers-3.2.0" = {
+ name = "pino-std-serializers";
+ packageName = "pino-std-serializers";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-3.2.0.tgz";
+ sha512 = "EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg==";
+ };
+ };
"pipe-functions-1.3.0" = {
name = "pipe-functions";
packageName = "pipe-functions";
@@ -43943,15 +43952,6 @@ let
sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
};
};
- "postcss-8.1.10" = {
- name = "postcss";
- packageName = "postcss";
- version = "8.1.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz";
- sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==";
- };
- };
"postcss-8.2.7" = {
name = "postcss";
packageName = "postcss";
@@ -44132,15 +44132,6 @@ let
sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==";
};
};
- "postcss-modules-4.0.0" = {
- name = "postcss-modules";
- packageName = "postcss-modules";
- version = "4.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.0.0.tgz";
- sha512 = "ghS/ovDzDqARm4Zj6L2ntadjyQMoyJmi0JkLlYtH2QFLrvNlxH5OAVRPWPeKilB0pY7SbuhO173KOWkPAxRJcw==";
- };
- };
"postcss-modules-extract-imports-1.1.0" = {
name = "postcss-modules-extract-imports";
packageName = "postcss-modules-extract-imports";
@@ -44159,15 +44150,6 @@ let
sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==";
};
};
- "postcss-modules-extract-imports-3.0.0" = {
- name = "postcss-modules-extract-imports";
- packageName = "postcss-modules-extract-imports";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz";
- sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==";
- };
- };
"postcss-modules-local-by-default-1.2.0" = {
name = "postcss-modules-local-by-default";
packageName = "postcss-modules-local-by-default";
@@ -44186,15 +44168,6 @@ let
sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==";
};
};
- "postcss-modules-local-by-default-4.0.0" = {
- name = "postcss-modules-local-by-default";
- packageName = "postcss-modules-local-by-default";
- version = "4.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz";
- sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==";
- };
- };
"postcss-modules-scope-1.1.0" = {
name = "postcss-modules-scope";
packageName = "postcss-modules-scope";
@@ -44213,15 +44186,6 @@ let
sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==";
};
};
- "postcss-modules-scope-3.0.0" = {
- name = "postcss-modules-scope";
- packageName = "postcss-modules-scope";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz";
- sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==";
- };
- };
"postcss-modules-values-1.3.0" = {
name = "postcss-modules-values";
packageName = "postcss-modules-values";
@@ -44240,15 +44204,6 @@ let
sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==";
};
};
- "postcss-modules-values-4.0.0" = {
- name = "postcss-modules-values";
- packageName = "postcss-modules-values";
- version = "4.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz";
- sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==";
- };
- };
"postcss-normalize-charset-4.0.1" = {
name = "postcss-normalize-charset";
packageName = "postcss-normalize-charset";
@@ -44978,15 +44933,6 @@ let
sha512 = "abAuk3ZDyQvPLY6MygtwaDTUBIZ0C5wMMuX1jXa0svazV+keTwn7cPobRv4WYA9ctsDUztm/9CYu4y2TPL08xw==";
};
};
- "probe-image-size-5.0.0" = {
- name = "probe-image-size";
- packageName = "probe-image-size";
- version = "5.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-5.0.0.tgz";
- sha512 = "V6uBYw5eBc5UVIE7MUZD6Nxg0RYuGDWLDenEn0B1WC6PcTvn1xdQ6HLDDuznefsiExC6rNrCz7mFRBo0f3Xekg==";
- };
- };
"probe-image-size-6.0.0" = {
name = "probe-image-size";
packageName = "probe-image-size";
@@ -44996,6 +44942,15 @@ let
sha512 = "99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA==";
};
};
+ "probing-1.3.4" = {
+ name = "probing";
+ packageName = "probing";
+ version = "1.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/probing/-/probing-1.3.4.tgz";
+ sha512 = "SAEJtgxcCn47d18RRck6bkyqWeS3u2K0bG3aGIhb/X0MEZ6tUzjrvCQ/uzR7+Me5Kae7muap5hKAJZfh8dVQGw==";
+ };
+ };
"process-0.10.1" = {
name = "process";
packageName = "process";
@@ -45464,6 +45419,15 @@ let
sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==";
};
};
+ "psbt-1.1.8" = {
+ name = "psbt";
+ packageName = "psbt";
+ version = "1.1.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/psbt/-/psbt-1.1.8.tgz";
+ sha512 = "gnGq1ikGhvcsJij9BU2DZWBfXp09yRi/72+790hNwPaMPobgWrdlQ6sg6rNyDNYf+lwzYV8WIyHOLk2zH/7fGg==";
+ };
+ };
"pseudomap-1.0.2" = {
name = "pseudomap";
packageName = "pseudomap";
@@ -45608,15 +45572,6 @@ let
sha512 = "GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA==";
};
};
- "puka-1.0.1" = {
- name = "puka";
- packageName = "puka";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/puka/-/puka-1.0.1.tgz";
- sha512 = "ssjRZxBd7BT3dte1RR3VoeT2cT/ODH8x+h0rUF1rMqB0srHYf48stSDWfiYakTp5UBZMxroZhB2+ExLDHm7W3g==";
- };
- };
"pull-abortable-4.0.0" = {
name = "pull-abortable";
packageName = "pull-abortable";
@@ -45635,6 +45590,15 @@ let
sha1 = "146b36e3e043d7a666b59a14165fdd3bef3cf44c";
};
};
+ "pull-async-filter-1.0.0" = {
+ name = "pull-async-filter";
+ packageName = "pull-async-filter";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pull-async-filter/-/pull-async-filter-1.0.0.tgz";
+ sha1 = "ebc3617d9de2463908c89fd01671c727564d6831";
+ };
+ };
"pull-awaitable-1.0.0" = {
name = "pull-awaitable";
packageName = "pull-awaitable";
@@ -46247,13 +46211,13 @@ let
sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==";
};
};
- "puppeteer-7.1.0" = {
+ "puppeteer-8.0.0" = {
name = "puppeteer";
packageName = "puppeteer";
- version = "7.1.0";
+ version = "8.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/puppeteer/-/puppeteer-7.1.0.tgz";
- sha512 = "lqOLzqCKdh7yUAHvK6LxgOpQrL8Bv1/jvS8MLDXxcNms2rlM3E8p/Wlwc7efbRZ0twxTzUeqjN5EqrTwxOwc9g==";
+ url = "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz";
+ sha512 = "D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==";
};
};
"purgecss-2.3.0" = {
@@ -46301,13 +46265,13 @@ let
sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7";
};
};
- "pyright-1.1.118" = {
+ "pyright-1.1.125" = {
name = "pyright";
packageName = "pyright";
- version = "1.1.118";
+ version = "1.1.125";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.118.tgz";
- sha512 = "nUBcMqJqzcXbNmXPA3BLa5E77lG+APARhBbY0d4q2KGs3Od9FR6YTABK6sUq3O1rVQf4MScz8ji4KbEBsD8FNg==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.125.tgz";
+ sha512 = "MPaMGCnMR0i0VePXUPpXMHr23A2mkbW1Su+aTAWsqHho1rhQcxBtjeyhR0xqiwTxcC+c9eK9VwFHbd+OMGC6fQ==";
};
};
"q-0.9.7" = {
@@ -46436,6 +46400,15 @@ let
sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
};
};
+ "qs-6.10.1" = {
+ name = "qs";
+ packageName = "qs";
+ version = "6.10.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz";
+ sha512 = "M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==";
+ };
+ };
"qs-6.3.2" = {
name = "qs";
packageName = "qs";
@@ -46472,13 +46445,13 @@ let
sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
};
};
- "qs-6.9.6" = {
+ "qs-6.9.1" = {
name = "qs";
packageName = "qs";
- version = "6.9.6";
+ version = "6.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz";
- sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==";
+ url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz";
+ sha512 = "Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==";
};
};
"query-string-1.0.1" = {
@@ -46571,22 +46544,22 @@ let
sha512 = "iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==";
};
};
- "queue-microtask-1.2.2" = {
+ "queue-microtask-1.2.3" = {
name = "queue-microtask";
packageName = "queue-microtask";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz";
- sha512 = "dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==";
+ url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz";
+ sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==";
};
};
- "quick-format-unescaped-4.0.1" = {
+ "quick-format-unescaped-4.0.3" = {
name = "quick-format-unescaped";
packageName = "quick-format-unescaped";
- version = "4.0.1";
+ version = "4.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz";
- sha512 = "RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A==";
+ url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.3.tgz";
+ sha512 = "MaL/oqh02mhEo5m5J2rwsVL23Iw2PEaGVHgT2vFt8AAsr0lfvQA5dpXo9TPu0rz7tSBdUPgkbam0j/fj5ZM8yg==";
};
};
"quick-lru-1.1.0" = {
@@ -47021,13 +46994,13 @@ let
sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==";
};
};
- "react-dev-utils-11.0.3" = {
+ "react-dev-utils-11.0.4" = {
name = "react-dev-utils";
packageName = "react-dev-utils";
- version = "11.0.3";
+ version = "11.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.3.tgz";
- sha512 = "4lEA5gF4OHrcJLMUV1t+4XbNDiJbsAWCH5Z2uqlTqW6dD7Cf5nEASkeXrCI/Mz83sI2o527oBIFKVMXtRf1Vtg==";
+ url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz";
+ sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==";
};
};
"react-devtools-core-4.10.1" = {
@@ -47093,13 +47066,13 @@ let
sha512 = "X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==";
};
};
- "react-tabs-3.2.0" = {
+ "react-tabs-3.2.1" = {
name = "react-tabs";
packageName = "react-tabs";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/react-tabs/-/react-tabs-3.2.0.tgz";
- sha512 = "q7oNapNRoYTQq8gDhApXwdBheuuN5qQ4YvUaQUAkb6OSSttJulBAvxJ0FS6W5uojvMxbbIZKu1f2I+GXISoLjw==";
+ url = "https://registry.npmjs.org/react-tabs/-/react-tabs-3.2.1.tgz";
+ sha512 = "M7ERQvJgBVLTyojFmC3G4tpaJuMmUtsnYenVQm2oA1NjDrGXq1UuzHgxhVTDwimkJcKEbzgWCybXFSHQ/+2bsA==";
};
};
"read-1.0.7" = {
@@ -47453,6 +47426,15 @@ let
sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
};
};
+ "readdirp-3.6.0" = {
+ name = "readdirp";
+ packageName = "readdirp";
+ version = "3.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz";
+ sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==";
+ };
+ };
"readline-1.3.0" = {
name = "readline";
packageName = "readline";
@@ -47723,13 +47705,13 @@ let
sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
};
};
- "regenerator-runtime-0.13.7" = {
+ "regenerator-runtime-0.13.8" = {
name = "regenerator-runtime";
packageName = "regenerator-runtime";
- version = "0.13.7";
+ version = "0.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz";
- sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==";
+ url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.8.tgz";
+ sha512 = "o/ASGwgZ6UiVjspr4YnzHKF1NbBdX+mCPkSeymofk/d7I+csCYn3ZgZMMVtXeecpT8DBiI2nAlYkHd+xNCqu4A==";
};
};
"regenerator-transform-0.14.5" = {
@@ -47858,13 +47840,13 @@ let
sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
};
};
- "regjsparser-0.6.7" = {
+ "regjsparser-0.6.9" = {
name = "regjsparser";
packageName = "regjsparser";
- version = "0.6.7";
+ version = "0.6.9";
src = fetchurl {
- url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz";
- sha512 = "ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==";
+ url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz";
+ sha512 = "ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==";
};
};
"rehype-parse-7.0.1" = {
@@ -48002,13 +47984,13 @@ let
sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92";
};
};
- "remark-mdx-2.0.0-next.8" = {
+ "remark-mdx-2.0.0-next.9" = {
name = "remark-mdx";
packageName = "remark-mdx";
- version = "2.0.0-next.8";
+ version = "2.0.0-next.9";
src = fetchurl {
- url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.8.tgz";
- sha512 = "mjP0yo6BgjYrx5a+gKWYRFWbGnRiWi4Fdf17xGCr9VkSMnG4Dyo06spqbaLfHwl0KkQ/RQZlR2sn1mKnYduJdw==";
+ url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.9.tgz";
+ sha512 = "I5dCKP5VE18SMd5ycIeeEk8Hl6oaldUY6PIvjrfm65l7d0QRnLqknb62O2g3QEmOxCswcHTtwITtz6rfUIVs+A==";
};
};
"remark-message-control-6.0.0" = {
@@ -48074,15 +48056,6 @@ let
sha512 = "xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==";
};
};
- "remark-stringify-8.1.1" = {
- name = "remark-stringify";
- packageName = "remark-stringify";
- version = "8.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz";
- sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==";
- };
- };
"remark-stringify-9.0.1" = {
name = "remark-stringify";
packageName = "remark-stringify";
@@ -48875,13 +48848,13 @@ let
sha1 = "eeeb88342fadbe8027c0f36ada921a13e6f96206";
};
};
- "rfdc-1.2.0" = {
+ "rfdc-1.3.0" = {
name = "rfdc";
packageName = "rfdc";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/rfdc/-/rfdc-1.2.0.tgz";
- sha512 = "ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==";
+ url = "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz";
+ sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==";
};
};
"rgb-regex-1.0.1" = {
@@ -49028,13 +49001,13 @@ let
sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
};
};
- "rollup-2.40.0" = {
+ "rollup-2.42.4" = {
name = "rollup";
packageName = "rollup";
- version = "2.40.0";
+ version = "2.42.4";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.40.0.tgz";
- sha512 = "WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.42.4.tgz";
+ sha512 = "Zqv3EvNfcllBHyyEUM754npqsZw82VIjK34cDQMwrQ1d6aqxzeYu5yFb7smGkPU4C1Bj7HupIMeT6WU7uIdnMw==";
};
};
"rollup-plugin-babel-4.4.0" = {
@@ -49442,6 +49415,15 @@ let
sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
};
};
+ "safe-compare-1.1.4" = {
+ name = "safe-compare";
+ packageName = "safe-compare";
+ version = "1.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-compare/-/safe-compare-1.1.4.tgz";
+ sha512 = "b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ==";
+ };
+ };
"safe-join-0.1.3" = {
name = "safe-join";
packageName = "safe-join";
@@ -49667,6 +49649,15 @@ let
sha1 = "033d60a3ad20ecf2e00940d14f97823465774335";
};
};
+ "secp256k1-4.0.2" = {
+ name = "secp256k1";
+ packageName = "secp256k1";
+ version = "4.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz";
+ sha512 = "UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==";
+ };
+ };
"secret-handshake-1.1.20" = {
name = "secret-handshake";
packageName = "secret-handshake";
@@ -49892,6 +49883,15 @@ let
sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
};
};
+ "semver-7.3.5" = {
+ name = "semver";
+ packageName = "semver";
+ version = "7.3.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz";
+ sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==";
+ };
+ };
"semver-compare-1.0.0" = {
name = "semver-compare";
packageName = "semver-compare";
@@ -50000,15 +50000,6 @@ let
sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
};
};
- "sentence-case-3.0.4" = {
- name = "sentence-case";
- packageName = "sentence-case";
- version = "3.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz";
- sha512 = "8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==";
- };
- };
"sentence-splitter-2.3.2" = {
name = "sentence-splitter";
packageName = "sentence-splitter";
@@ -50522,13 +50513,13 @@ let
sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
};
};
- "sign-addon-3.1.0" = {
+ "sign-addon-3.3.0" = {
name = "sign-addon";
packageName = "sign-addon";
- version = "3.1.0";
+ version = "3.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.1.0.tgz";
- sha512 = "zZ7nKc5/3QWM3skYBosGDvYQf2jkKhW2u8BELrZoN1wgCSOnwsV9T47Vx9uaNbA3CyZ+V9XSA0tDVHoV1QfVPw==";
+ url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.3.0.tgz";
+ sha512 = "TZNZfxRb5jnNcGI8gbyGvaI3kLw+M0O9p7yas2eTu3WpLZ66Wy+FAhYOccgpeQQAcKtwf4WaSnfPKYTBBWWiDQ==";
};
};
"signal-exit-3.0.3" = {
@@ -50612,13 +50603,13 @@ let
sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg==";
};
};
- "simple-git-2.36.1" = {
+ "simple-git-2.37.0" = {
name = "simple-git";
packageName = "simple-git";
- version = "2.36.1";
+ version = "2.37.0";
src = fetchurl {
- url = "https://registry.npmjs.org/simple-git/-/simple-git-2.36.1.tgz";
- sha512 = "bN18Ea/4IJgqgbZyE9VpVEUkAu9vyP0VWP7acP0CRC1p/N80GGJ0HhIVeFJsm8TdJLBowiJpdLesQuAZ5TFSKw==";
+ url = "https://registry.npmjs.org/simple-git/-/simple-git-2.37.0.tgz";
+ sha512 = "ZK6qRnP+Xa2v23UEZDNHUfzswsuNCDHOQpWZRkpqNaXn7V5wVBBx3zRJLji3pROJGzrzA7mXwY7preL5EKuAaQ==";
};
};
"simple-markdown-0.4.4" = {
@@ -50639,13 +50630,13 @@ let
sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
};
};
- "simple-peer-9.9.3" = {
+ "simple-peer-9.10.0" = {
name = "simple-peer";
packageName = "simple-peer";
- version = "9.9.3";
+ version = "9.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.9.3.tgz";
- sha512 = "T3wuv0UqBpDTV0x0pJPPsz4thy0tC0fTOHE4g9+AF43RUxxT+MWeXVtdQcK5Xuzv/XTVrB2NrGzdfO1IFBqOkw==";
+ url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.10.0.tgz";
+ sha512 = "sKrKtca1UdmwdZIbvuT3iEL05tDGt/xdLP6+ej8rh1ADgtDk44yLaEZjIyPJ6c34zsSih46Ou7zUIT7e4hPK7g==";
};
};
"simple-plist-1.1.1" = {
@@ -50747,6 +50738,15 @@ let
sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==";
};
};
+ "sjcl-1.0.8" = {
+ name = "sjcl";
+ packageName = "sjcl";
+ version = "1.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sjcl/-/sjcl-1.0.8.tgz";
+ sha512 = "LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==";
+ };
+ };
"skin-tone-1.0.0" = {
name = "skin-tone";
packageName = "skin-tone";
@@ -50882,13 +50882,13 @@ let
sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a";
};
};
- "slugify-1.4.7" = {
+ "slugify-1.5.0" = {
name = "slugify";
packageName = "slugify";
- version = "1.4.7";
+ version = "1.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/slugify/-/slugify-1.4.7.tgz";
- sha512 = "tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg==";
+ url = "https://registry.npmjs.org/slugify/-/slugify-1.5.0.tgz";
+ sha512 = "Q2UPZ2udzquy1ElHfOLILMBMqBEXkiD3wE75qtBvV+FsDdZZjUqPZ44vqLTejAVq+wLLHacOMcENnP8+ZbzmIA==";
};
};
"smart-buffer-4.1.0" = {
@@ -51026,13 +51026,13 @@ let
sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ==";
};
};
- "snyk-docker-plugin-4.17.3" = {
+ "snyk-docker-plugin-4.19.3" = {
name = "snyk-docker-plugin";
packageName = "snyk-docker-plugin";
- version = "4.17.3";
+ version = "4.19.3";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.17.3.tgz";
- sha512 = "Egqkad3YTP41Dlu19/3A2gQfqf4nxa7C36USQGSXIC5JodPvptObiSLmyQssjxVJ7iCRpw6IxytZVf412KKJCg==";
+ url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz";
+ sha512 = "5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg==";
};
};
"snyk-go-parser-1.4.1" = {
@@ -51143,13 +51143,13 @@ let
sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg==";
};
};
- "snyk-python-plugin-1.19.5" = {
+ "snyk-python-plugin-1.19.7" = {
name = "snyk-python-plugin";
packageName = "snyk-python-plugin";
- version = "1.19.5";
+ version = "1.19.7";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.5.tgz";
- sha512 = "wgfhloo6PZ8V+6eIUU7pLcVfHx4yo5LQPPQX6rLfTSZ6p9uRYazIvw/NoUmIjb8Qrn9GdD3zUJY9/83TyTgKLw==";
+ url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz";
+ sha512 = "twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A==";
};
};
"snyk-resolve-1.1.0" = {
@@ -51287,6 +51287,15 @@ let
sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==";
};
};
+ "socket.io-adapter-2.2.0" = {
+ name = "socket.io-adapter";
+ packageName = "socket.io-adapter";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.2.0.tgz";
+ sha512 = "rG49L+FwaVEwuAdeBRq49M97YI3ElVabJPzvHT9S6a2CWhDKnjSFasvwAwSYPRhQzfn4NtDIbCaGYgOCOU/rlg==";
+ };
+ };
"socket.io-client-1.0.6" = {
name = "socket.io-client";
packageName = "socket.io-client";
@@ -51404,13 +51413,13 @@ let
sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==";
};
};
- "socks-2.5.1" = {
+ "socks-2.6.0" = {
name = "socks";
packageName = "socks";
- version = "2.5.1";
+ version = "2.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/socks/-/socks-2.5.1.tgz";
- sha512 = "oZCsJJxapULAYJaEYBSzMcz8m3jqgGrHaGhkmU/o/PQfFWYWxkAaA0UMGImb6s6tEXfKi959X6VJjMMQ3P6TTQ==";
+ url = "https://registry.npmjs.org/socks/-/socks-2.6.0.tgz";
+ sha512 = "mNmr9owlinMplev0Wd7UHFlqI4ofnBnNzFuzrm63PPaHgbkqCFe4T5LzwKmtQ/f2tX0NTpcdVLyD/FHxFBstYw==";
};
};
"socks-proxy-agent-4.0.2" = {
@@ -51530,13 +51539,13 @@ let
sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg==";
};
};
- "sonic-boom-1.3.2" = {
+ "sonic-boom-1.4.0" = {
name = "sonic-boom";
packageName = "sonic-boom";
- version = "1.3.2";
+ version = "1.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.3.2.tgz";
- sha512 = "/B4tAuK2+hIlR94GhhWU1mJHWk5lt0CEuBvG0kvk1qIAzQc4iB1TieMio8DCZxY+Y7tsuzOxSUDOGmaUm3vXMg==";
+ url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.4.0.tgz";
+ sha512 = "1xUAszhQBOrjk7uisbStQZYkZxD3vkYlCUw5qzOblWQ1ILN5v0dVPAs+QPgszzoPmbdWx6jyT9XiLJ95JdlLiQ==";
};
};
"sorcery-0.10.0" = {
@@ -51989,13 +51998,13 @@ let
sha1 = "6c83aff3692fa61256e0cd197e05e9de157691a6";
};
};
- "split-lines-2.0.0" = {
+ "split-lines-2.1.0" = {
name = "split-lines";
packageName = "split-lines";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/split-lines/-/split-lines-2.0.0.tgz";
- sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA==";
+ url = "https://registry.npmjs.org/split-lines/-/split-lines-2.1.0.tgz";
+ sha512 = "8dv+1zKgTpfTkOy8XZLFyWrfxO0NV/bj/3EaQ+hBrBxGv2DwiroljPjU8NlCr+59nLnsVm9WYT7lXKwe4TC6bw==";
};
};
"split-on-first-1.1.0" = {
@@ -52214,13 +52223,13 @@ let
sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung==";
};
};
- "ssb-db2-1.18.2" = {
+ "ssb-db2-1.18.6" = {
name = "ssb-db2";
packageName = "ssb-db2";
- version = "1.18.2";
+ version = "1.18.6";
src = fetchurl {
- url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.18.2.tgz";
- sha512 = "0DDsZJNBDSUatlJD6oAwByBjTF9vzNHF3T6lcIY1AvuDfTXcLBVMwijCn2phPTda+0xzTVJiS8X4MuhkFrCtww==";
+ url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.18.6.tgz";
+ sha512 = "Z6dkEhpwJbKWV5v28s2sFj2Nu8FAF/ANX24lrTlpr1ltLAb4Us1mtp1y6cZQhlXlmy+ILxDuhs51/hhbjKfpmA==";
};
};
"ssb-ebt-5.6.7" = {
@@ -52295,13 +52304,13 @@ let
sha512 = "FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ==";
};
};
- "ssb-keys-8.0.2" = {
+ "ssb-keys-8.1.0" = {
name = "ssb-keys";
packageName = "ssb-keys";
- version = "8.0.2";
+ version = "8.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.0.2.tgz";
- sha512 = "u2U9t5YLbFShKQzr+ayMx9cYNvUJzDeOScodMwfP5zM3+/1AStvc5W91knZGllGwsmGjNC57KW+whRun+H/dBQ==";
+ url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.1.0.tgz";
+ sha512 = "RC2gFMptimj2QZZESOViKVhzqgXCnfW3IqUeKLQ/E8nnTdODuCVa3soLYu4KUF8nGIzFIfdKq7L2Teg32kD85w==";
};
};
"ssb-links-3.0.10" = {
@@ -52646,15 +52655,6 @@ let
sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
};
};
- "stack-trace-0.0.9" = {
- name = "stack-trace";
- packageName = "stack-trace";
- version = "0.0.9";
- src = fetchurl {
- url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
- sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
- };
- };
"stack-utils-2.0.3" = {
name = "stack-utils";
packageName = "stack-utils";
@@ -52754,6 +52754,15 @@ let
sha1 = "ec7b4750ff03ab24a64dd9b357a78316bead78aa";
};
};
+ "stats-lite-2.2.0" = {
+ name = "stats-lite";
+ packageName = "stats-lite";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stats-lite/-/stats-lite-2.2.0.tgz";
+ sha512 = "/Kz55rgUIv2KP2MKphwYT/NCuSfAlbbMRv2ZWw7wyXayu230zdtzhxxuXXcvsc6EmmhS8bSJl3uS1wmMHFumbA==";
+ };
+ };
"statsd-client-0.4.5" = {
name = "statsd-client";
packageName = "statsd-client";
@@ -53195,15 +53204,6 @@ let
sha512 = "78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==";
};
};
- "string-hash-1.1.3" = {
- name = "string-hash";
- packageName = "string-hash";
- version = "1.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz";
- sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b";
- };
- };
"string-kit-0.11.10" = {
name = "string-kit";
packageName = "string-kit";
@@ -53312,15 +53312,6 @@ let
sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==";
};
};
- "string.prototype.matchall-4.0.4" = {
- name = "string.prototype.matchall";
- packageName = "string.prototype.matchall";
- version = "4.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz";
- sha512 = "pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==";
- };
- };
"string.prototype.repeat-0.2.0" = {
name = "string.prototype.repeat";
packageName = "string.prototype.repeat";
@@ -54131,13 +54122,13 @@ let
sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA==";
};
};
- "svelte2tsx-0.1.179" = {
+ "svelte2tsx-0.1.184" = {
name = "svelte2tsx";
packageName = "svelte2tsx";
- version = "0.1.179";
+ version = "0.1.184";
src = fetchurl {
- url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.179.tgz";
- sha512 = "tfSRUuUziFPcD2w6fIfu9ybpkV2M7HQgmcelcdCC0bKVqR+pm6kdmIyo6L5kwR3IRjhq03DekkpVer1uXxTZ9A==";
+ url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.184.tgz";
+ sha512 = "VhmzqF8p5LL390td9mngJ2l1BrlZCY5/4SgYu9NxgYWLo54gyamrC2VNe+y5ZxAC59oxjw6byKbPlIFx0acXjg==";
};
};
"sver-compat-1.5.0" = {
@@ -54266,13 +54257,13 @@ let
sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw==";
};
};
- "swagger-ui-dist-3.44.1" = {
+ "swagger-ui-dist-3.45.1" = {
name = "swagger-ui-dist";
packageName = "swagger-ui-dist";
- version = "3.44.1";
+ version = "3.45.1";
src = fetchurl {
- url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.44.1.tgz";
- sha512 = "N0u+aN55bp53RRwi/wFbEbkQxcHqZ445ShZR/Ct1Jg+XCMxYtocrsGavh7kdNKw5+6Rs4QDD6GzUMiT28Z1u3Q==";
+ url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.45.1.tgz";
+ sha512 = "QWotWWYkgSdPtI6HW12q4Ua5zxIhhvnYvx9iZKtDbZuVvJSTnMIzaHrE6KJVe/8plWh7Wpd/qqeBfpOxF8g1/g==";
};
};
"swagger2openapi-6.2.3" = {
@@ -54392,13 +54383,13 @@ let
sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
};
};
- "systeminformation-4.34.15" = {
+ "systeminformation-4.34.19" = {
name = "systeminformation";
packageName = "systeminformation";
- version = "4.34.15";
+ version = "4.34.19";
src = fetchurl {
- url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.15.tgz";
- sha512 = "GRm0ntHg/MTISxZSu7r0T8reU1LLXUZxMcuDnqCcxIP0V+vjrt7SsiTWKrlsiL/DnThgUQHo1PT7VlZ5aKxdlQ==";
+ url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.19.tgz";
+ sha512 = "ssUYQ0s1FFeb8EGtyCX/41cC/XaF84gbNAUfaUTziibx+xCAaR0zrOy0yZlnUrsWDQ+snp/Utl8cx8IdtrevrA==";
};
};
"table-3.8.3" = {
@@ -54464,6 +54455,15 @@ let
sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7";
};
};
+ "tabtab-2.2.2" = {
+ name = "tabtab";
+ packageName = "tabtab";
+ version = "2.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tabtab/-/tabtab-2.2.2.tgz";
+ sha1 = "7a047f143b010b4cbd31f857e82961512cbf4e14";
+ };
+ };
"tabtab-3.0.2" = {
name = "tabtab";
packageName = "tabtab";
@@ -54717,6 +54717,15 @@ let
sha512 = "va4VlrKWp64JrowFoZX/NPzzA6q38kvaIukVXOWFO1V+jR1G8+hCfgJy4TX8Z3rwLJzwaBEet1QhikHDRZWl3A==";
};
};
+ "telegraf-4.1.2" = {
+ name = "telegraf";
+ packageName = "telegraf";
+ version = "4.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/telegraf/-/telegraf-4.1.2.tgz";
+ sha512 = "YZljmryOhcZgrRWU28AV7UhZ3y+jKRwPwB49PSDDmW7tKtQHrSLBkW0pCoLniDlQVz+ICBGCWXZlHfqDkQ2iNQ==";
+ };
+ };
"telegram-typings-3.6.1" = {
name = "telegram-typings";
packageName = "telegram-typings";
@@ -54906,13 +54915,13 @@ let
sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
};
};
- "terser-5.6.0" = {
+ "terser-5.6.1" = {
name = "terser";
packageName = "terser";
- version = "5.6.0";
+ version = "5.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/terser/-/terser-5.6.0.tgz";
- sha512 = "vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA==";
+ url = "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz";
+ sha512 = "yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==";
};
};
"terser-webpack-plugin-1.4.5" = {
@@ -56013,15 +56022,6 @@ let
sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9";
};
};
- "traverse-0.4.6" = {
- name = "traverse";
- packageName = "traverse";
- version = "0.4.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/traverse/-/traverse-0.4.6.tgz";
- sha1 = "d04b2280e4c792a5815429ef7b8b60c64c9ccc34";
- };
- };
"traverse-0.6.6" = {
name = "traverse";
packageName = "traverse";
@@ -56193,15 +56193,6 @@ let
sha512 = "ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA==";
};
};
- "ts-invariant-0.3.3" = {
- name = "ts-invariant";
- packageName = "ts-invariant";
- version = "0.3.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.3.tgz";
- sha512 = "UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ==";
- };
- };
"ts-invariant-0.4.4" = {
name = "ts-invariant";
packageName = "ts-invariant";
@@ -56238,15 +56229,6 @@ let
sha512 = "XvB+OdKSJ708Dmf9ore4Uf/q62AYDTzFcAdxc8KNML1mmAWywRFVt/dn1KYJH8Agt5UJNujfM3znU5PxgAzA2w==";
};
};
- "ts-node-8.10.2" = {
- name = "ts-node";
- packageName = "ts-node";
- version = "8.10.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz";
- sha512 = "ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==";
- };
- };
"ts-pnp-1.2.0" = {
name = "ts-pnp";
packageName = "ts-pnp";
@@ -56256,15 +56238,6 @@ let
sha512 = "csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==";
};
};
- "ts-process-promises-1.0.2" = {
- name = "ts-process-promises";
- packageName = "ts-process-promises";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz";
- sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
- };
- };
"tsconfig-paths-3.9.0" = {
name = "tsconfig-paths";
packageName = "tsconfig-paths";
@@ -56382,15 +56355,6 @@ let
sha512 = "+bGy9iDAqg3WSfc2ZrprToSPJhZjqy7vUv9wupQzsiv+BVPVx1T2a6G4T0290SpQj+56Toaw9BiLO5j5Bd7QzA==";
};
};
- "tty-1.0.1" = {
- name = "tty";
- packageName = "tty";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/tty/-/tty-1.0.1.tgz";
- sha1 = "e4409ac98b0dd1c50b59ff38e86eac3f0764ee45";
- };
- };
"tty-browserify-0.0.0" = {
name = "tty-browserify";
packageName = "tty-browserify";
@@ -56508,6 +56472,15 @@ let
sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25";
};
};
+ "tweetnacl-util-0.15.1" = {
+ name = "tweetnacl-util";
+ packageName = "tweetnacl-util";
+ version = "0.15.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz";
+ sha512 = "RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==";
+ };
+ };
"tweetsodium-0.0.5" = {
name = "tweetsodium";
packageName = "tweetsodium";
@@ -56553,13 +56526,13 @@ let
sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
};
};
- "type-2.3.0" = {
+ "type-2.5.0" = {
name = "type";
packageName = "type";
- version = "2.3.0";
+ version = "2.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/type/-/type-2.3.0.tgz";
- sha512 = "rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg==";
+ url = "https://registry.npmjs.org/type/-/type-2.5.0.tgz";
+ sha512 = "180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==";
};
};
"type-check-0.3.2" = {
@@ -56598,15 +56571,6 @@ let
sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw==";
};
};
- "type-fest-0.11.0" = {
- name = "type-fest";
- packageName = "type-fest";
- version = "0.11.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz";
- sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==";
- };
- };
"type-fest-0.12.0" = {
name = "type-fest";
packageName = "type-fest";
@@ -56661,6 +56625,15 @@ let
sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==";
};
};
+ "type-fest-0.21.3" = {
+ name = "type-fest";
+ packageName = "type-fest";
+ version = "0.21.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz";
+ sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==";
+ };
+ };
"type-fest-0.3.1" = {
name = "type-fest";
packageName = "type-fest";
@@ -56769,6 +56742,15 @@ let
sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==";
};
};
+ "typegram-3.2.3" = {
+ name = "typegram";
+ packageName = "typegram";
+ version = "3.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typegram/-/typegram-3.2.3.tgz";
+ sha512 = "zlkY7vNTLcwQhLUyYXAUzRelzH752LBFl8m4u04d5g5P7lM9bGegeIRwzd3mVCHJH6R3s48pKeFTVSdVlN+omg==";
+ };
+ };
"typescript-2.9.2" = {
name = "typescript";
packageName = "typescript";
@@ -56895,13 +56877,13 @@ let
sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==";
};
};
- "ua-parser-js-0.7.24" = {
+ "ua-parser-js-0.7.25" = {
name = "ua-parser-js";
packageName = "ua-parser-js";
- version = "0.7.24";
+ version = "0.7.25";
src = fetchurl {
- url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.24.tgz";
- sha512 = "yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw==";
+ url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.25.tgz";
+ sha512 = "8NFExdfI24Ny8R3Vc6+uUytP/I7dpqk3JERlvxPWlrtx5YboqCgxAXYKPAifbPLV2zKbgmmPL53ufW7mUC/VOQ==";
};
};
"uc.micro-1.0.6" = {
@@ -56931,13 +56913,13 @@ let
sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
};
};
- "uglify-js-3.13.0" = {
+ "uglify-js-3.13.2" = {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.13.0";
+ version = "3.13.2";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.0.tgz";
- sha512 = "TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.2.tgz";
+ sha512 = "SbMu4D2Vo95LMC/MetNaso1194M1htEA+JrqE9Hk+G2DhI+itfS9TRu9ZKeCahLDNa/J3n4MqUJ/fOHMzQpRWw==";
};
};
"uglify-js-3.4.10" = {
@@ -57138,13 +57120,13 @@ let
sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==";
};
};
- "underscore-1.12.0" = {
+ "underscore-1.12.1" = {
name = "underscore";
packageName = "underscore";
- version = "1.12.0";
+ version = "1.12.1";
src = fetchurl {
- url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
- sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
+ url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz";
+ sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==";
};
};
"underscore-1.2.1" = {
@@ -57597,6 +57579,15 @@ let
sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==";
};
};
+ "unist-util-remove-position-3.0.0" = {
+ name = "unist-util-remove-position";
+ packageName = "unist-util-remove-position";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-3.0.0.tgz";
+ sha512 = "17kIOuolVuK16LMb9KyMJlqdfCtlfQY5FjY3Sdo9iC7F5wqdXhNjMq0PBvMpkVNNnAmHxXssUW+rZ9T2zbP0Rg==";
+ };
+ };
"unist-util-stringify-position-1.1.2" = {
name = "unist-util-stringify-position";
packageName = "unist-util-stringify-position";
@@ -57948,15 +57939,6 @@ let
sha512 = "Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==";
};
};
- "update-notifier-5.0.0" = {
- name = "update-notifier";
- packageName = "update-notifier";
- version = "5.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/update-notifier/-/update-notifier-5.0.0.tgz";
- sha512 = "8tqsiVrMv7aZsKNSjqA6DdBLKJpZG1hRpkj1RbOJu1PgyP69OX+EInAnP1EK/ShX5YdPFgwWdk19oquZ0HTM8g==";
- };
- };
"update-notifier-5.1.0" = {
name = "update-notifier";
packageName = "update-notifier";
@@ -57993,15 +57975,6 @@ let
sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598";
};
};
- "upper-case-2.0.2" = {
- name = "upper-case";
- packageName = "upper-case";
- version = "2.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz";
- sha512 = "KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==";
- };
- };
"upper-case-first-1.1.2" = {
name = "upper-case-first";
packageName = "upper-case-first";
@@ -58011,15 +57984,6 @@ let
sha1 = "5d79bedcff14419518fd2edb0a0507c9b6859115";
};
};
- "upper-case-first-2.0.2" = {
- name = "upper-case-first";
- packageName = "upper-case-first";
- version = "2.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz";
- sha512 = "514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==";
- };
- };
"uri-js-3.0.2" = {
name = "uri-js";
packageName = "uri-js";
@@ -58786,13 +58750,13 @@ let
sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b";
};
};
- "vega-5.19.1" = {
+ "vega-5.20.0" = {
name = "vega";
packageName = "vega";
- version = "5.19.1";
+ version = "5.20.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vega/-/vega-5.19.1.tgz";
- sha512 = "UE6/c9q9kzuz4HULFuU9HscBASoZa+zcXqGKdbQP545Nwmhd078QpcH+wZsq9lYfiTxmFtzLK/a0OH0zhkghvA==";
+ url = "https://registry.npmjs.org/vega/-/vega-5.20.0.tgz";
+ sha512 = "L2hDaTH2gz9DFbu7l1B8fR637HzctViuosFCo/Db5aBe93fCJ/w/oJu+vQNfQELzfm9sntkS/+A4u+39xrDCNA==";
};
};
"vega-canvas-1.2.6" = {
@@ -58957,13 +58921,13 @@ let
sha512 = "yE0to0prA9E5PBJ/XP77TO0BMkzyUVyt7TH5PAwj+CZT7PMsMO6ozihelRhoIiVcP0Ae/ByCEQBUQkzN5zJ0ZA==";
};
};
- "vega-scenegraph-4.9.3" = {
+ "vega-scenegraph-4.9.4" = {
name = "vega-scenegraph";
packageName = "vega-scenegraph";
- version = "4.9.3";
+ version = "4.9.4";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.3.tgz";
- sha512 = "lBvqLbXqrqRCTGJmSgzZC/tLR/o+TXfakbdhDzNdpgTavTaQ65S/67Gpj5hPpi77DvsfZUIY9lCEeO37aJhy0Q==";
+ url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.4.tgz";
+ sha512 = "QaegQzbFE2yhYLNWAmHwAuguW3yTtQrmwvfxYT8tk0g+KKodrQ5WSmNrphWXhqwtsgVSvtdZkfp2IPeumcOQJg==";
};
};
"vega-selections-5.3.0" = {
@@ -59002,31 +58966,31 @@ let
sha512 = "PdqQd5oPlRyD405M2w+Sz9Bo+i7Rwi8o03SVK7RaeQsJC2FffKGJ6acIaSEgOq+yD1Q2k/1SePmCXcmLUlIiEA==";
};
};
- "vega-typings-0.19.2" = {
+ "vega-typings-0.20.0" = {
name = "vega-typings";
packageName = "vega-typings";
- version = "0.19.2";
+ version = "0.20.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.19.2.tgz";
- sha512 = "YU/S9rDk4d+t4+4eTa9fzuw87PMNteeVtpcL51kUO8H7HvGaoW7ll8RHKLkR0NYBEGPRoFDKUxnoyMvhgjsdYw==";
+ url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.20.0.tgz";
+ sha512 = "S+HIRN/3WYiS5zrQjJ4FDEOlvFVHLxPXMJerrnN3YZ6bxCDYo7tEvQUUuByGZ3d19GuKjgejczWS7XHvF3WjDw==";
};
};
- "vega-util-1.16.0" = {
+ "vega-util-1.16.1" = {
name = "vega-util";
packageName = "vega-util";
- version = "1.16.0";
+ version = "1.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-util/-/vega-util-1.16.0.tgz";
- sha512 = "6mmz6mI+oU4zDMeKjgvE2Fjz0Oh6zo6WGATcvCfxH2gXBzhBHmy5d25uW5Zjnkc6QBXSWPLV9Xa6SiqMsrsKog==";
+ url = "https://registry.npmjs.org/vega-util/-/vega-util-1.16.1.tgz";
+ sha512 = "FdgD72fmZMPJE99FxvFXth0IL4BbLA93WmBg/lvcJmfkK4Uf90WIlvGwaIUdSePIsdpkZjBPyQcHMQ8OcS8Smg==";
};
};
- "vega-view-5.9.2" = {
+ "vega-view-5.10.0" = {
name = "vega-view";
packageName = "vega-view";
- version = "5.9.2";
+ version = "5.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-view/-/vega-view-5.9.2.tgz";
- sha512 = "XAwKWyVjLClR3aCbTLCWdZj7aZozOULNg7078GxJIgVcBJOENCAidceI/H7JieyUZ96p3AiEHLQdWr167InBpg==";
+ url = "https://registry.npmjs.org/vega-view/-/vega-view-5.10.0.tgz";
+ sha512 = "HuqTVimMqlgqe64EQkTEnt0+yDkt29/q1szg/m9QwCrSc5QMXI8Mkt58O/F7OD3QyVr7xrKHyPTk9I9gCaZ6sw==";
};
};
"vega-view-transforms-4.5.8" = {
@@ -59065,13 +59029,13 @@ let
sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==";
};
};
- "verda-1.2.1" = {
+ "verda-1.2.2" = {
name = "verda";
packageName = "verda";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/verda/-/verda-1.2.1.tgz";
- sha512 = "hEkyReHbrar3MikWeZTLWaR3Sr7KAl/M+KczKgGs80LHTPaKC06ussYuWVg9lMeOrwbOZb1o3DRNv91VzoGoYg==";
+ url = "https://registry.npmjs.org/verda/-/verda-1.2.2.tgz";
+ sha512 = "qWyG2W2wgAw27sV5kVUjceb7GBwUFleVjBmH5XA4L9J8rLpB10N7uaP45ZDYGA7gRuNjo/5futihrBWbKKvJ0Q==";
};
};
"verror-1.1.0" = {
@@ -59407,13 +59371,13 @@ let
sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
};
};
- "vsce-1.85.1" = {
+ "vsce-1.87.0" = {
name = "vsce";
packageName = "vsce";
- version = "1.85.1";
+ version = "1.87.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vsce/-/vsce-1.85.1.tgz";
- sha512 = "IdfH8OCK+FgQGmihFoh6/17KBl4Ad3q4Sw3NFNI9T9KX6KdMR5az2/GO512cC9IqCjbgJl12CA7X84vYoc0ifg==";
+ url = "https://registry.npmjs.org/vsce/-/vsce-1.87.0.tgz";
+ sha512 = "7Ow05XxIM4gHBq/Ho3hefdmiZG0fddHtu0M0XJ1sojyZBvxPxTHaMuBsRnfnMzgCqxDTFI5iLr94AgiwQnhOMQ==";
};
};
"vscode-css-languageservice-3.0.13" = {
@@ -59443,22 +59407,22 @@ let
sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg==";
};
};
- "vscode-debugadapter-testsupport-1.45.0" = {
+ "vscode-debugadapter-testsupport-1.46.0" = {
name = "vscode-debugadapter-testsupport";
packageName = "vscode-debugadapter-testsupport";
- version = "1.45.0";
+ version = "1.46.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.45.0.tgz";
- sha512 = "/5q/F2K1mNLfJWxXStG9pO86mgOeK73PoMJpOBZaniToplrzM7LgFEdXUPlzNH07//XZwzRsCFn7Eq3brqYk6Q==";
+ url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.46.0.tgz";
+ sha512 = "6n+uu4+Q5sZvN2FgFLNJkyaE6AECYzFh+Hfv+IeJoVKA7KNiQ1SNd3yTsvSFxkS00LmVU6V00XGaqZRlwM15Jg==";
};
};
- "vscode-debugprotocol-1.45.0" = {
+ "vscode-debugprotocol-1.46.0" = {
name = "vscode-debugprotocol";
packageName = "vscode-debugprotocol";
- version = "1.45.0";
+ version = "1.46.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.45.0.tgz";
- sha512 = "xU6XtdKJ0waWIt79Zt4WVyIQ3oDkhilku9Shbv7Vc4KXEr/npsf8dhinyIZXSIlH2lzJiE3imp1xbYpyRTIrhg==";
+ url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.46.0.tgz";
+ sha512 = "V10u1L679DJZfOtQXhKylJPMqNbhazav4mRxPrBE8/Jpznow1b1j1EGDDvJ4prQ623CLAnvpFfVkVQ+CX3xdtg==";
};
};
"vscode-emmet-helper-1.2.17" = {
@@ -59875,15 +59839,6 @@ let
sha1 = "631bdbf716dccab0e65291a8dc25c23232085a52";
};
};
- "vscode-uri-1.0.6" = {
- name = "vscode-uri";
- packageName = "vscode-uri";
- version = "1.0.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.6.tgz";
- sha512 = "sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww==";
- };
- };
"vscode-uri-1.0.8" = {
name = "vscode-uri";
packageName = "vscode-uri";
@@ -59929,31 +59884,13 @@ let
sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==";
};
};
- "vue-3.0.7" = {
- name = "vue";
- packageName = "vue";
- version = "3.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/vue/-/vue-3.0.7.tgz";
- sha512 = "8h4TikD+JabbMK9aRlBO4laG0AtNHRPHynxYgWZ9sq1YUPfzynd9Jeeb27XNyZytC7aCQRX9xe1+TQJuc181Tw==";
- };
- };
- "vue-cli-plugin-apollo-0.21.3" = {
- name = "vue-cli-plugin-apollo";
- packageName = "vue-cli-plugin-apollo";
- version = "0.21.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.21.3.tgz";
- sha512 = "8CzRVrAsFkB9lpl600cRCNR9OUnrSYYAIVF9/qW4pP0TMXbhrd1F1wEAAN6E0CPimjTLB+qSt6zWS4vb2wC8Wg==";
- };
- };
- "vue-codemod-0.0.4" = {
+ "vue-codemod-0.0.5" = {
name = "vue-codemod";
packageName = "vue-codemod";
- version = "0.0.4";
+ version = "0.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/vue-codemod/-/vue-codemod-0.0.4.tgz";
- sha512 = "mAI9g4CcY3GJOOt/fTOC8Cz9lYtBEuSiDizQHgvcX0HpoKw1bNZBPaNUqFoNxnk6+nGZVgt0/CXYnq80rRK9vg==";
+ url = "https://registry.npmjs.org/vue-codemod/-/vue-codemod-0.0.5.tgz";
+ sha512 = "DE+24W1d3oanGqq7yna4ddOKXmVzjECgku2ddMcm7OS9Bp9QOblMHT88PzKiCc7npGiHf5+mTfrEW1JVIBbA2A==";
};
};
"vue-eslint-parser-2.0.3" = {
@@ -60406,13 +60343,13 @@ let
sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
};
};
- "webtorrent-0.115.2" = {
+ "webtorrent-0.116.0" = {
name = "webtorrent";
packageName = "webtorrent";
- version = "0.115.2";
+ version = "0.116.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.115.2.tgz";
- sha512 = "92m4mWoyLO8ly8hvw8w+pIk3J2oePxbKBf5SmAAWxQKrq9a3tbIL3VVj/B5gXovBhfpXdBvi93JFT4Ehn49bkw==";
+ url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.116.0.tgz";
+ sha512 = "jpptAAME7miPpoaywK+WZgn6CSLEvtqv9/7RUdr+M5vp1HbkVQDf5nX21funEWl955EIDdgzYvegU5JOm9W7cw==";
};
};
"well-known-symbols-2.0.0" = {
@@ -60469,13 +60406,13 @@ let
sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==";
};
};
- "whatwg-url-8.4.0" = {
+ "whatwg-url-8.5.0" = {
name = "whatwg-url";
packageName = "whatwg-url";
- version = "8.4.0";
+ version = "8.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz";
- sha512 = "vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==";
+ url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.5.0.tgz";
+ sha512 = "fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==";
};
};
"whatwg-url-compat-0.6.5" = {
@@ -60712,6 +60649,15 @@ let
sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
};
};
+ "window-size-1.1.1" = {
+ name = "window-size";
+ packageName = "window-size";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/window-size/-/window-size-1.1.1.tgz";
+ sha512 = "5D/9vujkmVQ7pSmc0SCBmHXbkv6eaHwXEx65MywhmUMsI8sGqJ972APq1lotfcwMKPFLuCFfL8xGHLIp7jaBmA==";
+ };
+ };
"windows-no-runnable-0.0.6" = {
name = "windows-no-runnable";
packageName = "windows-no-runnable";
@@ -61288,15 +61234,6 @@ let
sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==";
};
};
- "ws-7.4.2" = {
- name = "ws";
- packageName = "ws";
- version = "7.4.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz";
- sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==";
- };
- };
"ws-7.4.3" = {
name = "ws";
packageName = "ws";
@@ -61396,6 +61333,15 @@ let
sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==";
};
};
+ "xdl-59.0.27" = {
+ name = "xdl";
+ packageName = "xdl";
+ version = "59.0.27";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/xdl/-/xdl-59.0.27.tgz";
+ sha512 = "AgC/90d0ZZg1TC7jGbQkD+9eIYc27gvnVgP2DAcesyWL/lSnvSpbtkOnUCQIdtM0d4RJCsTdie0748FO01Vo2g==";
+ };
+ };
"xenvar-0.5.1" = {
name = "xenvar";
packageName = "xenvar";
@@ -61666,6 +61612,15 @@ let
sha512 = "2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==";
};
};
+ "xmldom-0.5.0" = {
+ name = "xmldom";
+ packageName = "xmldom";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz";
+ sha512 = "Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==";
+ };
+ };
"xmlhttprequest-1.8.0" = {
name = "xmlhttprequest";
packageName = "xmlhttprequest";
@@ -61847,13 +61802,13 @@ let
sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
};
};
- "yaml-1.10.0" = {
+ "yaml-1.10.2" = {
name = "yaml";
packageName = "yaml";
- version = "1.10.0";
+ version = "1.10.2";
src = fetchurl {
- url = "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz";
- sha512 = "yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==";
+ url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz";
+ sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==";
};
};
"yaml-ast-parser-0.0.43" = {
@@ -61991,15 +61946,6 @@ let
sha512 = "6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA==";
};
};
- "yargs-16.1.1" = {
- name = "yargs";
- packageName = "yargs";
- version = "16.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz";
- sha512 = "hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w==";
- };
- };
"yargs-16.2.0" = {
name = "yargs";
packageName = "yargs";
@@ -62117,13 +62063,13 @@ let
sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==";
};
};
- "yargs-parser-20.2.6" = {
+ "yargs-parser-20.2.7" = {
name = "yargs-parser";
packageName = "yargs-parser";
- version = "20.2.6";
+ version = "20.2.7";
src = fetchurl {
- url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.6.tgz";
- sha512 = "AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==";
+ url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz";
+ sha512 = "FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==";
};
};
"yargs-parser-4.2.1" = {
@@ -62360,13 +62306,13 @@ let
sha1 = "62814dd799eff8361f2a228f41f705c5e19de4c9";
};
};
- "zip-dir-1.0.2" = {
+ "zip-dir-2.0.0" = {
name = "zip-dir";
packageName = "zip-dir";
- version = "1.0.2";
+ version = "2.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/zip-dir/-/zip-dir-1.0.2.tgz";
- sha1 = "253f907aead62a21acd8721d8b88032b2411c051";
+ url = "https://registry.npmjs.org/zip-dir/-/zip-dir-2.0.0.tgz";
+ sha512 = "uhlsJZWz26FLYXOD6WVuq+fIcZ3aBPGo/cFdiLlv3KNwpa52IF3ISV8fLhQLiqVu5No3VhlqlgthN6gehil1Dg==";
};
};
"zip-stream-2.1.3" = {
@@ -62429,15 +62375,15 @@ in
"@angular/cli" = nodeEnv.buildNodePackage {
name = "_at_angular_slash_cli";
packageName = "@angular/cli";
- version = "11.2.3";
+ version = "11.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.3.tgz";
- sha512 = "j3kmhUj7QGd8IoNrwgFDtq3gfj4s4XLrk3jhfFhPc0N1m2WHHIShHix3hZ29ayewT+WpIwqZQYovCX21cQvGhA==";
+ url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.6.tgz";
+ sha512 = "67XH3wJgs1YuM4xW5PoouclT57AsfMhiOup2VPfGQn8GNINB4zauJfBotGyb3jQtRSFdwz+bXif6V9MSAw4oHA==";
};
dependencies = [
- sources."@angular-devkit/architect-0.1102.3"
- sources."@angular-devkit/core-11.2.3"
- sources."@angular-devkit/schematics-11.2.3"
+ sources."@angular-devkit/architect-0.1102.6"
+ sources."@angular-devkit/core-11.2.6"
+ sources."@angular-devkit/schematics-11.2.6"
sources."@npmcli/ci-detect-1.3.0"
(sources."@npmcli/git-2.0.6" // {
dependencies = [
@@ -62448,13 +62394,13 @@ in
sources."@npmcli/move-file-1.1.2"
sources."@npmcli/node-gyp-1.0.2"
sources."@npmcli/promise-spawn-1.3.2"
- (sources."@npmcli/run-script-1.8.3" // {
+ (sources."@npmcli/run-script-1.8.4" // {
dependencies = [
sources."read-package-json-fast-2.0.2"
];
})
- sources."@schematics/angular-11.2.3"
- sources."@schematics/update-0.1102.3"
+ sources."@schematics/angular-11.2.6"
+ sources."@schematics/update-0.1102.6"
sources."@tootallnate/once-1.1.2"
sources."@yarnpkg/lockfile-1.1.0"
sources."abbrev-1.1.1"
@@ -62463,7 +62409,7 @@ in
sources."aggregate-error-3.1.0"
sources."ajv-6.12.6"
sources."ansi-colors-4.1.1"
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."aproba-1.2.0"
@@ -62486,14 +62432,14 @@ in
sources."brace-expansion-1.1.11"
sources."buffer-5.7.1"
sources."builtins-1.0.3"
- sources."cacache-15.0.5"
+ sources."cacache-15.0.6"
sources."caseless-0.12.0"
sources."chalk-4.1.0"
sources."chardet-0.7.0"
sources."chownr-2.0.0"
sources."clean-stack-2.2.0"
sources."cli-cursor-3.1.0"
- sources."cli-spinners-2.5.0"
+ sources."cli-spinners-2.6.0"
sources."cli-width-3.0.0"
sources."clone-1.0.4"
sources."code-point-at-1.1.0"
@@ -62516,7 +62462,7 @@ in
sources."iconv-lite-0.6.2"
];
})
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."err-code-2.0.3"
sources."escape-string-regexp-1.0.5"
sources."extend-3.0.2"
@@ -62569,6 +62515,7 @@ in
sources."is-interactive-1.0.0"
sources."is-lambda-1.0.1"
sources."is-typedarray-1.0.0"
+ sources."is-unicode-supported-0.1.0"
sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
@@ -62582,7 +62529,7 @@ in
sources."jsonparse-1.3.1"
sources."jsprim-1.4.1"
sources."lodash-4.17.21"
- sources."log-symbols-4.0.0"
+ sources."log-symbols-4.1.0"
sources."lru-cache-6.0.0"
sources."magic-string-0.25.7"
(sources."make-fetch-happen-8.0.14" // {
@@ -62637,7 +62584,6 @@ in
];
})
sources."psl-1.8.0"
- sources."puka-1.0.1"
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."read-package-json-fast-1.2.2"
@@ -62664,7 +62610,7 @@ in
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.3"
sources."smart-buffer-4.1.0"
- sources."socks-2.5.1"
+ sources."socks-2.6.0"
sources."socks-proxy-agent-5.0.0"
sources."source-map-0.7.3"
sources."sourcemap-codec-1.4.8"
@@ -62682,7 +62628,7 @@ in
sources."tslib-1.14.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."unique-filename-1.1.1"
sources."unique-slug-2.0.2"
(sources."universal-analytics-0.4.23" // {
@@ -62733,13 +62679,13 @@ in
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
sources."commander-6.1.0"
- sources."convict-6.0.0"
+ sources."convict-6.0.1"
sources."decamelize-1.2.0"
sources."esprima-4.0.1"
sources."js-yaml-3.14.1"
sources."json5-2.1.3"
sources."lodash.clonedeep-4.5.0"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
sources."minimist-1.2.5"
sources."quick-lru-4.0.1"
sources."sprintf-js-1.0.3"
@@ -62829,7 +62775,7 @@ in
sources."safe-buffer-5.1.2"
];
})
- sources."convict-6.0.0"
+ sources."convict-6.0.1"
sources."core-util-is-1.0.2"
sources."crc-32-1.2.0"
sources."decamelize-1.2.0"
@@ -62941,7 +62887,7 @@ in
sources."lead-1.0.0"
sources."lodash.clonedeep-4.5.0"
sources."lowercase-keys-1.0.1"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
sources."marky-1.2.1"
sources."matcher-2.1.0"
sources."mime-db-1.46.0"
@@ -63034,7 +62980,7 @@ in
];
})
sources."to-utf8-0.0.1"
- sources."uglify-js-3.13.0"
+ sources."uglify-js-3.13.2"
sources."unc-path-regex-0.1.2"
sources."unique-stream-2.3.1"
sources."universalify-0.1.2"
@@ -63074,10 +63020,10 @@ in
"@bitwarden/cli" = nodeEnv.buildNodePackage {
name = "_at_bitwarden_slash_cli";
packageName = "@bitwarden/cli";
- version = "1.14.0";
+ version = "1.15.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.14.0.tgz";
- sha512 = "j9xCEhsE+xkR6tYYONv+MSlv7/OIQHj9G2JYq5vOauC4RNRLYSmo5I94LKliqUZDrZb4HpByhcL/nUcNxu5fNw==";
+ url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.15.1.tgz";
+ sha512 = "kD+EkbSqFRtkwV/PXbgaCvrSOqVRTRaFhfT4XNoYbggWhMVwB6ebvdHvHe5I7pRKE8/xgP7WiIM/b0HP81bbHg==";
};
dependencies = [
sources."abab-2.0.5"
@@ -63108,7 +63054,7 @@ in
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."combined-stream-1.0.6"
- sources."commander-2.18.0"
+ sources."commander-7.0.0"
sources."core-util-is-1.0.2"
sources."cssom-0.3.8"
sources."cssstyle-1.4.0"
@@ -63252,7 +63198,7 @@ in
sources."@angular-devkit/schematics-cli-0.1102.0"
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -63262,7 +63208,12 @@ in
sources."supports-color-5.5.0"
];
})
- sources."@nestjs/schematics-7.2.8"
+ (sources."@nestjs/schematics-7.3.0" // {
+ dependencies = [
+ sources."@angular-devkit/core-11.2.3"
+ sources."@angular-devkit/schematics-11.2.3"
+ ];
+ })
sources."@schematics/schematics-0.1102.0"
sources."@types/anymatch-1.3.1"
sources."@types/eslint-7.2.7"
@@ -63270,7 +63221,7 @@ in
sources."@types/estree-0.0.45"
sources."@types/json-schema-7.0.7"
sources."@types/json5-0.0.29"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/parse-json-4.0.0"
sources."@types/source-list-map-0.1.2"
sources."@types/tapable-1.0.6"
@@ -63305,11 +63256,11 @@ in
sources."@webassemblyjs/wast-printer-1.9.1"
sources."@xtuc/ieee754-1.2.0"
sources."@xtuc/long-4.2.2"
- sources."acorn-8.0.5"
+ sources."acorn-8.1.0"
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
sources."ansi-colors-4.1.1"
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-3.0.0"
sources."ansi-styles-4.3.0"
sources."anymatch-3.1.1"
@@ -63324,13 +63275,13 @@ in
sources."buffer-5.7.1"
sources."buffer-from-1.1.1"
sources."callsites-3.1.0"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
sources."chalk-3.0.0"
sources."chardet-0.7.0"
sources."chokidar-3.5.1"
sources."chrome-trace-event-1.0.2"
sources."cli-cursor-3.1.0"
- sources."cli-spinners-2.5.0"
+ sources."cli-spinners-2.6.0"
sources."cli-table3-0.5.1"
sources."cli-width-3.0.0"
sources."clone-1.0.4"
@@ -63345,7 +63296,7 @@ in
sources."cross-spawn-7.0.3"
sources."deepmerge-4.2.2"
sources."defaults-1.0.3"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."enhanced-resolve-4.5.0"
@@ -63410,6 +63361,7 @@ in
sources."is-interactive-1.0.0"
sources."is-number-7.0.0"
sources."is-stream-2.0.0"
+ sources."is-unicode-supported-0.1.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."jest-worker-26.6.2"
@@ -63418,13 +63370,14 @@ in
sources."json-parse-even-better-errors-2.3.1"
sources."json-schema-traverse-0.4.1"
sources."json5-1.0.1"
+ sources."jsonc-parser-3.0.0"
sources."jsonfile-6.1.0"
sources."lines-and-columns-1.1.6"
sources."loader-runner-4.2.0"
sources."locate-path-6.0.0"
sources."lodash-4.17.21"
sources."lodash.toarray-4.4.0"
- (sources."log-symbols-4.0.0" // {
+ (sources."log-symbols-4.1.0" // {
dependencies = [
sources."chalk-4.1.0"
];
@@ -63493,7 +63446,7 @@ in
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."schema-utils-2.7.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."serialize-javascript-5.0.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
@@ -63515,7 +63468,7 @@ in
sources."supports-color-7.2.0"
sources."symbol-observable-3.0.0"
sources."tapable-1.1.3"
- (sources."terser-5.6.0" // {
+ (sources."terser-5.6.1" // {
dependencies = [
sources."commander-2.20.3"
];
@@ -63542,7 +63495,7 @@ in
];
})
sources."tslib-1.14.1"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typescript-4.1.5"
sources."universalify-2.0.0"
sources."uri-js-4.4.1"
@@ -63566,7 +63519,7 @@ in
sources."windows-release-4.0.0"
sources."wrappy-1.0.2"
sources."yallist-4.0.0"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.2"
sources."yocto-queue-0.1.0"
];
buildInputs = globalBuildInputs;
@@ -63582,137 +63535,52 @@ in
"@vue/cli" = nodeEnv.buildNodePackage {
name = "_at_vue_slash_cli";
packageName = "@vue/cli";
- version = "4.5.11";
+ version = "4.5.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.11.tgz";
- sha512 = "w6B1+Fb0AHwAd8eE1q4/KrJph/kXo/cqQ0Lf5MnXCYt7SXdDPBGTdyFAumMaSPQESXgmdWgEo8EhnVEBNpXDIw==";
+ url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.12.tgz";
+ sha512 = "ZP0bxmM+VpmH8xT/5DbH8UD5nnlXLxJNYLiMcndx0pmuujabUORZdhIO3B9pq1w1Y204p2CJq3srrEUwhKKY5g==";
};
dependencies = [
sources."@akryum/winattr-3.0.0"
- (sources."@apollo/federation-0.20.7" // {
- dependencies = [
- sources."apollo-server-env-2.4.5"
- ];
- })
(sources."@apollo/protobufjs-1.0.5" // {
dependencies = [
sources."@types/node-10.17.55"
];
})
sources."@apollographql/apollo-tools-0.4.9"
- sources."@apollographql/graphql-language-service-interface-2.0.2"
- sources."@apollographql/graphql-language-service-parser-2.0.2"
- sources."@apollographql/graphql-language-service-types-2.0.2"
- sources."@apollographql/graphql-language-service-utils-2.0.2"
- sources."@apollographql/graphql-playground-html-1.6.26"
+ sources."@apollographql/graphql-playground-html-1.6.27"
sources."@apollographql/graphql-upload-8-fork-8.1.3"
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.8"
- (sources."@babel/core-7.13.8" // {
- dependencies = [
- sources."@babel/generator-7.13.9"
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/generator-7.12.11" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-annotate-as-pure-7.12.13" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- sources."@babel/helper-compilation-targets-7.13.8"
- sources."@babel/helper-create-class-features-plugin-7.13.8"
+ sources."@babel/compat-data-7.13.12"
+ sources."@babel/core-7.13.10"
+ sources."@babel/generator-7.13.9"
+ sources."@babel/helper-annotate-as-pure-7.12.13"
+ sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
+ sources."@babel/helper-compilation-targets-7.13.10"
+ sources."@babel/helper-create-class-features-plugin-7.13.11"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
sources."@babel/helper-define-polyfill-provider-0.1.5"
- (sources."@babel/helper-explode-assignable-expression-7.13.0" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-function-name-7.12.13" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-get-function-arity-7.12.13" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-hoist-variables-7.13.0" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-member-expression-to-functions-7.13.0" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-module-imports-7.12.13" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-module-transforms-7.13.0" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-optimise-call-expression-7.12.13" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
+ sources."@babel/helper-explode-assignable-expression-7.13.0"
+ sources."@babel/helper-function-name-7.12.13"
+ sources."@babel/helper-get-function-arity-7.12.13"
+ sources."@babel/helper-hoist-variables-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
+ sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
- (sources."@babel/helper-remap-async-to-generator-7.13.0" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-replace-supers-7.13.0" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-simple-access-7.12.13" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helper-split-export-declaration-7.12.13" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
+ sources."@babel/helper-remap-async-to-generator-7.13.0"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
+ sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
+ sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- (sources."@babel/helper-wrap-function-7.13.0" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/helpers-7.13.0" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- sources."@babel/highlight-7.13.8"
- sources."@babel/parser-7.13.9"
+ sources."@babel/helper-wrap-function-7.13.0"
+ sources."@babel/helpers-7.13.10"
+ sources."@babel/highlight-7.13.10"
+ sources."@babel/parser-7.13.12"
+ sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.13.0"
sources."@babel/plugin-proposal-dynamic-import-7.13.8"
@@ -63723,7 +63591,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -63774,11 +63642,7 @@ in
sources."@babel/plugin-transform-typescript-7.13.0"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- (sources."@babel/preset-env-7.13.9" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
+ sources."@babel/preset-env-7.13.12"
sources."@babel/preset-flow-7.12.13"
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-typescript-7.13.0"
@@ -63789,136 +63653,23 @@ in
sources."semver-5.7.1"
];
})
- sources."@babel/runtime-7.13.9"
- (sources."@babel/template-7.12.13" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- ];
- })
- (sources."@babel/traverse-7.13.0" // {
- dependencies = [
- sources."@babel/generator-7.13.9"
- sources."@babel/types-7.13.0"
- ];
- })
- sources."@babel/types-7.10.4"
- sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2"
+ sources."@babel/runtime-7.13.10"
+ sources."@babel/template-7.12.13"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@hapi/address-2.1.4"
sources."@hapi/bourne-1.3.2"
sources."@hapi/hoek-8.5.1"
sources."@hapi/joi-15.1.1"
sources."@hapi/topo-3.1.6"
sources."@mrmlnc/readdir-enhanced-2.2.1"
- sources."@nodelib/fs.scandir-2.1.4"
- sources."@nodelib/fs.stat-2.0.4"
+ (sources."@nodelib/fs.scandir-2.1.4" // {
+ dependencies = [
+ sources."@nodelib/fs.stat-2.0.4"
+ ];
+ })
+ sources."@nodelib/fs.stat-1.1.3"
sources."@nodelib/fs.walk-1.2.6"
- (sources."@oclif/color-0.1.2" // {
- dependencies = [
- (sources."chalk-3.0.0" // {
- dependencies = [
- sources."ansi-styles-4.3.0"
- sources."supports-color-7.2.0"
- ];
- })
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."has-flag-4.0.0"
- sources."strip-ansi-5.2.0"
- ];
- })
- (sources."@oclif/command-1.8.0" // {
- dependencies = [
- sources."@oclif/plugin-help-3.2.2"
- sources."ansi-styles-4.3.0"
- sources."chalk-4.1.0"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."has-flag-4.0.0"
- sources."lru-cache-6.0.0"
- sources."semver-7.3.4"
- sources."supports-color-7.2.0"
- ];
- })
- (sources."@oclif/config-1.17.0" // {
- dependencies = [
- sources."globby-11.0.2"
- sources."is-wsl-2.2.0"
- sources."tslib-2.1.0"
- ];
- })
- (sources."@oclif/errors-1.3.4" // {
- dependencies = [
- sources."ansi-styles-4.3.0"
- sources."clean-stack-3.0.1"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."escape-string-regexp-4.0.0"
- sources."fs-extra-8.1.0"
- sources."wrap-ansi-7.0.0"
- ];
- })
- sources."@oclif/linewrap-1.0.0"
- sources."@oclif/parser-3.8.5"
- (sources."@oclif/plugin-autocomplete-0.3.0" // {
- dependencies = [
- sources."ansi-styles-4.3.0"
- sources."chalk-4.1.0"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."fs-extra-9.1.0"
- sources."has-flag-4.0.0"
- sources."jsonfile-6.1.0"
- sources."supports-color-7.2.0"
- sources."universalify-2.0.0"
- ];
- })
- (sources."@oclif/plugin-help-2.2.3" // {
- dependencies = [
- sources."ansi-regex-3.0.0"
- sources."emoji-regex-7.0.3"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
- (sources."widest-line-2.0.1" // {
- dependencies = [
- sources."string-width-2.1.1"
- sources."strip-ansi-4.0.0"
- ];
- })
- ];
- })
- (sources."@oclif/plugin-not-found-1.2.4" // {
- dependencies = [
- sources."cli-ux-4.9.3"
- sources."indent-string-3.2.0"
- sources."semver-5.7.1"
- sources."strip-ansi-5.2.0"
- ];
- })
- (sources."@oclif/plugin-plugins-1.9.5" // {
- dependencies = [
- sources."ansi-styles-4.3.0"
- sources."chalk-4.1.0"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."fs-extra-9.1.0"
- sources."has-flag-4.0.0"
- sources."jsonfile-6.1.0"
- sources."lru-cache-6.0.0"
- sources."npm-run-path-4.0.1"
- sources."path-key-3.1.1"
- sources."semver-7.3.4"
- sources."supports-color-7.2.0"
- sources."tslib-2.1.0"
- sources."universalify-2.0.0"
- ];
- })
- (sources."@oclif/plugin-warn-if-update-available-1.7.0" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
- sources."@oclif/screen-1.0.4"
sources."@protobufjs/aspromise-1.1.2"
sources."@protobufjs/base64-1.1.2"
sources."@protobufjs/codegen-2.0.4"
@@ -63929,7 +63680,6 @@ in
sources."@protobufjs/path-1.1.2"
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
- sources."@samverschueren/stream-to-observable-0.3.1"
sources."@sindresorhus/is-0.7.0"
sources."@types/accepts-1.3.5"
sources."@types/body-parser-1.19.0"
@@ -63938,7 +63688,7 @@ in
sources."@types/cookies-0.7.6"
sources."@types/cors-2.8.8"
sources."@types/ejs-2.7.0"
- sources."@types/express-4.17.7"
+ sources."@types/express-4.17.11"
sources."@types/express-serve-static-core-4.17.18"
sources."@types/fs-capacitor-2.0.0"
sources."@types/glob-7.1.3"
@@ -63957,8 +63707,8 @@ in
sources."@types/koa-compose-3.2.5"
sources."@types/long-4.0.1"
sources."@types/mime-1.3.2"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.32"
+ sources."@types/minimatch-3.0.4"
+ sources."@types/node-14.14.35"
(sources."@types/node-fetch-2.5.7" // {
dependencies = [
sources."form-data-3.0.1"
@@ -63970,117 +63720,50 @@ in
sources."@types/serve-static-1.13.9"
sources."@types/through-0.0.30"
sources."@types/ws-7.4.0"
- sources."@types/zen-observable-0.8.2"
- sources."@vue/cli-shared-utils-4.5.11"
- (sources."@vue/cli-ui-4.5.11" // {
+ sources."@vue/cli-shared-utils-4.5.12"
+ (sources."@vue/cli-ui-4.5.12" // {
dependencies = [
sources."clone-2.1.2"
];
})
- sources."@vue/cli-ui-addon-webpack-4.5.11"
- sources."@vue/cli-ui-addon-widgets-4.5.11"
+ sources."@vue/cli-ui-addon-webpack-4.5.12"
+ sources."@vue/cli-ui-addon-widgets-4.5.12"
(sources."@vue/compiler-core-3.0.7" // {
dependencies = [
- sources."@babel/types-7.13.0"
sources."source-map-0.6.1"
];
})
sources."@vue/compiler-dom-3.0.7"
- (sources."@vue/compiler-sfc-3.0.7" // {
- dependencies = [
- sources."@babel/types-7.13.0"
- sources."source-map-0.6.1"
- ];
- })
- sources."@vue/compiler-ssr-3.0.7"
- sources."@vue/reactivity-3.0.7"
- sources."@vue/runtime-core-3.0.7"
- sources."@vue/runtime-dom-3.0.7"
sources."@vue/shared-3.0.7"
- sources."@wry/context-0.4.4"
sources."@wry/equality-0.1.11"
- sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."aggregate-error-3.1.0"
sources."ajv-6.12.6"
- (sources."ansi-align-2.0.0" // {
+ (sources."ansi-align-3.0.0" // {
dependencies = [
- sources."ansi-regex-3.0.0"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-2.1.1"
- sources."strip-ansi-4.0.0"
- ];
- })
- sources."ansi-escapes-3.2.0"
- sources."ansi-regex-4.1.0"
- sources."ansi-styles-3.2.1"
- sources."ansicolors-0.3.2"
- sources."any-observable-0.3.0"
- (sources."anymatch-2.0.0" // {
- dependencies = [
- (sources."braces-2.3.2" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."extend-shallow-3.0.2"
- (sources."fill-range-4.0.0" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."is-extendable-1.0.1"
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."micromatch-3.1.10"
- sources."normalize-path-2.1.1"
- sources."to-regex-range-2.1.1"
- ];
- })
- (sources."apollo-2.32.5" // {
- dependencies = [
- sources."graphql-tag-2.11.0"
- sources."mkdirp-1.0.4"
+ sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
];
})
- sources."apollo-cache-1.3.5"
- sources."apollo-cache-control-0.11.6"
- sources."apollo-cache-inmemory-1.6.6"
- sources."apollo-client-2.6.10"
- (sources."apollo-codegen-core-0.39.3" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."recast-0.20.4"
- sources."source-map-0.6.1"
- sources."tslib-2.1.0"
+ sources."type-fest-0.21.3"
];
})
- sources."apollo-codegen-flow-0.37.3"
- sources."apollo-codegen-scala-0.38.3"
- sources."apollo-codegen-swift-0.39.3"
- sources."apollo-codegen-typescript-0.39.3"
+ sources."ansi-regex-4.1.0"
+ sources."ansi-styles-3.2.1"
+ sources."apollo-cache-control-0.11.6"
sources."apollo-datasource-0.7.3"
sources."apollo-env-0.6.6"
sources."apollo-graphql-0.6.1"
- sources."apollo-language-server-1.25.2"
sources."apollo-link-1.2.14"
- sources."apollo-link-context-1.0.20"
- sources."apollo-link-error-1.1.13"
- sources."apollo-link-http-1.5.17"
- sources."apollo-link-http-common-0.2.16"
- sources."apollo-link-persisted-queries-0.2.2"
- sources."apollo-link-state-0.4.2"
- sources."apollo-link-ws-1.0.20"
sources."apollo-reporting-protobuf-0.6.2"
(sources."apollo-server-caching-0.5.3" // {
dependencies = [
sources."lru-cache-6.0.0"
];
})
- (sources."apollo-server-core-2.21.0" // {
+ (sources."apollo-server-core-2.21.2" // {
dependencies = [
sources."lru-cache-6.0.0"
sources."uuid-8.3.2"
@@ -64088,48 +63771,34 @@ in
})
sources."apollo-server-env-3.0.0"
sources."apollo-server-errors-2.4.2"
- sources."apollo-server-express-2.21.0"
+ sources."apollo-server-express-2.21.2"
sources."apollo-server-plugin-base-0.10.4"
sources."apollo-server-types-0.6.3"
sources."apollo-tracing-0.12.2"
- sources."apollo-upload-client-11.0.0"
sources."apollo-utilities-1.3.4"
(sources."archive-type-4.0.0" // {
dependencies = [
sources."file-type-4.4.0"
];
})
- sources."arg-4.1.3"
- (sources."argparse-1.0.10" // {
- dependencies = [
- sources."sprintf-js-1.0.3"
- ];
- })
+ sources."argparse-1.0.10"
sources."arr-diff-4.0.0"
sources."arr-flatten-1.1.0"
sources."arr-union-3.1.0"
sources."array-flatten-1.1.1"
- sources."array-union-2.1.0"
+ sources."array-union-1.0.2"
sources."array-uniq-1.0.3"
sources."array-unique-0.3.2"
sources."arrify-2.0.1"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."assign-symbols-1.0.0"
- (sources."ast-types-0.14.2" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
- sources."astral-regex-1.0.0"
+ sources."ast-types-0.13.3"
sources."async-2.6.3"
- sources."async-each-1.0.3"
sources."async-limiter-1.0.1"
sources."async-retry-1.3.1"
sources."asynckit-0.4.0"
- sources."at-least-node-1.0.0"
sources."atob-2.1.2"
- sources."await-to-js-2.1.1"
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."babel-core-7.0.0-bridge.0"
@@ -64146,11 +63815,7 @@ in
})
sources."base64-js-1.5.1"
sources."bcrypt-pbkdf-1.0.2"
- sources."big.js-5.2.2"
- sources."binary-extensions-1.13.1"
- sources."bindings-1.5.0"
sources."bl-1.2.3"
- sources."bluebird-3.7.2"
(sources."body-parser-1.19.0" // {
dependencies = [
sources."debug-2.6.9"
@@ -64160,31 +63825,19 @@ in
sources."setprototypeof-1.1.1"
];
})
- sources."boolean-3.0.2"
(sources."boxen-4.2.0" // {
dependencies = [
- (sources."ansi-align-3.0.0" // {
- dependencies = [
- sources."string-width-3.1.0"
- ];
- })
sources."ansi-styles-4.3.0"
- sources."camelcase-5.3.1"
sources."chalk-3.0.0"
- sources."cli-boxes-2.2.1"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."emoji-regex-7.0.3"
sources."has-flag-4.0.0"
- sources."is-fullwidth-code-point-2.0.0"
- sources."strip-ansi-5.2.0"
sources."supports-color-7.2.0"
- sources."term-size-2.2.1"
sources."type-fest-0.8.1"
];
})
sources."brace-expansion-1.1.11"
- sources."braces-3.0.2"
+ sources."braces-2.3.2"
sources."browserslist-4.16.3"
sources."buffer-5.7.1"
sources."buffer-alloc-1.2.0"
@@ -64194,63 +63847,22 @@ in
sources."buffer-from-1.1.1"
sources."builtins-1.0.3"
sources."busboy-0.3.1"
- sources."byline-5.0.0"
sources."bytes-3.1.0"
sources."cache-base-1.0.1"
(sources."cacheable-request-2.1.4" // {
dependencies = [
sources."get-stream-3.0.0"
sources."lowercase-keys-1.0.0"
- sources."normalize-url-2.0.1"
- sources."prepend-http-2.0.0"
- sources."query-string-5.1.1"
- sources."sort-keys-2.0.0"
- sources."strict-uri-encode-1.1.0"
];
})
sources."call-bind-1.0.2"
sources."call-me-maybe-1.0.1"
- sources."caller-callsite-2.0.0"
- sources."caller-path-2.0.0"
- sources."callsites-2.0.0"
- (sources."camel-case-4.1.2" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
- sources."camelcase-4.1.0"
- sources."caniuse-lite-1.0.30001197"
- (sources."capital-case-1.0.4" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
- sources."capture-stack-trace-1.0.1"
- sources."cardinal-2.1.1"
+ sources."camelcase-5.3.1"
+ sources."caniuse-lite-1.0.30001204"
sources."caseless-0.12.0"
sources."caw-2.0.1"
sources."chalk-2.4.2"
- (sources."change-case-4.1.2" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
sources."chardet-0.7.0"
- (sources."chokidar-2.1.8" // {
- dependencies = [
- sources."braces-2.3.2"
- sources."fill-range-4.0.0"
- (sources."glob-parent-3.1.0" // {
- dependencies = [
- sources."is-glob-3.1.0"
- ];
- })
- sources."is-number-3.0.0"
- sources."kind-of-3.2.2"
- sources."to-regex-range-2.1.1"
- ];
- })
- sources."ci-info-1.6.0"
(sources."class-utils-0.3.6" // {
dependencies = [
sources."define-property-0.2.5"
@@ -64269,53 +63881,15 @@ in
];
})
sources."clean-stack-2.2.0"
- sources."cli-boxes-1.0.0"
+ sources."cli-boxes-2.2.1"
sources."cli-cursor-2.1.0"
- sources."cli-progress-3.9.0"
- sources."cli-spinners-2.5.0"
- (sources."cli-truncate-0.2.1" // {
- dependencies = [
- sources."ansi-regex-2.1.1"
- sources."is-fullwidth-code-point-1.0.0"
- sources."string-width-1.0.2"
- sources."strip-ansi-3.0.1"
- ];
- })
- (sources."cli-ux-5.5.1" // {
- dependencies = [
- sources."ansi-escapes-4.3.1"
- sources."ansi-styles-4.3.0"
- sources."chalk-4.1.0"
- sources."clean-stack-3.0.1"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."escape-string-regexp-4.0.0"
- sources."extract-stack-2.0.0"
- sources."fs-extra-8.1.0"
- sources."has-flag-4.0.0"
- sources."is-wsl-2.2.0"
- sources."lru-cache-6.0.0"
- sources."semver-7.3.4"
- sources."supports-color-7.2.0"
- sources."supports-hyperlinks-2.1.0"
- sources."tslib-2.1.0"
- sources."type-fest-0.11.0"
- ];
- })
+ sources."cli-spinners-2.6.0"
sources."cli-width-3.0.0"
- sources."clipboard-2.0.7"
- (sources."cliui-6.0.0" // {
- dependencies = [
- sources."ansi-styles-4.3.0"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."wrap-ansi-6.2.0"
- ];
- })
+ sources."clipboard-2.0.8"
+ sources."cliui-7.0.4"
sources."clone-1.0.4"
sources."clone-response-1.0.2"
sources."cmd-shim-3.0.3"
- sources."code-point-at-1.1.0"
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
@@ -64323,18 +63897,10 @@ in
sources."colors-1.4.0"
sources."combined-stream-1.0.8"
sources."commander-2.20.3"
- sources."common-tags-1.8.0"
sources."commondir-1.0.1"
sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
sources."config-chain-1.1.12"
- sources."configstore-3.1.5"
- sources."consolidate-0.16.0"
- (sources."constant-case-3.0.4" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
(sources."content-disposition-0.5.3" // {
dependencies = [
sources."safe-buffer-5.1.2"
@@ -64357,30 +63923,19 @@ in
})
sources."core-util-is-1.0.2"
sources."cors-2.8.5"
- (sources."cosmiconfig-5.2.1" // {
- dependencies = [
- sources."parse-json-4.0.0"
- ];
- })
- sources."create-error-class-3.0.2"
(sources."cross-spawn-6.0.5" // {
dependencies = [
sources."semver-5.7.1"
];
})
- sources."crypto-random-string-1.0.0"
- sources."cssesc-3.0.0"
sources."cssfilter-0.0.10"
- sources."csstype-2.6.16"
sources."csv-parser-1.12.1"
sources."dashdash-1.14.1"
- sources."date-fns-1.30.1"
(sources."debug-4.3.2" // {
dependencies = [
sources."ms-2.1.2"
];
})
- sources."decamelize-1.2.0"
sources."decode-uri-component-0.2.0"
(sources."decompress-4.2.1" // {
dependencies = [
@@ -64410,7 +63965,6 @@ in
sources."pify-2.3.0"
];
})
- sources."deep-extend-0.6.0"
sources."deepmerge-4.2.2"
sources."defaults-1.0.3"
sources."define-properties-1.1.3"
@@ -64420,24 +63974,11 @@ in
sources."depd-1.1.2"
sources."deprecated-decorator-0.1.6"
sources."destroy-1.0.4"
- sources."detect-node-2.0.4"
sources."dicer-0.3.0"
- sources."diff-4.0.2"
- sources."dir-glob-3.0.1"
- (sources."dot-case-3.0.4" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
- sources."dot-prop-4.2.1"
- sources."dotenv-8.2.0"
+ sources."dir-glob-2.2.2"
(sources."download-7.1.0" // {
dependencies = [
sources."get-stream-3.0.0"
- sources."got-8.3.2"
- sources."into-stream-3.1.0"
- sources."prepend-http-2.0.0"
- sources."url-parse-lax-3.0.0"
];
})
sources."download-git-repo-3.0.2"
@@ -64446,37 +63987,18 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.3.682"
- sources."elegant-spinner-1.0.1"
- sources."emoji-regex-8.0.0"
- sources."emojis-list-3.0.0"
+ sources."electron-to-chromium-1.3.699"
+ sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
sources."entities-2.2.0"
- (sources."env-ci-5.0.2" // {
- dependencies = [
- sources."cross-spawn-7.0.3"
- sources."execa-4.1.0"
- sources."get-stream-5.2.0"
- sources."is-stream-2.0.0"
- sources."mimic-fn-2.1.0"
- sources."npm-run-path-4.0.1"
- sources."onetime-5.1.2"
- sources."path-key-3.1.1"
- sources."shebang-command-2.0.0"
- sources."shebang-regex-3.0.0"
- sources."which-2.0.2"
- ];
- })
sources."envinfo-7.7.4"
sources."error-ex-1.3.2"
sources."es-abstract-1.18.0"
sources."es-to-primitive-1.2.1"
- sources."es6-error-4.1.1"
sources."escalade-3.1.1"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
- sources."esm-3.2.25"
sources."esprima-4.0.1"
sources."estree-walker-2.0.2"
sources."esutils-2.0.3"
@@ -64523,22 +64045,17 @@ in
sources."define-property-1.0.0"
];
})
- sources."extract-files-5.0.1"
- sources."extract-stack-1.0.0"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-3.1.3"
- sources."fast-glob-3.2.5"
+ sources."fast-glob-2.2.7"
sources."fast-json-stable-stringify-2.1.0"
- sources."fast-levenshtein-2.0.6"
sources."fastq-1.11.0"
sources."fd-slicer-1.1.0"
- sources."figures-1.7.0"
+ sources."figures-3.2.0"
sources."file-type-8.1.0"
- sources."file-uri-to-path-1.0.0"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-2.1.0"
- sources."fill-range-7.0.1"
- sources."filter-obj-1.1.0"
+ sources."fill-range-4.0.0"
(sources."finalhandler-1.1.2" // {
dependencies = [
sources."debug-2.6.9"
@@ -64553,7 +64070,7 @@ in
})
sources."find-up-3.0.0"
sources."fkill-6.2.0"
- sources."flow-parser-0.146.0"
+ sources."flow-parser-0.147.0"
sources."for-each-0.3.3"
sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
@@ -64567,13 +64084,10 @@ in
sources."fs-exists-sync-0.1.0"
sources."fs-extra-7.0.1"
sources."fs.realpath-1.0.0"
- sources."fsevents-1.2.13"
sources."fswin-2.17.1227"
sources."function-bind-1.1.1"
- sources."gaze-1.1.3"
sources."generate-function-1.1.0"
sources."generate-object-property-1.2.0"
- sources."generic-names-2.0.1"
sources."gensync-1.0.0-beta.2"
sources."get-caller-file-2.0.5"
sources."get-intrinsic-1.1.1"
@@ -64583,92 +64097,43 @@ in
sources."getpass-0.1.7"
sources."git-clone-0.1.0"
sources."git-config-path-1.0.1"
- (sources."git-parse-1.0.4" // {
+ sources."glob-7.1.6"
+ (sources."glob-parent-3.1.0" // {
dependencies = [
- sources."util.promisify-1.0.1"
+ sources."is-glob-3.1.0"
];
})
- (sources."git-rev-sync-2.1.0" // {
- dependencies = [
- sources."graceful-fs-4.1.15"
- ];
- })
- sources."git-up-4.0.2"
- sources."git-url-parse-11.4.3"
- sources."glob-7.1.5"
- sources."glob-parent-5.1.2"
sources."glob-to-regexp-0.3.0"
- (sources."global-agent-2.1.12" // {
- dependencies = [
- sources."lru-cache-6.0.0"
- sources."semver-7.3.4"
- ];
- })
sources."global-dirs-0.1.1"
sources."globals-11.12.0"
- sources."globalthis-1.0.2"
(sources."globby-9.2.0" // {
dependencies = [
- sources."@nodelib/fs.stat-1.1.3"
- sources."array-union-1.0.2"
- (sources."braces-2.3.2" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."dir-glob-2.2.2"
- sources."extend-shallow-3.0.2"
- sources."fast-glob-2.2.7"
- (sources."fill-range-4.0.0" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."glob-parent-3.1.0"
- sources."ignore-4.0.6"
- sources."is-extendable-1.0.1"
- sources."is-glob-3.1.0"
- sources."is-number-3.0.0"
- sources."kind-of-3.2.2"
- sources."micromatch-3.1.10"
- (sources."path-type-3.0.0" // {
- dependencies = [
- sources."pify-3.0.0"
- ];
- })
sources."pify-4.0.1"
sources."slash-2.0.0"
- sources."to-regex-range-2.1.1"
];
})
- sources."globule-1.3.2"
sources."good-listener-1.2.2"
- (sources."got-6.7.1" // {
+ (sources."got-8.3.2" // {
dependencies = [
sources."get-stream-3.0.0"
+ sources."into-stream-3.1.0"
];
})
sources."graceful-fs-4.2.6"
sources."graphql-14.7.0"
- (sources."graphql-anywhere-4.2.7" // {
- dependencies = [
- sources."ts-invariant-0.3.3"
- ];
- })
sources."graphql-extensions-0.12.8"
sources."graphql-subscriptions-1.2.1"
- sources."graphql-tag-2.12.1"
+ (sources."graphql-tag-2.12.3" // {
+ dependencies = [
+ sources."tslib-2.1.0"
+ ];
+ })
sources."graphql-tools-4.0.8"
sources."graphql-type-json-0.3.2"
sources."growly-1.3.0"
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."has-1.0.3"
- (sources."has-ansi-2.0.0" // {
- dependencies = [
- sources."ansi-regex-2.1.1"
- ];
- })
sources."has-bigints-1.0.1"
sources."has-flag-3.0.0"
sources."has-symbol-support-x-1.4.2"
@@ -64677,106 +64142,70 @@ in
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
sources."kind-of-4.0.0"
];
})
- sources."hash-sum-2.0.0"
- sources."hash.js-1.1.7"
- (sources."header-case-2.0.4" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
sources."homedir-polyfill-1.0.3"
sources."hosted-git-info-2.8.8"
sources."http-cache-semantics-3.8.1"
- (sources."http-call-5.3.0" // {
- dependencies = [
- sources."is-stream-2.0.0"
- sources."parse-json-4.0.0"
- ];
- })
sources."http-errors-1.8.0"
sources."http-signature-1.2.0"
sources."human-signals-1.1.1"
- sources."hyperlinker-1.0.0"
sources."iconv-lite-0.4.24"
- sources."icss-replace-symbols-1.1.0"
- sources."icss-utils-5.1.0"
sources."ieee754-1.2.1"
- sources."ignore-5.1.8"
- sources."ignore-by-default-1.0.1"
- sources."import-fresh-2.0.0"
+ sources."ignore-4.0.6"
sources."import-global-0.1.0"
- sources."import-lazy-2.1.0"
sources."imurmurhash-0.1.4"
sources."indent-string-4.0.0"
- sources."indexes-of-1.0.1"
- sources."inflected-2.1.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.8"
(sources."inquirer-7.3.3" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
sources."cli-cursor-3.1.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."figures-3.2.0"
sources."has-flag-4.0.0"
sources."mimic-fn-2.1.0"
sources."onetime-5.1.2"
sources."restore-cursor-3.1.0"
sources."supports-color-7.2.0"
- sources."type-fest-0.11.0"
];
})
- sources."interpret-1.4.0"
sources."into-stream-2.0.1"
sources."ipaddr.js-1.9.1"
sources."is-accessor-descriptor-1.0.0"
sources."is-arrayish-0.2.1"
sources."is-bigint-1.0.1"
- sources."is-binary-path-1.0.1"
sources."is-boolean-object-1.1.0"
sources."is-buffer-1.1.6"
sources."is-callable-1.2.3"
- sources."is-ci-1.2.1"
sources."is-core-module-2.2.0"
sources."is-data-descriptor-1.0.0"
sources."is-date-object-1.0.2"
sources."is-descriptor-1.0.2"
- sources."is-directory-0.3.1"
sources."is-docker-2.1.1"
sources."is-extendable-0.1.1"
sources."is-extglob-2.1.1"
- sources."is-fullwidth-code-point-3.0.0"
+ sources."is-fullwidth-code-point-2.0.0"
sources."is-glob-4.0.1"
- sources."is-installed-globally-0.1.0"
sources."is-natural-number-4.0.1"
sources."is-negative-zero-2.0.1"
- sources."is-npm-1.0.0"
- sources."is-number-7.0.0"
+ (sources."is-number-3.0.0" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
sources."is-number-object-1.0.4"
- sources."is-obj-1.0.1"
sources."is-object-1.0.2"
- sources."is-observable-1.1.0"
- sources."is-path-inside-1.0.1"
sources."is-plain-obj-1.1.0"
sources."is-plain-object-2.0.4"
sources."is-promise-2.2.2"
sources."is-property-1.0.2"
- sources."is-redirect-1.0.0"
sources."is-regex-1.1.2"
sources."is-retry-allowed-1.2.0"
- sources."is-ssh-1.3.2"
sources."is-stream-1.1.0"
sources."is-string-1.0.5"
sources."is-symbol-1.0.3"
@@ -64790,36 +64219,22 @@ in
sources."isstream-0.1.2"
sources."isurl-1.0.0"
sources."iterall-1.3.0"
- sources."java-properties-1.0.2"
sources."javascript-stringify-1.6.0"
sources."js-message-1.0.7"
sources."js-queue-2.0.2"
sources."js-tokens-4.0.0"
sources."js-yaml-3.14.1"
sources."jsbn-0.1.1"
- (sources."jscodeshift-0.10.0" // {
+ (sources."jscodeshift-0.11.0" // {
dependencies = [
- (sources."braces-2.3.2" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."extend-shallow-3.0.2"
- (sources."fill-range-4.0.0" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."is-extendable-1.0.1"
- sources."is-number-3.0.0"
- sources."kind-of-3.2.2"
- sources."micromatch-3.1.10"
- sources."to-regex-range-2.1.1"
+ sources."ast-types-0.14.2"
+ sources."recast-0.20.4"
+ sources."source-map-0.6.1"
+ sources."tslib-2.1.0"
];
})
sources."jsesc-2.5.2"
sources."json-buffer-3.0.0"
- sources."json-parse-better-errors-1.0.2"
sources."json-parse-even-better-errors-2.3.1"
sources."json-schema-0.2.3"
sources."json-schema-traverse-0.4.1"
@@ -64829,106 +64244,45 @@ in
sources."jsprim-1.4.1"
sources."keyv-3.0.0"
sources."kind-of-6.0.3"
- sources."latest-version-3.1.0"
sources."launch-editor-2.2.1"
sources."leven-3.1.0"
sources."lines-and-columns-1.1.6"
- sources."listr-0.14.3"
- sources."listr-silent-renderer-1.1.1"
- (sources."listr-update-renderer-0.5.0" // {
- dependencies = [
- sources."ansi-regex-2.1.1"
- sources."ansi-styles-2.2.1"
- sources."chalk-1.1.3"
- sources."indent-string-3.2.0"
- sources."log-symbols-1.0.2"
- sources."strip-ansi-3.0.1"
- sources."supports-color-2.0.0"
- ];
- })
- (sources."listr-verbose-renderer-0.5.0" // {
- dependencies = [
- sources."figures-2.0.0"
- ];
- })
- (sources."load-json-file-5.3.0" // {
- dependencies = [
- sources."parse-json-4.0.0"
- sources."pify-4.0.1"
- sources."type-fest-0.3.1"
- ];
- })
- (sources."loader-utils-1.4.0" // {
- dependencies = [
- sources."json5-1.0.1"
- ];
- })
sources."locate-path-3.0.0"
sources."lodash-4.17.21"
- sources."lodash._reinterpolate-3.0.0"
- sources."lodash.camelcase-4.3.0"
sources."lodash.clonedeep-4.5.0"
sources."lodash.debounce-4.0.8"
- sources."lodash.get-4.4.2"
- sources."lodash.identity-3.0.0"
sources."lodash.merge-4.6.2"
- sources."lodash.pickby-4.6.0"
sources."lodash.sortby-4.7.0"
- sources."lodash.template-4.5.0"
- sources."lodash.templatesettings-4.2.0"
- sources."lodash.xorby-4.7.0"
sources."log-symbols-2.2.0"
- (sources."log-update-2.3.0" // {
- dependencies = [
- sources."ansi-regex-3.0.0"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-2.1.1"
- sources."strip-ansi-4.0.0"
- sources."wrap-ansi-3.0.1"
- ];
- })
sources."loglevel-1.7.1"
sources."long-4.0.0"
sources."lowdb-1.0.0"
- (sources."lower-case-2.0.2" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
sources."lowercase-keys-1.0.1"
(sources."lru-cache-5.1.1" // {
dependencies = [
sources."yallist-3.1.1"
];
})
- sources."magic-string-0.25.7"
sources."make-dir-1.3.0"
- sources."make-error-1.3.6"
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
- (sources."matcher-3.0.0" // {
- dependencies = [
- sources."escape-string-regexp-4.0.0"
- ];
- })
sources."media-typer-0.3.0"
sources."merge-1.2.1"
sources."merge-descriptors-1.0.1"
- (sources."merge-source-map-1.1.0" // {
- dependencies = [
- sources."source-map-0.6.1"
- ];
- })
sources."merge-stream-2.0.0"
sources."merge2-1.4.1"
sources."methods-1.1.2"
- sources."micromatch-4.0.2"
+ (sources."micromatch-3.1.10" // {
+ dependencies = [
+ sources."extend-shallow-3.0.2"
+ sources."is-extendable-1.0.1"
+ ];
+ })
sources."mime-1.6.0"
sources."mime-db-1.46.0"
sources."mime-types-2.1.29"
sources."mimic-fn-1.2.0"
sources."mimic-response-1.0.1"
- sources."minimalistic-assert-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
(sources."mixin-deep-1.3.2" // {
@@ -64937,10 +64291,8 @@ in
];
})
sources."mkdirp-0.5.5"
- sources."moment-2.29.1"
sources."ms-2.0.0"
sources."mute-stream-0.0.8"
- sources."nan-2.14.2"
sources."nanoid-2.1.11"
(sources."nanomatch-1.2.13" // {
dependencies = [
@@ -64948,7 +64300,6 @@ in
sources."is-extendable-1.0.1"
];
})
- sources."natural-orderby-2.0.3"
sources."ndjson-1.5.0"
(sources."neat-csv-2.1.0" // {
dependencies = [
@@ -64958,43 +64309,32 @@ in
sources."negotiator-0.6.2"
sources."neo-async-2.6.2"
sources."nice-try-1.0.5"
- (sources."no-case-3.0.4" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
sources."node-dir-0.1.17"
sources."node-fetch-2.6.1"
sources."node-ipc-9.1.4"
sources."node-modules-regexp-1.0.0"
- (sources."node-notifier-9.0.0" // {
+ (sources."node-notifier-9.0.1" // {
dependencies = [
sources."is-wsl-2.2.0"
sources."lru-cache-6.0.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."uuid-8.3.2"
sources."which-2.0.2"
];
})
sources."node-releases-1.1.71"
- (sources."nodemon-1.19.4" // {
- dependencies = [
- sources."debug-3.2.7"
- sources."ms-2.1.3"
- sources."semver-5.7.1"
- ];
- })
- sources."nopt-1.0.10"
(sources."normalize-package-data-2.5.0" // {
dependencies = [
sources."semver-5.7.1"
];
})
- sources."normalize-path-3.0.0"
- sources."normalize-url-3.3.0"
+ (sources."normalize-url-2.0.1" // {
+ dependencies = [
+ sources."sort-keys-2.0.0"
+ ];
+ })
sources."npm-conf-1.1.3"
sources."npm-run-path-2.0.2"
- sources."number-is-nan-1.0.1"
sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
(sources."object-copy-0.1.0" // {
@@ -65013,7 +64353,6 @@ in
sources."object-inspect-1.9.0"
sources."object-keys-1.1.1"
sources."object-path-0.11.5"
- sources."object-treeify-1.1.31"
sources."object-visit-1.0.1"
sources."object.assign-4.1.2"
sources."object.getownpropertydescriptors-2.1.2"
@@ -65022,7 +64361,6 @@ in
sources."once-1.4.0"
sources."onetime-2.0.1"
sources."open-6.4.0"
- sources."optimism-0.10.3"
(sources."ora-3.4.0" // {
dependencies = [
sources."strip-ansi-5.2.0"
@@ -65035,49 +64373,20 @@ in
sources."p-is-promise-1.1.0"
sources."p-limit-2.3.0"
sources."p-locate-3.0.0"
- sources."p-map-2.1.0"
sources."p-timeout-2.0.1"
sources."p-try-2.2.0"
- (sources."package-json-4.0.1" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
- (sources."param-case-3.0.4" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
sources."parse-git-config-2.0.3"
sources."parse-json-5.2.0"
sources."parse-passwd-1.0.0"
- (sources."parse-path-4.0.3" // {
- dependencies = [
- sources."qs-6.9.6"
- ];
- })
- sources."parse-url-5.0.2"
sources."parseurl-1.3.3"
- (sources."pascal-case-3.1.2" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
sources."pascalcase-0.1.1"
- sources."password-prompt-1.1.2"
- (sources."path-case-3.0.4" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
sources."path-dirname-1.0.2"
sources."path-exists-3.0.0"
sources."path-is-absolute-1.0.1"
- sources."path-is-inside-1.0.2"
sources."path-key-2.0.1"
sources."path-parse-1.0.6"
sources."path-to-regexp-0.1.7"
- sources."path-type-4.0.0"
+ sources."path-type-3.0.0"
sources."pend-1.2.0"
sources."performance-now-2.1.0"
sources."picomatch-2.2.2"
@@ -65102,36 +64411,21 @@ in
];
})
sources."posix-character-classes-0.1.1"
- (sources."postcss-8.2.7" // {
- dependencies = [
- sources."nanoid-3.1.20"
- sources."source-map-0.6.1"
- ];
- })
- sources."postcss-modules-4.0.0"
- sources."postcss-modules-extract-imports-3.0.0"
- sources."postcss-modules-local-by-default-4.0.0"
- sources."postcss-modules-scope-3.0.0"
- sources."postcss-modules-values-4.0.0"
- sources."postcss-selector-parser-6.0.4"
- sources."postcss-value-parser-4.1.0"
- sources."prepend-http-1.0.4"
+ sources."prepend-http-2.0.0"
sources."prismjs-1.23.0"
sources."private-0.1.8"
sources."process-exists-3.1.0"
sources."process-nextick-args-2.0.1"
sources."proto-list-1.2.4"
- sources."protocols-1.4.8"
sources."proxy-addr-2.0.6"
sources."ps-list-4.1.0"
sources."pseudomap-1.0.2"
sources."psl-1.8.0"
- sources."pstree.remy-1.1.8"
sources."pump-3.0.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
- sources."query-string-6.14.1"
- sources."queue-microtask-1.2.2"
+ sources."query-string-5.1.1"
+ sources."queue-microtask-1.2.3"
sources."range-parser-1.2.1"
(sources."raw-body-2.4.0" // {
dependencies = [
@@ -65140,44 +64434,20 @@ in
sources."setprototypeof-1.1.1"
];
})
- sources."rc-1.2.8"
sources."read-pkg-5.2.0"
(sources."readable-stream-2.3.7" // {
dependencies = [
sources."safe-buffer-5.1.2"
];
})
- (sources."readdirp-2.2.1" // {
- dependencies = [
- (sources."braces-2.3.2" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."extend-shallow-3.0.2"
- (sources."fill-range-4.0.0" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."is-extendable-1.0.1"
- sources."is-number-3.0.0"
- sources."kind-of-3.2.2"
- sources."micromatch-3.1.10"
- sources."to-regex-range-2.1.1"
- ];
- })
(sources."recast-0.18.10" // {
dependencies = [
- sources."ast-types-0.13.3"
sources."source-map-0.6.1"
];
})
- sources."rechoir-0.6.2"
- sources."redeyed-2.1.1"
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
(sources."regex-not-1.0.2" // {
dependencies = [
@@ -65186,22 +64456,17 @@ in
];
})
sources."regexpu-core-4.7.1"
- sources."registry-auth-token-3.4.0"
- sources."registry-url-3.1.0"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
})
- sources."remove-trailing-separator-1.1.0"
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
sources."request-2.88.2"
sources."require-directory-2.1.1"
- sources."require-main-filename-2.0.0"
sources."resolve-1.20.0"
- sources."resolve-from-3.0.0"
sources."resolve-url-0.2.1"
sources."responselike-1.0.2"
sources."restore-cursor-2.0.0"
@@ -65209,7 +64474,6 @@ in
sources."retry-0.12.0"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
- sources."roarr-2.15.4"
sources."rss-parser-3.12.0"
sources."run-async-2.4.1"
sources."run-parallel-1.2.0"
@@ -65222,12 +64486,6 @@ in
sources."seek-bzip-1.0.6"
sources."select-1.1.2"
sources."semver-6.3.0"
- sources."semver-compare-1.0.0"
- (sources."semver-diff-2.1.0" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
(sources."send-0.17.1" // {
dependencies = [
(sources."debug-2.6.9" // {
@@ -65240,35 +64498,17 @@ in
sources."setprototypeof-1.1.1"
];
})
- (sources."sentence-case-3.0.4" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
- (sources."serialize-error-7.0.1" // {
- dependencies = [
- sources."type-fest-0.13.1"
- ];
- })
sources."serve-static-1.14.1"
- sources."set-blocking-2.0.0"
sources."set-value-2.0.1"
sources."setprototypeof-1.2.0"
sources."sha.js-2.4.11"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
sources."shell-quote-1.7.2"
- sources."shelljs-0.8.4"
sources."shellwords-0.1.1"
sources."shortid-2.2.16"
sources."signal-exit-3.0.3"
sources."slash-3.0.0"
- sources."slice-ansi-0.0.4"
- (sources."snake-case-3.0.4" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
(sources."snapdragon-0.8.2" // {
dependencies = [
sources."debug-2.6.9"
@@ -65307,12 +64547,10 @@ in
];
})
sources."source-map-url-0.4.1"
- sources."sourcemap-codec-1.4.8"
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.7"
- sources."split-on-first-1.1.0"
(sources."split-string-3.1.0" // {
dependencies = [
sources."extend-shallow-3.0.2"
@@ -65320,7 +64558,7 @@ in
];
})
sources."split2-2.2.0"
- sources."sprintf-js-1.1.2"
+ sources."sprintf-js-1.0.3"
sources."sshpk-1.16.1"
(sources."static-extend-0.1.2" // {
dependencies = [
@@ -65342,9 +64580,13 @@ in
sources."statuses-1.5.0"
sources."steno-0.4.4"
sources."streamsearch-0.1.2"
- sources."strict-uri-encode-2.0.0"
- sources."string-hash-1.1.3"
- sources."string-width-4.2.2"
+ sources."strict-uri-encode-1.1.0"
+ (sources."string-width-4.2.2" // {
+ dependencies = [
+ sources."emoji-regex-8.0.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ ];
+ })
sources."string.prototype.trimend-1.0.4"
sources."string.prototype.trimstart-1.0.4"
(sources."string_decoder-1.1.1" // {
@@ -65357,11 +64599,9 @@ in
sources."ansi-regex-5.0.0"
];
})
- sources."strip-bom-3.0.0"
sources."strip-dirs-2.1.0"
sources."strip-eof-1.0.0"
sources."strip-final-newline-2.0.0"
- sources."strip-json-comments-2.0.1"
sources."strip-outer-1.0.1"
(sources."subscriptions-transport-ws-0.9.18" // {
dependencies = [
@@ -65369,21 +64609,7 @@ in
];
})
sources."supports-color-5.5.0"
- (sources."supports-hyperlinks-1.0.1" // {
- dependencies = [
- sources."has-flag-2.0.0"
- ];
- })
sources."symbol-observable-1.2.0"
- (sources."table-5.4.6" // {
- dependencies = [
- sources."emoji-regex-7.0.3"
- sources."is-fullwidth-code-point-2.0.0"
- sources."slice-ansi-2.1.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
- ];
- })
sources."tar-stream-1.6.2"
(sources."taskkill-3.1.0" // {
dependencies = [
@@ -65411,15 +64637,7 @@ in
sources."rimraf-2.6.3"
];
})
- (sources."term-size-1.2.0" // {
- dependencies = [
- sources."cross-spawn-5.1.0"
- sources."execa-0.7.0"
- sources."get-stream-3.0.0"
- sources."lru-cache-4.1.5"
- sources."yallist-2.1.2"
- ];
- })
+ sources."term-size-2.2.1"
sources."through-2.3.8"
sources."through2-2.0.5"
sources."timed-out-4.0.1"
@@ -65438,35 +64656,24 @@ in
sources."is-extendable-1.0.1"
];
})
- sources."to-regex-range-5.0.1"
+ sources."to-regex-range-2.1.1"
sources."toidentifier-1.0.0"
- sources."touch-3.1.0"
sources."tough-cookie-2.5.0"
- sources."treeify-1.1.0"
sources."trim-repeated-1.0.0"
sources."ts-invariant-0.4.4"
- sources."ts-node-8.10.2"
sources."tslib-1.14.1"
- sources."tty-1.0.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-fest-0.6.0"
sources."type-is-1.6.18"
- sources."typescript-3.9.9"
+ sources."typescript-4.1.5"
sources."unbox-primitive-1.0.0"
sources."unbzip2-stream-1.4.3"
- (sources."undefsafe-2.0.3" // {
- dependencies = [
- sources."debug-2.6.9"
- ];
- })
sources."unicode-canonical-property-names-ecmascript-1.0.4"
sources."unicode-match-property-ecmascript-1.0.4"
sources."unicode-match-property-value-ecmascript-1.2.0"
sources."unicode-property-aliases-ecmascript-1.1.0"
sources."union-value-1.0.1"
- sources."uniq-1.0.1"
- sources."unique-string-1.0.0"
sources."universalify-0.1.2"
sources."unpipe-1.0.0"
(sources."unset-value-1.0.0" // {
@@ -65479,31 +64686,9 @@ in
sources."has-values-0.1.4"
];
})
- sources."unzip-response-2.0.1"
- sources."upath-1.2.0"
- (sources."update-notifier-2.5.0" // {
- dependencies = [
- sources."ansi-regex-3.0.0"
- sources."boxen-1.3.0"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-2.1.1"
- sources."strip-ansi-4.0.0"
- sources."widest-line-2.0.1"
- ];
- })
- (sources."upper-case-2.0.2" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
- (sources."upper-case-first-2.0.2" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
sources."uri-js-4.4.1"
sources."urix-0.1.0"
- sources."url-parse-lax-1.0.0"
+ sources."url-parse-lax-3.0.0"
sources."url-to-options-1.0.1"
sources."use-3.1.1"
sources."util-deprecate-1.0.2"
@@ -65514,80 +64699,55 @@ in
sources."validate-npm-package-name-3.0.0"
sources."vary-1.1.2"
sources."verror-1.10.0"
- sources."vscode-jsonrpc-4.0.0"
- sources."vscode-languageserver-5.2.1"
- sources."vscode-languageserver-protocol-3.14.1"
- sources."vscode-languageserver-types-3.14.0"
- sources."vscode-uri-1.0.6"
sources."vue-2.6.12"
- (sources."vue-cli-plugin-apollo-0.21.3" // {
+ (sources."vue-codemod-0.0.5" // {
dependencies = [
- sources."cross-spawn-7.0.3"
- sources."execa-3.4.0"
- sources."fs-extra-8.1.0"
- sources."get-stream-5.2.0"
- sources."is-stream-2.0.0"
- sources."mimic-fn-2.1.0"
- sources."npm-run-path-4.0.1"
- sources."onetime-5.1.2"
- sources."p-finally-2.0.1"
- sources."path-key-3.1.1"
- sources."shebang-command-2.0.0"
- sources."shebang-regex-3.0.0"
- sources."which-2.0.2"
- ];
- })
- (sources."vue-codemod-0.0.4" // {
- dependencies = [
- sources."globby-10.0.2"
- sources."vue-3.0.7"
+ sources."@nodelib/fs.stat-2.0.4"
+ sources."array-union-2.1.0"
+ sources."braces-3.0.2"
+ sources."dir-glob-3.0.1"
+ sources."fast-glob-3.2.5"
+ sources."fill-range-7.0.1"
+ sources."glob-parent-5.1.2"
+ sources."globby-11.0.3"
+ sources."ignore-5.1.8"
+ sources."is-number-7.0.0"
+ sources."lru-cache-6.0.0"
+ sources."micromatch-4.0.2"
+ sources."path-type-4.0.0"
+ sources."source-map-0.6.1"
+ sources."to-regex-range-5.0.1"
];
})
sources."watch-1.0.2"
sources."wcwidth-1.0.1"
sources."which-1.3.1"
sources."which-boxed-primitive-1.0.2"
- sources."which-module-2.0.0"
sources."widest-line-3.1.0"
- (sources."wrap-ansi-4.0.0" // {
+ (sources."wrap-ansi-7.0.0" // {
dependencies = [
- sources."ansi-regex-3.0.0"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-2.1.1"
- sources."strip-ansi-4.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
];
})
sources."wrappy-1.0.2"
sources."write-file-atomic-2.4.3"
sources."ws-6.2.1"
- sources."xdg-basedir-3.0.0"
sources."xml2js-0.4.23"
sources."xmlbuilder-11.0.1"
sources."xss-1.0.8"
sources."xtend-4.0.2"
- sources."y18n-4.0.1"
+ sources."y18n-5.0.5"
sources."yallist-4.0.0"
(sources."yaml-front-matter-3.4.1" // {
dependencies = [
sources."commander-1.0.0"
];
})
- (sources."yargs-15.4.1" // {
- dependencies = [
- sources."find-up-4.1.0"
- sources."locate-path-5.0.0"
- sources."p-locate-4.1.0"
- sources."path-exists-4.0.0"
- ];
- })
- (sources."yargs-parser-18.1.3" // {
- dependencies = [
- sources."camelcase-5.3.1"
- ];
- })
- sources."yarn-1.22.10"
+ sources."yargs-16.2.0"
+ sources."yargs-parser-20.2.7"
sources."yauzl-2.10.0"
- sources."yn-3.1.1"
sources."zen-observable-0.8.15"
sources."zen-observable-ts-0.8.21"
];
@@ -65728,10 +64888,10 @@ in
sources."@babel/code-frame-7.12.13"
sources."@babel/generator-7.13.9"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.13.8"
- sources."@babel/parser-7.13.9"
+ sources."@babel/highlight-7.13.10"
+ sources."@babel/parser-7.13.12"
sources."@babel/template-7.12.13"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@webassemblyjs/ast-1.11.0"
sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
sources."@webassemblyjs/helper-api-error-1.11.0"
@@ -65807,8 +64967,8 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.8"
- (sources."@babel/core-7.13.8" // {
+ sources."@babel/compat-data-7.13.12"
+ (sources."@babel/core-7.13.10" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -65818,24 +64978,24 @@ in
sources."source-map-0.5.7"
];
})
- sources."@babel/helper-compilation-targets-7.13.8"
+ sources."@babel/helper-compilation-targets-7.13.10"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- sources."@babel/helpers-7.13.0"
- sources."@babel/highlight-7.13.8"
- sources."@babel/parser-7.13.9"
+ sources."@babel/helpers-7.13.10"
+ sources."@babel/highlight-7.13.10"
+ sources."@babel/parser-7.13.12"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."JSV-4.0.2"
sources."ansi-styles-3.2.1"
sources."array-unique-0.3.2"
@@ -65843,7 +65003,7 @@ in
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."browserslist-4.16.3"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
@@ -65854,7 +65014,7 @@ in
sources."convert-source-map-1.7.0"
sources."debug-4.3.2"
sources."ejs-3.1.6"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
sources."ensure-posix-path-1.1.1"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
@@ -65947,8 +65107,8 @@ in
};
dependencies = [
sources."@types/glob-7.1.3"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.32"
+ sources."@types/minimatch-3.0.4"
+ sources."@types/node-14.14.35"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."chromium-pickle-js-0.2.0"
@@ -65973,6 +65133,624 @@ in
bypassCache = true;
reconstructLock = true;
};
+ balanceofsatoshis = nodeEnv.buildNodePackage {
+ name = "balanceofsatoshis";
+ packageName = "balanceofsatoshis";
+ version = "8.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.2.tgz";
+ sha512 = "nDCutvBxOka9sBOXakzi8mt/5fHZ7UVCTpcsxJ3Z6XxuXGVY+bhfB08/LvqcoADTPZNx22a2nkMPy6MHssFAKw==";
+ };
+ dependencies = [
+ sources."@alexbosworth/html2unicode-1.1.5"
+ (sources."@alexbosworth/request-2.88.3" // {
+ dependencies = [
+ sources."safe-buffer-5.2.0"
+ ];
+ })
+ sources."@alexbosworth/saxophone-0.6.2"
+ sources."@cto.af/textdecoder-0.0.0"
+ (sources."@grpc/grpc-js-1.2.10" // {
+ dependencies = [
+ sources."@types/node-14.14.35"
+ ];
+ })
+ sources."@grpc/proto-loader-0.5.6"
+ sources."@handsontable/formulajs-2.0.2"
+ sources."@mitmaro/errors-1.0.0"
+ sources."@mitmaro/http-authorization-header-1.0.0"
+ sources."@protobufjs/aspromise-1.1.2"
+ sources."@protobufjs/base64-1.1.2"
+ sources."@protobufjs/codegen-2.0.4"
+ sources."@protobufjs/eventemitter-1.1.0"
+ sources."@protobufjs/fetch-1.1.0"
+ sources."@protobufjs/float-1.0.2"
+ sources."@protobufjs/inquire-1.1.0"
+ sources."@protobufjs/path-1.1.2"
+ sources."@protobufjs/pool-1.1.0"
+ sources."@protobufjs/utf8-1.1.0"
+ sources."@sindresorhus/is-0.14.0"
+ sources."@szmarczak/http-timer-1.1.2"
+ sources."@types/body-parser-1.19.0"
+ sources."@types/caseless-0.12.2"
+ sources."@types/connect-3.4.34"
+ sources."@types/express-4.17.11"
+ sources."@types/express-serve-static-core-4.17.19"
+ sources."@types/long-4.0.1"
+ sources."@types/mime-1.3.2"
+ sources."@types/node-10.12.18"
+ sources."@types/qs-6.9.6"
+ sources."@types/range-parser-1.2.3"
+ (sources."@types/request-2.48.5" // {
+ dependencies = [
+ sources."form-data-2.5.1"
+ ];
+ })
+ sources."@types/serve-static-1.13.9"
+ sources."@types/tough-cookie-4.0.0"
+ sources."@types/ws-7.4.0"
+ sources."abort-controller-3.0.0"
+ sources."accepts-1.3.7"
+ (sources."agent-base-6.0.2" // {
+ dependencies = [
+ sources."debug-4.3.2"
+ sources."ms-2.1.2"
+ ];
+ })
+ sources."ajv-6.12.6"
+ sources."ansi-0.3.1"
+ (sources."ansi-align-3.0.0" // {
+ dependencies = [
+ sources."ansi-regex-4.1.0"
+ sources."emoji-regex-7.0.3"
+ sources."string-width-3.1.0"
+ sources."strip-ansi-5.2.0"
+ ];
+ })
+ sources."ansi-escapes-1.4.0"
+ sources."ansi-regex-3.0.0"
+ sources."ansi-styles-2.2.1"
+ (sources."are-we-there-yet-1.1.5" // {
+ dependencies = [
+ sources."readable-stream-2.3.7"
+ sources."safe-buffer-5.1.2"
+ sources."string_decoder-1.1.1"
+ ];
+ })
+ sources."array-flatten-1.1.1"
+ sources."arrify-2.0.1"
+ sources."asciichart-1.5.25"
+ sources."asn1-0.2.4"
+ sources."assert-plus-1.0.0"
+ sources."astral-regex-2.0.0"
+ sources."async-3.2.0"
+ sources."asyncjs-util-1.2.3"
+ sources."asynckit-0.4.0"
+ sources."aws-sign2-0.7.0"
+ sources."aws4-1.9.1"
+ sources."base-x-3.0.8"
+ sources."base64-js-1.5.1"
+ (sources."basic-auth-2.0.1" // {
+ dependencies = [
+ sources."safe-buffer-5.1.2"
+ ];
+ })
+ sources."bcrypt-pbkdf-1.0.2"
+ sources."bech32-1.1.4"
+ sources."bessel-1.0.2"
+ sources."bignumber.js-9.0.1"
+ sources."bindings-1.5.0"
+ sources."bip174-2.0.1"
+ sources."bip32-2.0.6"
+ sources."bip65-1.0.3"
+ sources."bip66-1.1.5"
+ sources."bip68-1.0.4"
+ sources."bitcoin-ops-1.4.1"
+ sources."bitcoinjs-lib-5.2.0"
+ sources."bluebird-3.7.2"
+ sources."bn.js-4.12.0"
+ (sources."body-parser-1.19.0" // {
+ dependencies = [
+ sources."qs-6.7.0"
+ ];
+ })
+ sources."bolt03-1.2.7"
+ (sources."bolt07-1.7.1" // {
+ dependencies = [
+ sources."bn.js-5.2.0"
+ ];
+ })
+ sources."bolt09-0.1.3"
+ (sources."boxen-5.0.0" // {
+ dependencies = [
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."chalk-4.1.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."string-width-4.2.2"
+ sources."strip-ansi-6.0.0"
+ sources."supports-color-7.2.0"
+ sources."type-fest-0.20.2"
+ ];
+ })
+ sources."brorand-1.1.0"
+ sources."bs58-4.0.1"
+ sources."bs58check-2.1.2"
+ sources."buffer-alloc-1.2.0"
+ sources."buffer-alloc-unsafe-1.1.0"
+ sources."buffer-equal-constant-time-1.0.1"
+ sources."buffer-fill-1.0.0"
+ sources."buffer-from-1.1.1"
+ sources."bytes-3.1.0"
+ (sources."cacheable-request-6.1.0" // {
+ dependencies = [
+ sources."get-stream-5.2.0"
+ sources."lowercase-keys-2.0.0"
+ ];
+ })
+ sources."camelcase-6.2.0"
+ sources."caporal-1.4.0"
+ sources."caseless-0.12.0"
+ sources."cbor-7.0.3"
+ sources."cert-info-1.5.1"
+ (sources."chalk-1.1.3" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ sources."strip-ansi-3.0.1"
+ ];
+ })
+ sources."chardet-0.7.0"
+ sources."ci-info-2.0.0"
+ sources."cipher-base-1.0.4"
+ sources."cli-boxes-2.2.1"
+ sources."cli-cursor-1.0.2"
+ sources."cli-table3-0.5.1"
+ sources."cli-width-2.2.1"
+ sources."clone-response-1.0.2"
+ sources."code-point-at-1.1.0"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
+ sources."colorette-1.2.2"
+ sources."colors-1.4.0"
+ sources."combined-stream-1.0.8"
+ sources."commander-6.2.1"
+ (sources."concat-stream-1.6.2" // {
+ dependencies = [
+ sources."readable-stream-2.3.7"
+ sources."safe-buffer-5.1.2"
+ sources."string_decoder-1.1.1"
+ ];
+ })
+ sources."configstore-5.0.1"
+ (sources."content-disposition-0.5.3" // {
+ dependencies = [
+ sources."safe-buffer-5.1.2"
+ ];
+ })
+ sources."content-type-1.0.4"
+ sources."cookie-0.4.0"
+ sources."cookie-signature-1.0.6"
+ sources."core-util-is-1.0.2"
+ sources."cors-2.8.5"
+ sources."create-hash-1.2.0"
+ sources."create-hmac-1.1.7"
+ sources."crypto-js-4.0.0"
+ sources."crypto-random-string-2.0.0"
+ sources."csv-parse-4.15.3"
+ sources."cycle-1.0.3"
+ sources."dashdash-1.14.1"
+ sources."debug-2.6.9"
+ sources."decompress-response-3.3.0"
+ sources."deep-extend-0.6.0"
+ sources."defer-to-connect-1.1.3"
+ sources."define-property-1.0.0"
+ sources."delayed-stream-1.0.0"
+ sources."delegates-1.0.0"
+ sources."depd-1.1.2"
+ sources."destroy-1.0.4"
+ sources."dot-prop-5.3.0"
+ sources."duplexer3-0.1.4"
+ sources."ecc-jsbn-0.1.2"
+ sources."ecdsa-sig-formatter-1.0.11"
+ sources."ee-first-1.1.1"
+ sources."elliptic-6.5.4"
+ sources."emoji-regex-8.0.0"
+ sources."encodeurl-1.0.2"
+ sources."end-of-stream-1.4.4"
+ sources."escape-goat-2.1.1"
+ sources."escape-html-1.0.3"
+ sources."escape-string-regexp-1.0.5"
+ sources."etag-1.8.1"
+ sources."event-target-shim-5.0.1"
+ sources."exit-hook-1.1.1"
+ (sources."express-4.17.1" // {
+ dependencies = [
+ sources."qs-6.7.0"
+ sources."safe-buffer-5.1.2"
+ ];
+ })
+ sources."extend-3.0.2"
+ sources."external-editor-1.1.1"
+ sources."extsprintf-1.3.0"
+ sources."eyes-0.1.8"
+ sources."fast-deep-equal-3.1.3"
+ sources."fast-json-stable-stringify-2.1.0"
+ sources."fast-levenshtein-2.0.6"
+ sources."fast-text-encoding-1.0.3"
+ sources."figures-1.7.0"
+ sources."file-uri-to-path-1.0.0"
+ sources."finalhandler-1.1.2"
+ sources."forever-agent-0.6.1"
+ sources."form-data-3.0.0"
+ sources."forwarded-0.1.2"
+ sources."fresh-0.5.2"
+ sources."gauge-1.2.7"
+ sources."gaxios-4.2.0"
+ sources."gcp-metadata-4.2.1"
+ sources."get-stream-4.1.0"
+ sources."getpass-0.1.7"
+ sources."global-dirs-3.0.0"
+ (sources."goldengate-10.0.2" // {
+ dependencies = [
+ sources."bn.js-5.2.0"
+ ];
+ })
+ sources."google-auth-library-6.1.6"
+ sources."google-p12-pem-3.0.3"
+ sources."got-9.6.0"
+ sources."graceful-fs-4.2.6"
+ sources."gtoken-5.2.1"
+ sources."har-schema-2.0.0"
+ sources."har-validator-5.1.3"
+ (sources."has-ansi-2.0.0" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ ];
+ })
+ sources."has-flag-4.0.0"
+ sources."has-unicode-2.0.1"
+ sources."has-yarn-2.1.0"
+ sources."hash-base-3.1.0"
+ sources."hash.js-1.1.7"
+ sources."hmac-drbg-1.0.1"
+ sources."hot-formula-parser-4.0.0"
+ sources."http-cache-semantics-4.1.0"
+ (sources."http-errors-1.7.2" // {
+ dependencies = [
+ sources."inherits-2.0.3"
+ ];
+ })
+ sources."http-signature-1.3.1"
+ (sources."https-proxy-agent-5.0.0" // {
+ dependencies = [
+ sources."debug-4.3.2"
+ sources."ms-2.1.2"
+ ];
+ })
+ sources."iconv-lite-0.4.24"
+ sources."import-lazy-4.0.0"
+ sources."imurmurhash-0.1.4"
+ sources."inherits-2.0.4"
+ sources."ini-2.0.0"
+ (sources."inquirer-8.0.0" // {
+ dependencies = [
+ sources."ansi-escapes-4.3.2"
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."chalk-4.1.0"
+ sources."cli-cursor-3.1.0"
+ sources."cli-width-3.0.0"
+ sources."external-editor-3.1.0"
+ sources."figures-3.2.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."mute-stream-0.0.8"
+ sources."onetime-5.1.2"
+ sources."restore-cursor-3.1.0"
+ sources."string-width-4.2.2"
+ sources."strip-ansi-6.0.0"
+ sources."supports-color-7.2.0"
+ sources."tmp-0.0.33"
+ ];
+ })
+ (sources."invoices-1.1.6" // {
+ dependencies = [
+ sources."bech32-2.0.0"
+ sources."bn.js-5.2.0"
+ ];
+ })
+ sources."ip-regex-2.1.0"
+ sources."ipaddr.js-1.9.1"
+ sources."is-accessor-descriptor-1.0.0"
+ sources."is-buffer-1.1.6"
+ sources."is-ci-2.0.0"
+ sources."is-data-descriptor-1.0.0"
+ sources."is-descriptor-1.0.2"
+ sources."is-fullwidth-code-point-2.0.0"
+ sources."is-installed-globally-0.4.0"
+ sources."is-npm-5.0.0"
+ (sources."is-number-3.0.0" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-obj-2.0.0"
+ sources."is-path-inside-3.0.3"
+ sources."is-stream-2.0.0"
+ sources."is-typedarray-1.0.0"
+ sources."is-yarn-global-0.3.0"
+ sources."isarray-1.0.0"
+ sources."isnumber-1.0.0"
+ sources."isstream-0.1.2"
+ sources."jsbn-0.1.1"
+ sources."json-bigint-1.0.0"
+ sources."json-buffer-3.0.0"
+ sources."json-schema-0.2.3"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-stringify-safe-5.0.1"
+ sources."json2csv-5.0.6"
+ sources."jsonparse-1.3.1"
+ sources."jsprim-1.4.1"
+ sources."jstat-1.9.4"
+ sources."jwa-2.0.0"
+ sources."jws-4.0.0"
+ sources."keyv-3.1.0"
+ sources."kind-of-6.0.3"
+ sources."latest-version-5.1.0"
+ (sources."lightning-3.2.20" // {
+ dependencies = [
+ sources."@types/node-14.14.32"
+ sources."bn.js-5.2.0"
+ ];
+ })
+ sources."ln-accounting-4.2.6"
+ sources."ln-service-51.3.1"
+ sources."ln-sync-0.4.4"
+ sources."ln-telegram-3.2.1"
+ sources."lodash-4.17.21"
+ sources."lodash.camelcase-4.3.0"
+ sources."lodash.difference-4.5.0"
+ sources."lodash.get-4.4.2"
+ sources."lodash.pad-4.5.1"
+ sources."lodash.padend-4.6.1"
+ sources."lodash.padstart-4.6.1"
+ sources."lodash.uniq-4.5.0"
+ sources."long-4.0.0"
+ sources."lowercase-keys-1.0.1"
+ sources."lru-cache-6.0.0"
+ (sources."macaroon-3.0.4" // {
+ dependencies = [
+ sources."tweetnacl-1.0.3"
+ ];
+ })
+ sources."make-dir-3.1.0"
+ sources."md5.js-1.3.5"
+ sources."media-typer-0.3.0"
+ sources."merge-descriptors-1.0.1"
+ sources."merkle-lib-2.0.10"
+ sources."methods-1.1.2"
+ sources."micromist-1.1.0"
+ sources."mime-1.6.0"
+ sources."mime-db-1.43.0"
+ sources."mime-types-2.1.26"
+ sources."mimic-fn-2.1.0"
+ sources."mimic-response-1.0.1"
+ sources."minimalistic-assert-1.0.1"
+ sources."minimalistic-crypto-utils-1.0.1"
+ sources."minimist-1.2.5"
+ sources."mkdirp-0.5.5"
+ sources."module-alias-2.2.2"
+ sources."moment-2.29.1"
+ (sources."morgan-1.10.0" // {
+ dependencies = [
+ sources."depd-2.0.0"
+ ];
+ })
+ sources."ms-2.0.0"
+ sources."mute-stream-0.0.6"
+ sources."nan-2.14.2"
+ sources."negotiator-0.6.2"
+ sources."node-addon-api-2.0.2"
+ sources."node-fetch-2.6.1"
+ sources."node-forge-0.10.0"
+ sources."node-gyp-build-4.2.3"
+ sources."nofilter-2.0.3"
+ sources."normalize-url-4.5.0"
+ sources."npmlog-2.0.4"
+ sources."number-is-nan-1.0.1"
+ sources."oauth-sign-0.9.0"
+ sources."object-assign-4.1.1"
+ sources."on-finished-2.3.0"
+ sources."on-headers-1.0.2"
+ sources."once-1.4.0"
+ sources."onetime-1.1.0"
+ sources."os-shim-0.1.3"
+ sources."os-tmpdir-1.0.2"
+ sources."p-cancelable-1.1.0"
+ sources."p-timeout-4.1.0"
+ sources."package-json-6.5.0"
+ sources."parseurl-1.3.3"
+ sources."path-to-regexp-0.1.7"
+ sources."performance-now-2.1.0"
+ sources."pinkie-2.0.4"
+ sources."pinkie-promise-2.0.1"
+ sources."prepend-http-2.0.0"
+ sources."prettyjson-1.2.1"
+ sources."probing-1.3.4"
+ sources."process-nextick-args-2.0.1"
+ (sources."protobufjs-6.10.2" // {
+ dependencies = [
+ sources."@types/node-13.13.47"
+ ];
+ })
+ sources."proxy-addr-2.0.6"
+ (sources."psbt-1.1.8" // {
+ dependencies = [
+ sources."bn.js-5.2.0"
+ ];
+ })
+ sources."psl-1.8.0"
+ sources."pump-3.0.0"
+ sources."punycode-2.1.1"
+ sources."pupa-2.1.1"
+ sources."pushdata-bitcoin-1.0.1"
+ sources."qrcode-terminal-0.12.0"
+ sources."qs-6.9.1"
+ sources."randombytes-2.1.0"
+ sources."range-parser-1.2.1"
+ sources."raw-body-2.4.0"
+ (sources."rc-1.2.8" // {
+ dependencies = [
+ sources."ini-1.3.8"
+ ];
+ })
+ sources."readable-stream-3.6.0"
+ sources."registry-auth-token-4.2.1"
+ sources."registry-url-5.1.0"
+ sources."require-from-string-2.0.2"
+ sources."responselike-1.0.2"
+ sources."restore-cursor-1.0.1"
+ sources."ripemd160-2.0.2"
+ sources."run-async-2.4.1"
+ sources."rx-4.1.0"
+ sources."rxjs-6.6.6"
+ sources."safe-buffer-5.2.1"
+ sources."safe-compare-1.1.4"
+ sources."safer-buffer-2.1.2"
+ sources."sandwich-stream-2.0.2"
+ sources."sanitize-filename-1.6.3"
+ sources."secp256k1-4.0.2"
+ sources."semver-6.3.0"
+ sources."semver-diff-3.1.1"
+ (sources."send-0.17.1" // {
+ dependencies = [
+ sources."ms-2.1.1"
+ ];
+ })
+ sources."serve-static-1.14.1"
+ sources."setprototypeof-1.1.1"
+ sources."sha.js-2.4.11"
+ sources."signal-exit-3.0.3"
+ sources."sjcl-1.0.8"
+ (sources."slice-ansi-4.0.0" // {
+ dependencies = [
+ sources."ansi-styles-4.3.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ ];
+ })
+ sources."spawn-sync-1.0.15"
+ sources."sshpk-1.16.1"
+ sources."stack-trace-0.0.10"
+ sources."stats-lite-2.2.0"
+ sources."statuses-1.5.0"
+ sources."string-width-2.1.1"
+ sources."string_decoder-1.3.0"
+ sources."strip-ansi-4.0.0"
+ sources."strip-json-comments-2.0.1"
+ sources."supports-color-2.0.0"
+ (sources."table-6.0.7" // {
+ dependencies = [
+ sources."ajv-7.2.3"
+ sources."ansi-regex-5.0.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."json-schema-traverse-1.0.0"
+ sources."string-width-4.2.2"
+ sources."strip-ansi-6.0.0"
+ ];
+ })
+ (sources."tabtab-2.2.2" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ sources."inquirer-1.2.3"
+ sources."is-fullwidth-code-point-1.0.0"
+ sources."string-width-1.0.2"
+ sources."strip-ansi-3.0.1"
+ ];
+ })
+ (sources."telegraf-4.1.2" // {
+ dependencies = [
+ sources."debug-4.3.2"
+ sources."ms-2.1.2"
+ ];
+ })
+ sources."through-2.3.8"
+ sources."tiny-emitter-2.1.0"
+ sources."tiny-secp256k1-1.1.6"
+ sources."tmp-0.0.29"
+ sources."to-readable-stream-1.0.0"
+ sources."toidentifier-1.0.0"
+ sources."tough-cookie-3.0.1"
+ sources."truncate-utf8-bytes-1.0.2"
+ sources."tslib-1.14.1"
+ sources."tunnel-agent-0.6.0"
+ sources."tweetnacl-0.14.5"
+ sources."tweetnacl-util-0.15.1"
+ sources."type-fest-0.21.3"
+ sources."type-is-1.6.18"
+ sources."typedarray-0.0.6"
+ sources."typedarray-to-buffer-3.1.5"
+ sources."typeforce-1.18.0"
+ sources."typegram-3.2.3"
+ sources."unique-string-2.0.0"
+ sources."unpipe-1.0.0"
+ (sources."update-notifier-5.1.0" // {
+ dependencies = [
+ sources."ansi-styles-4.3.0"
+ sources."chalk-4.1.0"
+ sources."import-lazy-2.1.0"
+ sources."semver-7.3.5"
+ sources."supports-color-7.2.0"
+ ];
+ })
+ sources."uri-js-4.4.1"
+ sources."url-parse-lax-3.0.0"
+ sources."utf8-byte-length-1.0.4"
+ sources."util-deprecate-1.0.2"
+ sources."utils-merge-1.0.1"
+ sources."uuid-3.4.0"
+ sources."varuint-bitcoin-1.1.2"
+ sources."vary-1.1.2"
+ sources."verror-1.10.0"
+ (sources."widest-line-3.1.0" // {
+ dependencies = [
+ sources."ansi-regex-5.0.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."string-width-4.2.2"
+ sources."strip-ansi-6.0.0"
+ ];
+ })
+ sources."wif-2.0.6"
+ sources."window-size-1.1.1"
+ (sources."winston-2.4.5" // {
+ dependencies = [
+ sources."async-1.0.0"
+ sources."colors-1.0.3"
+ ];
+ })
+ (sources."wrap-ansi-7.0.0" // {
+ dependencies = [
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."string-width-4.2.2"
+ sources."strip-ansi-6.0.0"
+ ];
+ })
+ sources."wrappy-1.0.2"
+ sources."write-file-atomic-3.0.3"
+ sources."ws-7.4.4"
+ sources."xdg-basedir-4.0.0"
+ sources."yallist-4.0.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Lightning balance CLI";
+ homepage = "https://github.com/alexbosworth/balanceofsatoshis#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
bash-language-server = nodeEnv.buildNodePackage {
name = "bash-language-server";
packageName = "bash-language-server";
@@ -66855,7 +66633,7 @@ in
sources."safe-buffer-5.1.2"
sources."safe-json-stringify-1.2.0"
sources."safer-buffer-2.1.2"
- (sources."semver-7.3.4" // {
+ (sources."semver-7.3.5" // {
dependencies = [
sources."lru-cache-6.0.0"
sources."yallist-4.0.0"
@@ -66976,7 +66754,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.45"
+ sources."@types/node-13.13.47"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.2.16"
sources."ajv-6.12.6"
@@ -67038,7 +66816,7 @@ in
sources."co-3.1.0"
sources."codepage-1.4.0"
sources."combined-stream-1.0.8"
- sources."commander-7.1.0"
+ sources."commander-7.2.0"
sources."compact2string-1.4.1"
sources."concat-map-0.0.1"
(sources."concat-stream-2.0.0" // {
@@ -67232,7 +67010,7 @@ in
sources."qap-3.3.1"
sources."qs-6.5.2"
sources."query-string-1.0.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-iterate-1.0.1"
@@ -67388,7 +67166,7 @@ in
sha512 = "9PI2OLv8PmnnZSNP3PN16gr/yMxBJinh/LMgjk66PBfVmAduojFzJ1pTYPE/vb4qBxHYP4BkEbR8Auxa+qyEvw==";
};
dependencies = [
- sources."@jsii/spec-1.24.0"
+ sources."@jsii/spec-1.26.0"
sources."@types/node-10.17.55"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
@@ -67401,7 +67179,7 @@ in
sources."cdk8s-1.0.0-beta.10"
sources."cliui-7.0.4"
sources."clone-2.1.2"
- (sources."codemaker-1.24.0" // {
+ (sources."codemaker-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
];
@@ -67459,31 +67237,31 @@ in
sources."is-weakmap-2.0.1"
sources."is-weakset-2.0.1"
sources."isarray-2.0.5"
- (sources."jsii-1.24.0" // {
+ (sources."jsii-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-pacmak-1.24.0" // {
+ (sources."jsii-pacmak-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-reflect-1.24.0" // {
+ (sources."jsii-reflect-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-rosetta-1.24.0" // {
+ (sources."jsii-rosetta-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.252" // {
+ (sources."jsii-srcmak-0.1.255" // {
dependencies = [
sources."fs-extra-9.1.0"
];
@@ -67505,7 +67283,7 @@ in
sources."object-is-1.1.5"
sources."object-keys-1.1.1"
sources."object.assign-4.1.2"
- sources."oo-ascii-tree-1.24.0"
+ sources."oo-ascii-tree-1.26.0"
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
sources."p-try-2.2.0"
@@ -67513,8 +67291,8 @@ in
sources."regexp.prototype.flags-1.3.1"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
- sources."rfdc-1.2.0"
- sources."semver-7.3.4"
+ sources."rfdc-1.3.0"
+ sources."semver-7.3.5"
(sources."semver-intersect-1.4.0" // {
dependencies = [
sources."semver-5.7.1"
@@ -67546,10 +67324,10 @@ in
sources."which-typed-array-1.1.4"
sources."wrap-ansi-7.0.0"
sources."xmlbuilder-15.1.1"
- sources."xmldom-0.4.0"
+ sources."xmldom-0.5.0"
sources."y18n-5.0.5"
sources."yallist-4.0.0"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.2"
(sources."yargs-15.4.1" // {
dependencies = [
sources."camelcase-5.3.1"
@@ -67560,7 +67338,7 @@ in
sources."yargs-parser-18.1.3"
];
})
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -67575,24 +67353,25 @@ in
cdktf-cli = nodeEnv.buildNodePackage {
name = "cdktf-cli";
packageName = "cdktf-cli";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.1.0.tgz";
- sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA==";
+ url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.2.0.tgz";
+ sha512 = "98fkx6+f5Xf2QJkjlzb0a+M/nG46o6xZt15IrXBk/uT2kVmsG+YztHBr86T5AXZZeXlNJ33pm0qUe3JEUIspaw==";
};
dependencies = [
- sources."@jsii/spec-1.24.0"
+ sources."@cdktf/hcl2json-0.2.0"
+ sources."@jsii/spec-1.26.0"
+ sources."@skorfmann/ink-confirm-input-3.0.0"
sources."@skorfmann/terraform-cloud-1.9.1"
- sources."@types/archiver-5.1.0"
- sources."@types/glob-7.1.3"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.32"
- sources."@types/readline-sync-1.4.3"
- sources."@types/stream-buffers-3.0.3"
- sources."@types/uuid-8.3.0"
+ sources."@types/node-14.14.35"
+ sources."@types/node-fetch-2.5.8"
sources."@types/yoga-layout-1.9.2"
- sources."ansi-escapes-4.3.1"
- sources."ansi-regex-5.0.0"
+ (sources."ansi-escapes-4.3.2" // {
+ dependencies = [
+ sources."type-fest-0.21.3"
+ ];
+ })
+ sources."ansi-regex-4.1.0"
sources."ansi-styles-4.3.0"
sources."archiver-5.3.0"
(sources."archiver-utils-2.1.0" // {
@@ -67601,11 +67380,9 @@ in
];
})
sources."array-filter-1.0.0"
- sources."array-includes-3.1.3"
- sources."array.prototype.flatmap-1.2.4"
- sources."arrify-2.0.1"
sources."astral-regex-2.0.0"
sources."async-3.2.0"
+ sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
sources."auto-bind-4.0.0"
sources."available-typed-arrays-1.0.2"
@@ -67620,11 +67397,12 @@ in
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
sources."case-1.6.3"
- sources."cdktf-0.1.0"
+ sources."cdktf-0.2.0"
sources."chalk-4.1.0"
sources."ci-info-2.0.0"
+ sources."cli-boxes-2.2.1"
sources."cli-cursor-3.1.0"
- sources."cli-spinners-1.3.1"
+ sources."cli-spinners-2.6.0"
sources."cli-truncate-2.1.0"
(sources."cliui-7.0.4" // {
dependencies = [
@@ -67632,14 +67410,17 @@ in
];
})
sources."clone-2.1.2"
+ sources."code-excerpt-3.0.0"
sources."codemaker-0.22.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."colors-1.4.0"
+ sources."combined-stream-1.0.8"
sources."commonmark-0.29.3"
sources."compress-commons-4.1.0"
sources."concat-map-0.0.1"
- sources."constructs-3.3.61"
+ sources."constructs-3.3.71"
+ sources."convert-to-spaces-1.0.2"
sources."core-util-is-1.0.2"
sources."crc-32-1.2.0"
sources."crc32-stream-4.0.2"
@@ -67652,9 +67433,10 @@ in
];
})
sources."define-properties-1.1.3"
+ sources."delay-5.0.0"
+ sources."delayed-stream-1.0.0"
sources."detect-indent-5.0.0"
sources."detect-newline-2.1.0"
- sources."doctrine-2.1.0"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."entities-2.0.3"
@@ -67666,14 +67448,13 @@ in
})
sources."es-to-primitive-1.2.1"
sources."escalade-3.1.1"
- sources."escape-string-regexp-4.0.0"
- sources."eslint-plugin-react-7.22.0"
- sources."esutils-2.0.3"
+ sources."escape-string-regexp-2.0.0"
sources."exit-on-epipe-1.0.1"
sources."find-up-4.1.0"
sources."flatted-2.0.2"
sources."follow-redirects-1.13.3"
sources."foreach-2.0.5"
+ sources."form-data-3.0.1"
sources."fs-constants-1.0.0"
sources."fs-extra-8.1.0"
sources."fs.realpath-1.0.0"
@@ -67687,27 +67468,21 @@ in
sources."has-flag-4.0.0"
sources."has-symbols-1.0.2"
sources."ieee754-1.2.1"
+ sources."indent-string-4.0.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
- (sources."ink-2.7.1" // {
+ (sources."ink-3.0.8" // {
dependencies = [
- sources."chalk-3.0.0"
+ sources."type-fest-0.12.0"
];
})
- sources."ink-confirm-input-2.0.0"
- sources."ink-spinner-3.1.0"
- (sources."ink-text-input-3.3.0" // {
- dependencies = [
- sources."chalk-3.0.0"
- ];
- })
- sources."internal-slot-1.0.3"
+ sources."ink-spinner-4.0.1"
+ sources."ink-text-input-4.0.1"
sources."is-arguments-1.1.0"
sources."is-bigint-1.0.1"
sources."is-boolean-object-1.1.0"
sources."is-callable-1.2.3"
sources."is-ci-2.0.0"
- sources."is-core-module-2.2.0"
sources."is-date-object-1.0.2"
sources."is-docker-2.1.1"
sources."is-fullwidth-code-point-3.0.0"
@@ -67724,7 +67499,7 @@ in
sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
sources."js-tokens-4.0.0"
- (sources."jsii-1.24.0" // {
+ (sources."jsii-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67732,18 +67507,19 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-pacmak-1.24.0" // {
+ (sources."jsii-pacmak-1.26.0" // {
dependencies = [
sources."camelcase-6.2.0"
- sources."codemaker-1.24.0"
+ sources."codemaker-1.26.0"
sources."decamelize-5.0.0"
+ sources."escape-string-regexp-4.0.0"
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
sources."universalify-2.0.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-reflect-1.24.0" // {
+ (sources."jsii-reflect-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67751,7 +67527,7 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-rosetta-1.24.0" // {
+ (sources."jsii-rosetta-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67759,7 +67535,7 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.252" // {
+ (sources."jsii-srcmak-0.1.255" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67768,71 +67544,53 @@ in
})
sources."jsonfile-4.0.0"
sources."jsonschema-1.4.0"
- sources."jsx-ast-utils-3.2.0"
(sources."lazystream-1.0.0" // {
dependencies = [
sources."readable-stream-2.3.7"
];
})
sources."locate-path-5.0.0"
+ sources."lodash-4.17.21"
sources."lodash.defaults-4.2.0"
sources."lodash.difference-4.5.0"
sources."lodash.flatten-4.4.0"
sources."lodash.isplainobject-4.0.6"
- sources."lodash.throttle-4.1.1"
sources."lodash.union-4.6.0"
- (sources."log-update-3.4.0" // {
- dependencies = [
- sources."ansi-escapes-3.2.0"
- sources."ansi-regex-4.1.0"
- sources."ansi-styles-3.2.1"
- sources."cli-cursor-2.1.0"
- sources."color-convert-1.9.3"
- sources."color-name-1.1.3"
- sources."emoji-regex-7.0.3"
- sources."is-fullwidth-code-point-2.0.0"
- sources."mimic-fn-1.2.0"
- sources."onetime-2.0.1"
- sources."restore-cursor-2.0.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
- sources."wrap-ansi-5.1.0"
- ];
- })
sources."log4js-6.3.0"
sources."loose-envify-1.4.0"
sources."lru-cache-6.0.0"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
sources."mdurl-1.0.1"
+ sources."mime-db-1.46.0"
+ sources."mime-types-2.1.29"
sources."mimic-fn-2.1.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."ms-2.1.2"
sources."ncp-2.0.0"
+ sources."node-fetch-2.6.1"
sources."normalize-path-3.0.0"
sources."object-assign-4.1.1"
sources."object-inspect-1.9.0"
sources."object-is-1.1.5"
sources."object-keys-1.1.1"
sources."object.assign-4.1.2"
- sources."object.entries-1.1.3"
- sources."object.fromentries-2.0.4"
- sources."object.values-1.1.3"
sources."once-1.4.0"
sources."onetime-5.1.2"
- sources."oo-ascii-tree-1.24.0"
+ sources."oo-ascii-tree-1.26.0"
sources."open-7.4.2"
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
sources."p-try-2.2.0"
+ sources."patch-console-1.0.0"
sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
- sources."path-parse-1.0.6"
sources."printj-1.1.2"
sources."process-nextick-args-2.0.1"
sources."prop-types-15.7.2"
sources."quick-lru-4.0.1"
sources."react-16.14.0"
+ sources."react-devtools-core-4.10.1"
sources."react-is-16.13.1"
sources."react-reconciler-0.24.0"
sources."readable-stream-3.6.0"
@@ -67841,24 +67599,25 @@ in
sources."regexp.prototype.flags-1.3.1"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
- sources."resolve-1.20.0"
sources."restore-cursor-3.1.0"
- sources."rfdc-1.2.0"
+ sources."rfdc-1.3.0"
sources."safe-buffer-5.1.2"
sources."scheduler-0.18.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-intersect-1.4.0" // {
dependencies = [
sources."semver-5.7.1"
];
})
sources."set-blocking-2.0.0"
+ sources."shell-quote-1.7.2"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.3"
sources."slice-ansi-3.0.0"
sources."sort-json-2.0.0"
sources."spdx-license-list-6.4.0"
sources."sscaff-1.2.0"
+ sources."stack-utils-2.0.3"
sources."stream-buffers-3.0.2"
(sources."streamroller-2.2.4" // {
dependencies = [
@@ -67867,21 +67626,23 @@ in
})
(sources."string-length-3.1.0" // {
dependencies = [
- sources."ansi-regex-4.1.0"
sources."astral-regex-1.0.0"
sources."strip-ansi-5.2.0"
];
})
sources."string-width-4.2.2"
- sources."string.prototype.matchall-4.0.4"
sources."string.prototype.repeat-0.2.0"
sources."string.prototype.trimend-1.0.4"
sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.1.1"
- sources."strip-ansi-6.0.0"
+ (sources."strip-ansi-6.0.0" // {
+ dependencies = [
+ sources."ansi-regex-5.0.0"
+ ];
+ })
sources."supports-color-7.2.0"
sources."tar-stream-2.2.0"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.15.1"
sources."typescript-3.9.9"
sources."unbox-primitive-1.0.0"
sources."universalify-0.1.2"
@@ -67894,8 +67655,9 @@ in
sources."widest-line-3.1.0"
sources."wrap-ansi-6.2.0"
sources."wrappy-1.0.2"
+ sources."ws-7.4.4"
sources."xmlbuilder-15.1.1"
- sources."xmldom-0.4.0"
+ sources."xmldom-0.5.0"
sources."y18n-5.0.5"
sources."yallist-4.0.0"
(sources."yargs-15.4.1" // {
@@ -67905,7 +67667,7 @@ in
sources."yargs-parser-18.1.3"
];
})
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
sources."yn-3.1.1"
sources."yoga-layout-prebuilt-1.10.0"
sources."zip-stream-4.1.0"
@@ -67923,16 +67685,16 @@ in
clean-css-cli = nodeEnv.buildNodePackage {
name = "clean-css-cli";
packageName = "clean-css-cli";
- version = "5.2.1";
+ version = "5.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.1.tgz";
- sha512 = "y+nSP8lcBWXWHqBVK1o1UQjUR/s1Xu3H7rSXtp4R03orU8gGCkmYZjwhALMww6E6JChjoshpLodV+VfjAufaHw==";
+ url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.2.tgz";
+ sha512 = "XlgBVTpEAsU/aT7gxAZ/g5Q8P9glHZeg6yfNvE7hYuvoozMdw5Wd46b12QtzuDVs8/7UZ/GCulS0VR9TI5NWRg==";
};
dependencies = [
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
- sources."clean-css-5.1.1"
- sources."commander-7.1.0"
+ sources."clean-css-5.1.2"
+ sources."commander-7.2.0"
sources."concat-map-0.0.1"
sources."fs.realpath-1.0.0"
sources."glob-7.1.6"
@@ -68095,10 +67857,10 @@ in
coc-diagnostic = nodeEnv.buildNodePackage {
name = "coc-diagnostic";
packageName = "coc-diagnostic";
- version = "0.18.0";
+ version = "0.18.1";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.18.0.tgz";
- sha512 = "6ghwTYVdJ/XMcoLb690DPcxVM3t2bCDKTFPqMfkamBhKRJNFJDSjxQiP3Njn5f7g4rYvIuBQdZ8wteB4dr/4HA==";
+ url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.18.1.tgz";
+ sha512 = "q7CbA3s5agpXjUzos0xbOrySqk3Z4IWJ5WnLDk9pbgTDLMmBHkS4enbGNOvsk4dpGGqmZZ5hr6wwgb2GWk+TOg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -68377,7 +68139,7 @@ in
];
})
sources."date-format-3.0.0"
- sources."debounce-1.2.0"
+ sources."debounce-1.2.1"
sources."debug-4.3.2"
sources."deep-extend-0.6.0"
sources."define-properties-1.1.3"
@@ -68476,10 +68238,10 @@ in
sources."rc-1.2.8"
sources."readable-stream-2.3.7"
sources."rfc-3986-1.0.1"
- sources."rfdc-1.2.0"
+ sources."rfdc-1.3.0"
sources."rimraf-3.0.2"
sources."safe-buffer-5.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."setimmediate-1.0.5"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
@@ -68547,20 +68309,24 @@ in
coc-prettier = nodeEnv.buildNodePackage {
name = "coc-prettier";
packageName = "coc-prettier";
- version = "1.1.22";
+ version = "1.1.23";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.22.tgz";
- sha512 = "4H7hWONnZ8kb0WzA9sd4HWMV1uDOMjQHYhLYEll+SShuZ11zUUWhg9tSiiY/srDJYKAUV2DsAE5kuoqYPa1jXg==";
+ url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.23.tgz";
+ sha512 = "9tjbN4O13DXlrNaZWtXozthLSW0LE+YjmBZf4LDdrpbfmzqLDvncDtOtqcRCd9LStoLPY7pv2o4Tucb2IrHjMw==";
};
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@eslint/eslintrc-0.4.0"
+ (sources."@eslint/eslintrc-0.4.0" // {
+ dependencies = [
+ sources."globals-12.4.0"
+ ];
+ })
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/eslint-visitor-keys-1.0.0"
@@ -68629,7 +68395,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-2.1.1"
sources."camelcase-keys-2.1.0"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
sources."capture-stack-trace-1.0.1"
sources."ccount-1.1.0"
(sources."chalk-4.1.0" // {
@@ -68727,14 +68493,14 @@ in
sources."domutils-1.7.0"
sources."dot-prop-5.3.0"
sources."duplexer3-0.1.4"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."enquirer-2.3.6"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
sources."escape-string-regexp-1.0.5"
- (sources."eslint-7.21.0" // {
+ (sources."eslint-7.22.0" // {
dependencies = [
sources."eslint-visitor-keys-2.0.0"
];
@@ -68868,7 +68634,11 @@ in
sources."glob-parent-5.1.2"
sources."glob-to-regexp-0.3.0"
sources."global-dirs-0.1.1"
- sources."globals-12.4.0"
+ (sources."globals-13.7.0" // {
+ dependencies = [
+ sources."type-fest-0.20.2"
+ ];
+ })
(sources."globby-6.1.0" // {
dependencies = [
sources."pify-2.3.0"
@@ -69257,7 +69027,7 @@ in
sources."rimraf-3.0.2"
sources."safe-buffer-5.2.1"
sources."safe-regex-1.1.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-2.1.0" // {
dependencies = [
sources."semver-5.7.1"
@@ -69385,7 +69155,7 @@ in
sources."svg-tags-1.0.0"
(sources."table-6.0.7" // {
dependencies = [
- sources."ajv-7.2.1"
+ sources."ajv-7.2.3"
sources."json-schema-traverse-1.0.0"
];
})
@@ -69515,13 +69285,13 @@ in
coc-pyright = nodeEnv.buildNodePackage {
name = "coc-pyright";
packageName = "coc-pyright";
- version = "1.1.118";
+ version = "1.1.123";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.118.tgz";
- sha512 = "QGMg/2IeDLnIJX972q5muqgaTtqQ/FBPGDR1WY2dHn0vckbhYaI8zuxrHveTTpqpxkAVimTHbAyfiUen11aQ+g==";
+ url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.123.tgz";
+ sha512 = "ebNooa4Wg94/jCNpiBi/+a6Kaci6hKUpcht2Ws548LSoI0a/rCAF+UMKfXQi5kVjIdTc8SNUC1pL6GYfna+y8Q==";
};
dependencies = [
- sources."pyright-1.1.118"
+ sources."pyright-1.1.125"
];
buildInputs = globalBuildInputs;
meta = {
@@ -69595,10 +69365,10 @@ in
coc-rust-analyzer = nodeEnv.buildNodePackage {
name = "coc-rust-analyzer";
packageName = "coc-rust-analyzer";
- version = "0.37.0";
+ version = "0.39.0";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.37.0.tgz";
- sha512 = "hATxP0epa85YwVzUSYivWgCChPENb9ugKC1G5TOD/flfPRUIGqVVJQDKbqCo+sWUbhYnGLeIl04CJfFhNk/xKA==";
+ url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.39.0.tgz";
+ sha512 = "DImRvpT8AhiAX6GvnbQyFLd55Es0SFpiU1xZfFKfGfmJLNypEQHB7jYTttE7kuuePFBKdWhLLINlexYObsnglg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -69672,31 +69442,31 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.8"
- sources."@babel/core-7.13.8"
+ sources."@babel/compat-data-7.13.12"
+ sources."@babel/core-7.13.10"
sources."@babel/generator-7.13.9"
- sources."@babel/helper-compilation-targets-7.13.8"
+ sources."@babel/helper-compilation-targets-7.13.10"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- sources."@babel/helpers-7.13.0"
- (sources."@babel/highlight-7.13.8" // {
+ sources."@babel/helpers-7.13.10"
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.13.9"
+ sources."@babel/parser-7.13.12"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@nodelib/fs.scandir-2.1.4"
sources."@nodelib/fs.stat-2.0.4"
sources."@nodelib/fs.walk-1.2.6"
@@ -69707,7 +69477,7 @@ in
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse-json-4.0.0"
sources."@types/unist-2.0.3"
- sources."ajv-7.2.1"
+ sources."ajv-7.2.3"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
sources."array-union-2.1.0"
@@ -69722,7 +69492,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
(sources."chalk-4.1.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -69760,7 +69530,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -69787,13 +69557,13 @@ in
sources."global-modules-2.0.0"
sources."global-prefix-3.0.0"
sources."globals-11.12.0"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."globjoin-0.1.4"
sources."gonzales-pe-4.3.0"
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
sources."has-flag-3.0.0"
- sources."hosted-git-info-3.0.8"
+ sources."hosted-git-info-4.0.2"
sources."html-tags-3.1.0"
sources."htmlparser2-3.10.1"
sources."ignore-5.1.8"
@@ -69823,6 +69593,7 @@ in
sources."is-plain-obj-2.1.0"
sources."is-regexp-2.1.0"
sources."is-typedarray-1.0.0"
+ sources."is-unicode-supported-0.1.0"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
sources."jsesc-2.5.2"
@@ -69834,10 +69605,10 @@ in
sources."lines-and-columns-1.1.6"
sources."locate-path-5.0.0"
sources."lodash-4.17.21"
- sources."log-symbols-4.0.0"
+ sources."log-symbols-4.1.0"
sources."longest-streak-2.0.4"
sources."lru-cache-6.0.0"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
sources."mathml-tag-names-2.1.3"
sources."mdast-util-from-markdown-0.8.5"
sources."mdast-util-to-markdown-0.6.5"
@@ -69856,9 +69627,9 @@ in
})
sources."ms-2.1.2"
sources."node-releases-1.1.71"
- (sources."normalize-package-data-3.0.0" // {
+ (sources."normalize-package-data-3.0.2" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."normalize-range-0.1.2"
@@ -69899,7 +69670,7 @@ in
sources."postcss-syntax-0.36.2"
sources."postcss-value-parser-4.1.0"
sources."punycode-2.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-4.0.1"
(sources."read-pkg-5.2.0" // {
dependencies = [
@@ -69988,8 +69759,8 @@ in
sources."wrappy-1.0.2"
sources."write-file-atomic-3.0.3"
sources."yallist-4.0.0"
- sources."yaml-1.10.0"
- sources."yargs-parser-20.2.6"
+ sources."yaml-1.10.2"
+ sources."yargs-parser-20.2.7"
sources."zwitch-1.0.5"
];
buildInputs = globalBuildInputs;
@@ -70047,7 +69818,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.13.8"
+ sources."@babel/highlight-7.13.10"
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
sources."balanced-match-1.0.0"
@@ -70162,12 +69933,16 @@ in
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@eslint/eslintrc-0.4.0"
+ (sources."@eslint/eslintrc-0.4.0" // {
+ dependencies = [
+ sources."globals-12.4.0"
+ ];
+ })
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
sources."ajv-6.12.6"
@@ -70201,8 +69976,8 @@ in
sources."emoji-regex-8.0.0"
sources."enquirer-2.3.6"
sources."escape-string-regexp-1.0.5"
- sources."eslint-7.21.0"
- sources."eslint-plugin-vue-7.7.0"
+ sources."eslint-7.22.0"
+ sources."eslint-plugin-vue-7.8.0"
sources."eslint-scope-5.1.1"
(sources."eslint-utils-2.1.0" // {
dependencies = [
@@ -70239,7 +70014,11 @@ in
sources."functional-red-black-tree-1.0.1"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globals-12.4.0"
+ (sources."globals-13.7.0" // {
+ dependencies = [
+ sources."type-fest-0.20.2"
+ ];
+ })
sources."has-1.0.3"
sources."has-flag-3.0.0"
sources."ignore-4.0.6"
@@ -70279,7 +70058,7 @@ in
sources."resolve-1.20.0"
sources."resolve-from-4.0.0"
sources."rimraf-3.0.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
(sources."slice-ansi-4.0.0" // {
@@ -70296,7 +70075,7 @@ in
sources."supports-color-5.5.0"
(sources."table-6.0.7" // {
dependencies = [
- sources."ajv-7.2.1"
+ sources."ajv-7.2.3"
sources."json-schema-traverse-1.0.0"
];
})
@@ -70612,7 +70391,7 @@ in
sources."@npmcli/move-file-1.1.2"
sources."@npmcli/node-gyp-1.0.2"
sources."@npmcli/promise-spawn-1.3.2"
- sources."@npmcli/run-script-1.8.3"
+ sources."@npmcli/run-script-1.8.4"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@tootallnate/once-1.1.2"
@@ -70673,7 +70452,7 @@ in
sources."braces-3.0.2"
sources."builtins-1.0.3"
sources."bytes-3.0.0"
- sources."cacache-15.0.5"
+ sources."cacache-15.0.6"
(sources."cacheable-request-6.1.0" // {
dependencies = [
sources."lowercase-keys-2.0.0"
@@ -70766,7 +70545,7 @@ in
sources."encoding-0.1.13"
sources."end-of-stream-1.4.4"
sources."endent-1.4.1"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."err-code-2.0.3"
sources."escape-goat-2.1.1"
sources."escape-html-1.0.3"
@@ -70816,7 +70595,7 @@ in
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
sources."global-dirs-2.1.0"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
(sources."got-9.6.0" // {
dependencies = [
sources."get-stream-4.1.0"
@@ -70829,7 +70608,7 @@ in
sources."has-flag-4.0.0"
sources."has-unicode-2.0.1"
sources."has-yarn-2.1.0"
- sources."hosted-git-info-3.0.8"
+ sources."hosted-git-info-4.0.2"
sources."http-cache-semantics-4.1.0"
(sources."http-errors-1.7.2" // {
dependencies = [
@@ -70987,9 +70766,9 @@ in
sources."npm-bundled-1.1.1"
sources."npm-install-checks-4.0.0"
sources."npm-normalize-package-bin-1.0.1"
- sources."npm-package-arg-8.1.1"
+ sources."npm-package-arg-8.1.2"
sources."npm-packlist-2.1.4"
- sources."npm-pick-manifest-6.1.0"
+ sources."npm-pick-manifest-6.1.1"
sources."npm-registry-fetch-9.0.0"
sources."npm-run-path-4.0.1"
sources."npmlog-4.1.2"
@@ -71021,7 +70800,7 @@ in
sources."semver-6.3.0"
];
})
- sources."pacote-11.2.7"
+ sources."pacote-11.3.1"
sources."parent-module-1.0.1"
sources."parseurl-1.3.3"
sources."path-exists-3.0.0"
@@ -71043,13 +70822,12 @@ in
sources."promzard-0.3.0"
sources."proxy-addr-2.0.6"
sources."psl-1.8.0"
- sources."puka-1.0.1"
sources."pump-3.0.0"
sources."punycode-2.1.1"
sources."pupa-2.1.1"
sources."q-1.5.1"
sources."qs-6.5.2"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."range-parser-1.2.1"
(sources."raw-body-2.4.0" // {
dependencies = [
@@ -71084,7 +70862,7 @@ in
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.1.4"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -71108,7 +70886,7 @@ in
sources."signal-exit-3.0.3"
sources."slash-3.0.0"
sources."smart-buffer-4.1.0"
- sources."socks-2.5.1"
+ sources."socks-2.6.0"
sources."socks-proxy-agent-5.0.0"
sources."spdx-correct-3.1.1"
sources."spdx-exceptions-2.3.0"
@@ -71126,7 +70904,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.34.15"
+ sources."systeminformation-4.34.19"
sources."tar-6.1.0"
sources."term-size-2.2.1"
sources."through-2.3.8"
@@ -71141,7 +70919,7 @@ in
sources."type-fest-0.8.1"
sources."type-is-1.6.18"
sources."typedarray-to-buffer-3.1.5"
- sources."underscore-1.12.0"
+ sources."underscore-1.12.1"
sources."unique-filename-1.1.1"
sources."unique-slug-2.0.2"
sources."unique-string-2.0.0"
@@ -71212,13 +70990,13 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.13.8"
+ sources."@babel/highlight-7.13.10"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/glob-7.1.3"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/minimist-1.2.1"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/normalize-package-data-2.4.0"
sources."aggregate-error-3.1.0"
sources."ansi-styles-3.2.1"
@@ -71382,7 +71160,7 @@ in
sources."locate-path-5.0.0"
sources."make-dir-3.1.0"
sources."map-cache-0.2.2"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
sources."map-visit-1.0.0"
sources."meow-6.1.1"
sources."merge2-1.4.1"
@@ -71589,12 +71367,13 @@ in
sources."@cycle/run-3.4.0"
sources."@cycle/time-0.10.1"
sources."@types/cookiejar-2.1.2"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/superagent-3.8.2"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
sources."asynckit-0.4.0"
+ sources."call-bind-1.0.2"
(sources."chalk-2.4.2" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -71632,7 +71411,7 @@ in
sources."event-emitter-0.3.5"
(sources."ext-1.4.0" // {
dependencies = [
- sources."type-2.3.0"
+ sources."type-2.5.0"
];
})
sources."extend-3.0.2"
@@ -71640,9 +71419,13 @@ in
sources."figures-2.0.0"
sources."form-data-2.5.1"
sources."formidable-1.2.2"
+ sources."function-bind-1.1.1"
+ sources."get-intrinsic-1.1.1"
sources."globalthis-1.0.2"
+ sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
+ sources."has-symbols-1.0.2"
sources."iconv-lite-0.4.24"
sources."inherits-2.0.4"
(sources."inquirer-3.3.0" // {
@@ -71673,13 +71456,14 @@ in
sources."mute-stream-0.0.7"
sources."next-tick-1.0.0"
sources."object-assign-4.1.1"
+ sources."object-inspect-1.9.0"
sources."object-keys-1.1.1"
sources."onetime-2.0.1"
sources."os-tmpdir-1.0.2"
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."pseudomap-1.0.2"
- sources."qs-6.9.6"
+ sources."qs-6.10.1"
sources."quicktask-1.1.0"
sources."raf-3.3.2"
sources."readable-stream-2.3.7"
@@ -71692,6 +71476,7 @@ in
sources."setimmediate-1.0.5"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
+ sources."side-channel-1.0.4"
sources."signal-exit-3.0.3"
sources."snabbdom-0.7.0"
sources."snabbdom-selector-1.2.1"
@@ -71831,10 +71616,10 @@ in
create-react-native-app = nodeEnv.buildNodePackage {
name = "create-react-native-app";
packageName = "create-react-native-app";
- version = "3.5.3";
+ version = "3.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.3.tgz";
- sha512 = "YJWlLKBx4tdOJ7NbUVqKATTAHB4IJTHSTJBAj0eBbdXdmpI4WGGS725MzoapgJPiBWUMtjgZcVcR5MHe3UHczQ==";
+ url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.6.0.tgz";
+ sha512 = "DlhSk4dbD4V+8ZnIRi3WW/Y+F90slstYUzbnz21pKxvMW1Pkri+081q+zAY1+piBq1wqUE5VbKrkXUKg019lnw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -72576,7 +72361,7 @@ in
sources."fs.realpath-1.0.0"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."graceful-fs-4.2.6"
sources."ignore-5.1.8"
sources."indent-string-4.0.0"
@@ -72602,7 +72387,7 @@ in
sources."path-is-absolute-1.0.1"
sources."path-type-4.0.0"
sources."picomatch-2.2.2"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
sources."run-parallel-1.2.0"
@@ -72662,15 +72447,15 @@ in
elasticdump = nodeEnv.buildNodePackage {
name = "elasticdump";
packageName = "elasticdump";
- version = "6.66.1";
+ version = "6.66.2";
src = fetchurl {
- url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.66.1.tgz";
- sha512 = "Bz3addITPTKoIpVP7UVFlszh5JkqeuA7+6zIT9odBD5sJ/bHF3ZN5zQJ73WiY2nyifp0q2HzEwa1u1+ULDITAg==";
+ url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.66.2.tgz";
+ sha512 = "9vWIUjRfuuOKu+qEgE1taqxx6yXX2OuD3yxxiwnCmiCTk+kq1QAu24rbDe5pdFvsBXzgTa6NT4dZ6i76uXgd6Q==";
};
dependencies = [
sources."@fast-csv/format-4.3.5"
sources."@fast-csv/parse-4.3.6"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."JSONStream-1.3.5"
sources."ajv-6.12.6"
sources."asn1-0.2.4"
@@ -72862,15 +72647,15 @@ in
sources."@types/glob-7.1.3"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.32"
+ sources."@types/minimatch-3.0.4"
+ sources."@types/node-14.14.35"
sources."@types/responselike-1.0.0"
sources."@types/yauzl-2.9.1"
sources."abbrev-1.1.1"
sources."ajv-6.12.6"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-5.0.0"
@@ -72919,7 +72704,7 @@ in
sources."chownr-1.1.4"
sources."chromium-pickle-js-0.2.0"
sources."cli-cursor-3.1.0"
- sources."cli-spinners-2.5.0"
+ sources."cli-spinners-2.6.0"
sources."cli-width-3.0.0"
(sources."cliui-7.0.4" // {
dependencies = [
@@ -72966,7 +72751,7 @@ in
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
sources."detect-libc-1.0.3"
- sources."detect-node-2.0.4"
+ sources."detect-node-2.0.5"
sources."duplexer3-0.1.4"
sources."ecc-jsbn-0.1.2"
sources."electron-notarize-1.0.0"
@@ -72980,7 +72765,7 @@ in
sources."emoji-regex-8.0.0"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."error-ex-1.3.2"
sources."es6-error-4.1.1"
sources."escalade-3.1.1"
@@ -73097,6 +72882,7 @@ in
sources."is-interactive-1.0.0"
sources."is-stream-1.1.0"
sources."is-typedarray-1.0.0"
+ sources."is-unicode-supported-0.1.0"
sources."is-utf8-0.2.1"
sources."is-windows-1.0.2"
sources."is-wsl-2.2.0"
@@ -73117,7 +72903,7 @@ in
sources."locate-path-2.0.0"
sources."lodash-4.17.21"
sources."lodash.get-4.4.2"
- sources."log-symbols-4.0.0"
+ sources."log-symbols-4.1.0"
sources."loud-rejection-1.6.0"
sources."lowercase-keys-2.0.0"
(sources."lru-cache-6.0.0" // {
@@ -73221,11 +73007,11 @@ in
sources."once-1.4.0"
sources."onetime-5.1.2"
sources."open-7.4.2"
- sources."ora-5.3.0"
+ sources."ora-5.4.0"
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.5"
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."p-defer-1.0.0"
sources."p-finally-1.0.0"
sources."p-is-promise-2.1.0"
@@ -73295,7 +73081,7 @@ in
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."semver-compare-1.0.0"
sources."serialize-error-7.0.1"
sources."set-blocking-2.0.0"
@@ -73386,7 +73172,7 @@ in
sources."string-width-4.2.2"
];
})
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
(sources."yarn-or-npm-3.0.1" // {
dependencies = [
sources."cross-spawn-6.0.5"
@@ -73438,57 +73224,57 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.8"
- (sources."@babel/core-7.13.8" // {
+ sources."@babel/compat-data-7.13.12"
+ (sources."@babel/core-7.13.10" // {
dependencies = [
sources."semver-6.3.0"
];
})
sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
- (sources."@babel/helper-compilation-targets-7.13.8" // {
+ (sources."@babel/helper-compilation-targets-7.13.10" // {
dependencies = [
sources."semver-6.3.0"
];
})
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- sources."@babel/helpers-7.13.0"
- sources."@babel/highlight-7.13.8"
- sources."@babel/parser-7.13.9"
+ sources."@babel/helpers-7.13.10"
+ sources."@babel/highlight-7.13.10"
+ sources."@babel/parser-7.13.12"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-syntax-jsx-7.12.13"
sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
sources."@babel/plugin-transform-destructuring-7.13.0"
sources."@babel/plugin-transform-parameters-7.13.0"
- sources."@babel/plugin-transform-react-jsx-7.12.17"
+ sources."@babel/plugin-transform-react-jsx-7.13.12"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@sindresorhus/is-4.0.0"
sources."@szmarczak/http-timer-4.0.5"
sources."@types/cacheable-request-6.0.1"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
sources."@types/minimist-1.2.1"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/normalize-package-data-2.4.0"
sources."@types/responselike-1.0.0"
sources."@types/yoga-layout-1.9.2"
sources."ajv-6.12.6"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-5.0.0"
@@ -73516,7 +73302,7 @@ in
sources."quick-lru-4.0.1"
];
})
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
sources."chalk-2.4.2"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.1"
@@ -73532,7 +73318,7 @@ in
sources."concat-map-0.0.1"
(sources."conf-7.1.2" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."convert-source-map-1.7.0"
@@ -73553,11 +73339,11 @@ in
})
sources."defer-to-connect-2.0.1"
sources."dot-prop-5.3.0"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."emojilib-2.4.0"
sources."end-of-stream-1.4.4"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."error-ex-1.3.2"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
@@ -73635,7 +73421,7 @@ in
];
})
sources."map-age-cleaner-0.1.3"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
sources."mem-6.1.1"
(sources."meow-7.1.1" // {
dependencies = [
@@ -73661,7 +73447,7 @@ in
sources."mimic-fn-2.1.0"
];
})
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."p-defer-1.0.0"
sources."p-finally-1.0.0"
sources."p-limit-2.3.0"
@@ -73804,7 +73590,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -73814,8 +73600,8 @@ in
sources."@fluentui/date-time-utilities-7.9.1"
sources."@fluentui/dom-utilities-1.1.2"
sources."@fluentui/keyboard-key-0.2.14"
- sources."@fluentui/react-7.162.1"
- sources."@fluentui/react-focus-7.17.5"
+ sources."@fluentui/react-7.165.1"
+ sources."@fluentui/react-focus-7.17.6"
sources."@fluentui/react-window-provider-1.0.2"
sources."@fluentui/theme-1.7.4"
(sources."@gulp-sourcemaps/identity-map-1.0.2" // {
@@ -73828,7 +73614,7 @@ in
sources."normalize-path-2.1.1"
];
})
- sources."@microsoft/load-themed-styles-1.10.149"
+ sources."@microsoft/load-themed-styles-1.10.153"
sources."@nodelib/fs.scandir-2.1.4"
sources."@nodelib/fs.stat-2.0.4"
sources."@nodelib/fs.walk-1.2.6"
@@ -73846,7 +73632,7 @@ in
sources."@types/connect-3.4.34"
sources."@types/engine.io-3.1.5"
sources."@types/express-4.17.8"
- sources."@types/express-serve-static-core-4.17.18"
+ sources."@types/express-serve-static-core-4.17.19"
sources."@types/fancy-log-1.3.0"
sources."@types/glob-7.1.3"
sources."@types/hls.js-0.13.1"
@@ -73855,7 +73641,7 @@ in
sources."@types/lodash-4.14.161"
sources."@types/material-design-lite-1.1.16"
sources."@types/mime-1.3.2"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/minimist-1.2.0"
sources."@types/mithril-2.0.3"
sources."@types/mkdirp-1.0.1"
@@ -73877,12 +73663,12 @@ in
sources."@types/sqlite3-3.1.6"
sources."@types/tough-cookie-4.0.0"
sources."@types/url-join-4.0.0"
- sources."@uifabric/foundation-7.9.25"
- sources."@uifabric/icons-7.5.22"
+ sources."@uifabric/foundation-7.9.26"
+ sources."@uifabric/icons-7.5.23"
sources."@uifabric/merge-styles-7.19.2"
- sources."@uifabric/react-hooks-7.13.12"
+ sources."@uifabric/react-hooks-7.14.0"
sources."@uifabric/set-version-7.0.24"
- sources."@uifabric/styling-7.18.1"
+ sources."@uifabric/styling-7.19.0"
sources."@uifabric/utilities-7.33.5"
sources."@webassemblyjs/ast-1.9.0"
sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
@@ -74062,7 +73848,7 @@ in
];
})
sources."bytes-3.1.0"
- (sources."cacache-15.0.5" // {
+ (sources."cacache-15.0.6" // {
dependencies = [
sources."chownr-2.0.0"
sources."fs-minipass-2.1.0"
@@ -74181,7 +73967,11 @@ in
];
})
sources."copy-descriptor-0.1.1"
- sources."copy-props-2.0.4"
+ (sources."copy-props-2.0.5" // {
+ dependencies = [
+ sources."is-plain-object-5.0.0"
+ ];
+ })
sources."core-js-2.6.12"
sources."core-util-is-1.0.2"
sources."crc-3.8.0"
@@ -74338,7 +74128,7 @@ in
sources."express-openapi-7.0.1"
(sources."ext-1.4.0" // {
dependencies = [
- sources."type-2.3.0"
+ sources."type-2.5.0"
];
})
sources."extend-3.0.2"
@@ -74851,7 +74641,7 @@ in
sources."object.map-1.0.1"
sources."object.pick-1.3.0"
sources."object.reduce-1.0.1"
- sources."office-ui-fabric-react-7.162.1"
+ sources."office-ui-fabric-react-7.165.1"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
sources."once-1.4.0"
@@ -75011,7 +74801,7 @@ in
sources."qs-6.7.0"
sources."querystring-0.2.0"
sources."querystring-es3-0.2.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."randombytes-2.1.0"
sources."randomfill-1.0.4"
sources."range-parser-1.2.1"
@@ -75068,7 +74858,7 @@ in
sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
sources."reusify-1.0.4"
- sources."rfdc-1.2.0"
+ sources."rfdc-1.3.0"
sources."rimraf-2.7.1"
sources."ripemd160-2.0.2"
sources."run-async-2.4.1"
@@ -75082,7 +74872,7 @@ in
sources."sax-1.2.4"
sources."scheduler-0.19.1"
sources."schema-utils-2.7.1"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."semver-greatest-satisfied-range-1.1.0"
(sources."send-0.17.1" // {
dependencies = [
@@ -75254,7 +75044,7 @@ in
sources."yallist-3.1.1"
];
})
- (sources."terser-5.6.0" // {
+ (sources."terser-5.6.1" // {
dependencies = [
sources."source-map-0.7.3"
];
@@ -75485,20 +75275,24 @@ in
eslint = nodeEnv.buildNodePackage {
name = "eslint";
packageName = "eslint";
- version = "7.21.0";
+ version = "7.22.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz";
- sha512 = "W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==";
+ url = "https://registry.npmjs.org/eslint/-/eslint-7.22.0.tgz";
+ sha512 = "3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==";
};
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@eslint/eslintrc-0.4.0"
+ (sources."@eslint/eslintrc-0.4.0" // {
+ dependencies = [
+ sources."globals-12.4.0"
+ ];
+ })
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
sources."ajv-6.12.6"
@@ -75564,7 +75358,11 @@ in
sources."functional-red-black-tree-1.0.1"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globals-12.4.0"
+ (sources."globals-13.7.0" // {
+ dependencies = [
+ sources."type-fest-0.20.2"
+ ];
+ })
sources."has-flag-3.0.0"
sources."ignore-4.0.6"
sources."import-fresh-3.3.0"
@@ -75597,7 +75395,7 @@ in
sources."require-from-string-2.0.2"
sources."resolve-from-4.0.0"
sources."rimraf-3.0.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
(sources."slice-ansi-4.0.0" // {
@@ -75614,7 +75412,7 @@ in
sources."supports-color-5.5.0"
(sources."table-6.0.7" // {
dependencies = [
- sources."ajv-7.2.1"
+ sources."ajv-7.2.3"
sources."json-schema-traverse-1.0.0"
];
})
@@ -75649,14 +75447,18 @@ in
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."chalk-2.4.2"
sources."has-flag-3.0.0"
sources."supports-color-5.5.0"
];
})
- sources."@eslint/eslintrc-0.4.0"
+ (sources."@eslint/eslintrc-0.4.0" // {
+ dependencies = [
+ sources."globals-12.4.0"
+ ];
+ })
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
sources."ajv-6.12.6"
@@ -75687,7 +75489,7 @@ in
sources."emoji-regex-8.0.0"
sources."enquirer-2.3.6"
sources."escape-string-regexp-1.0.5"
- sources."eslint-7.21.0"
+ sources."eslint-7.22.0"
sources."eslint-scope-5.1.1"
(sources."eslint-utils-2.1.0" // {
dependencies = [
@@ -75723,7 +75525,11 @@ in
sources."functional-red-black-tree-1.0.1"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globals-12.4.0"
+ (sources."globals-13.7.0" // {
+ dependencies = [
+ sources."type-fest-0.20.2"
+ ];
+ })
sources."has-flag-4.0.0"
sources."ignore-4.0.6"
sources."import-fresh-3.3.0"
@@ -75757,7 +75563,7 @@ in
sources."require-from-string-2.0.2"
sources."resolve-from-4.0.0"
sources."rimraf-3.0.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
(sources."slice-ansi-4.0.0" // {
@@ -75774,7 +75580,7 @@ in
sources."supports-color-8.1.1"
(sources."table-6.0.7" // {
dependencies = [
- sources."ajv-7.2.1"
+ sources."ajv-7.2.3"
sources."json-schema-traverse-1.0.0"
];
})
@@ -75818,14 +75624,14 @@ in
expo-cli = nodeEnv.buildNodePackage {
name = "expo-cli";
packageName = "expo-cli";
- version = "4.2.1";
+ version = "4.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.2.1.tgz";
- sha512 = "3qgir7nj1jD7L+ETEUBYQfwsd57GaOTLhJ+6rzwvRwSXdU04oM+nfiZHMyabgKHMzslyHpVnvOod9OjKVWTtuQ==";
+ url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.3.2.tgz";
+ sha512 = "H6YzchpWSV/2dPSns3IzGJBGqt1Thhbe1s6NO5UQMoRRkp7e64XMGVfzmw4W5t6CKCF+BB/MgXMFdipniPsY9w==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.8"
+ sources."@babel/compat-data-7.13.12"
(sources."@babel/core-7.9.0" // {
dependencies = [
sources."semver-5.7.1"
@@ -75834,12 +75640,12 @@ in
sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
- (sources."@babel/helper-compilation-targets-7.13.8" // {
+ (sources."@babel/helper-compilation-targets-7.13.10" // {
dependencies = [
sources."semver-6.3.0"
];
})
- sources."@babel/helper-create-class-features-plugin-7.13.8"
+ sources."@babel/helper-create-class-features-plugin-7.13.11"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
(sources."@babel/helper-define-polyfill-provider-0.1.5" // {
dependencies = [
@@ -75850,26 +75656,26 @@ in
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
sources."@babel/helper-hoist-variables-7.13.0"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
sources."@babel/helper-remap-async-to-generator-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
sources."@babel/helper-wrap-function-7.13.0"
- sources."@babel/helpers-7.13.0"
- (sources."@babel/highlight-7.13.8" // {
+ sources."@babel/helpers-7.13.10"
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.13.9"
+ sources."@babel/parser-7.13.12"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.12.13"
sources."@babel/plugin-proposal-dynamic-import-7.13.8"
@@ -75881,7 +75687,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -75926,12 +75732,12 @@ in
sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
sources."@babel/plugin-transform-react-display-name-7.12.13"
- sources."@babel/plugin-transform-react-jsx-7.12.17"
+ sources."@babel/plugin-transform-react-jsx-7.13.12"
sources."@babel/plugin-transform-react-jsx-self-7.12.13"
sources."@babel/plugin-transform-react-jsx-source-7.12.13"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
- (sources."@babel/plugin-transform-runtime-7.13.9" // {
+ (sources."@babel/plugin-transform-runtime-7.13.10" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -75951,14 +75757,14 @@ in
})
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-typescript-7.12.17"
- sources."@babel/runtime-7.13.9"
+ sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@expo/apple-utils-0.0.0-alpha.17"
sources."@expo/bunyan-4.0.0"
- sources."@expo/config-3.3.30"
- (sources."@expo/config-plugins-1.0.20" // {
+ sources."@expo/config-3.3.33"
+ (sources."@expo/config-plugins-1.0.23" // {
dependencies = [
sources."uuid-3.4.0"
sources."xcode-2.1.0"
@@ -75971,7 +75777,7 @@ in
sources."pngjs-5.0.0"
];
})
- (sources."@expo/dev-server-0.1.56" // {
+ (sources."@expo/dev-server-0.1.59" // {
dependencies = [
sources."body-parser-1.19.0"
sources."bytes-3.1.0"
@@ -75986,7 +75792,7 @@ in
sources."statuses-1.5.0"
];
})
- sources."@expo/dev-tools-0.13.84"
+ sources."@expo/dev-tools-0.13.87"
(sources."@expo/devcert-1.0.0" // {
dependencies = [
sources."debug-3.2.7"
@@ -75994,7 +75800,7 @@ in
sources."sudo-prompt-8.2.5"
];
})
- (sources."@expo/image-utils-0.3.10" // {
+ (sources."@expo/image-utils-0.3.11" // {
dependencies = [
sources."tempy-0.3.0"
];
@@ -76005,7 +75811,7 @@ in
sources."json5-1.0.1"
];
})
- sources."@expo/metro-config-0.1.56"
+ sources."@expo/metro-config-0.1.59"
sources."@expo/osascript-2.0.24"
(sources."@expo/package-manager-0.0.39-alpha.0" // {
dependencies = [
@@ -76020,27 +75826,19 @@ in
];
})
sources."@expo/results-1.0.0"
- sources."@expo/schemer-1.3.27-alpha.0"
- sources."@expo/simple-spinner-1.0.2"
- sources."@expo/spawn-async-1.5.0"
- (sources."@expo/webpack-config-0.12.60" // {
+ (sources."@expo/schemer-1.3.27-alpha.0" // {
dependencies = [
- sources."@babel/runtime-7.9.0"
- sources."is-wsl-2.2.0"
- sources."react-refresh-0.8.3"
+ sources."ajv-5.5.2"
+ sources."fast-deep-equal-1.1.0"
+ sources."json-schema-traverse-0.3.1"
];
})
- (sources."@expo/xdl-59.0.24" // {
+ sources."@expo/simple-spinner-1.0.2"
+ sources."@expo/spawn-async-1.5.0"
+ (sources."@expo/webpack-config-0.12.63" // {
dependencies = [
- sources."chownr-1.1.4"
- sources."fs-minipass-1.2.7"
- sources."indent-string-3.2.0"
- sources."minipass-2.9.0"
- sources."tar-4.4.6"
- sources."uuid-3.3.2"
- sources."xcode-2.1.0"
- sources."xmldom-0.1.27"
- sources."yallist-3.1.1"
+ sources."@babel/runtime-7.9.0"
+ sources."react-refresh-0.8.3"
];
})
sources."@hapi/address-4.1.0"
@@ -76109,7 +75907,7 @@ in
})
sources."@npmcli/node-gyp-1.0.2"
sources."@npmcli/promise-spawn-1.3.2"
- sources."@npmcli/run-script-1.8.3"
+ sources."@npmcli/run-script-1.8.4"
sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3"
sources."@react-native-community/cli-debugger-ui-4.13.1"
(sources."@react-native-community/cli-server-api-4.9.0" // {
@@ -76121,16 +75919,20 @@ in
(sources."@react-native-community/cli-tools-4.13.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
+ sources."array-filter-0.0.1"
sources."chalk-3.0.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."has-flag-4.0.0"
+ sources."is-wsl-1.1.0"
+ sources."open-6.4.0"
+ sources."shell-quote-1.6.1"
sources."supports-color-7.2.0"
];
})
sources."@segment/loosely-validate-event-2.0.0"
- sources."@sindresorhus/is-0.14.0"
- sources."@szmarczak/http-timer-1.1.2"
+ sources."@sindresorhus/is-4.0.0"
+ sources."@szmarczak/http-timer-4.0.5"
sources."@tootallnate/once-1.1.2"
sources."@types/anymatch-1.3.1"
sources."@types/cacheable-request-6.0.1"
@@ -76142,7 +75944,7 @@ in
sources."@types/istanbul-reports-1.1.2"
sources."@types/json-schema-7.0.7"
sources."@types/keyv-3.1.1"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/node-9.6.61"
sources."@types/q-1.5.4"
sources."@types/responselike-1.0.0"
@@ -76195,7 +75997,7 @@ in
sources."agent-base-6.0.2"
sources."agentkeepalive-4.1.4"
sources."aggregate-error-3.1.0"
- sources."ajv-5.5.2"
+ sources."ajv-6.12.6"
sources."ajv-errors-1.0.1"
sources."ajv-keywords-3.5.2"
sources."alphanum-sort-1.0.2"
@@ -76207,14 +76009,16 @@ in
(sources."ansi-align-3.0.0" // {
dependencies = [
sources."ansi-regex-4.1.0"
- sources."emoji-regex-7.0.3"
- sources."is-fullwidth-code-point-2.0.0"
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
];
})
sources."ansi-colors-3.2.4"
- sources."ansi-escapes-3.2.0"
+ (sources."ansi-escapes-4.3.2" // {
+ dependencies = [
+ sources."type-fest-0.21.3"
+ ];
+ })
sources."ansi-html-0.0.7"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
@@ -76234,7 +76038,7 @@ in
sources."array-flatten-1.1.1"
sources."array-map-0.0.0"
sources."array-reduce-0.0.0"
- sources."array-union-1.0.2"
+ sources."array-union-2.1.0"
sources."array-uniq-1.0.3"
sources."array-unique-0.3.2"
sources."arrify-2.0.1"
@@ -76264,7 +76068,12 @@ in
sources."axios-0.21.1"
sources."axios-retry-3.1.9"
sources."babel-extract-comments-1.0.0"
- sources."babel-loader-8.1.0"
+ (sources."babel-loader-8.1.0" // {
+ dependencies = [
+ sources."json5-1.0.1"
+ sources."loader-utils-1.4.0"
+ ];
+ })
sources."babel-plugin-dynamic-import-node-2.3.3"
(sources."babel-plugin-polyfill-corejs2-0.1.10" // {
dependencies = [
@@ -76347,23 +76156,16 @@ in
sources."builtin-status-codes-3.0.0"
sources."builtins-1.0.3"
sources."bytes-3.0.0"
- (sources."cacache-15.0.5" // {
+ (sources."cacache-15.0.6" // {
dependencies = [
sources."minipass-3.1.3"
sources."mkdirp-1.0.4"
- sources."p-map-4.0.0"
sources."rimraf-3.0.2"
];
})
sources."cache-base-1.0.1"
sources."cacheable-lookup-5.0.4"
- (sources."cacheable-request-6.1.0" // {
- dependencies = [
- sources."get-stream-5.2.0"
- sources."lowercase-keys-2.0.0"
- sources."normalize-url-4.5.0"
- ];
- })
+ sources."cacheable-request-7.0.1"
sources."call-bind-1.0.2"
sources."caller-callsite-2.0.0"
sources."caller-path-2.0.0"
@@ -76377,7 +76179,7 @@ in
})
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
sources."caseless-0.12.0"
(sources."chalk-4.1.0" // {
dependencies = [
@@ -76417,22 +76219,29 @@ in
];
})
sources."clean-stack-2.2.0"
- sources."clean-webpack-plugin-3.0.0"
+ (sources."clean-webpack-plugin-3.0.0" // {
+ dependencies = [
+ sources."array-union-1.0.2"
+ sources."del-4.1.1"
+ sources."globby-6.1.0"
+ sources."p-map-2.1.0"
+ sources."pify-2.3.0"
+ sources."rimraf-2.7.1"
+ ];
+ })
sources."cli-boxes-2.2.1"
sources."cli-cursor-2.1.0"
- sources."cli-spinners-2.5.0"
+ sources."cli-spinners-2.6.0"
sources."cli-table3-0.6.0"
(sources."cliui-5.0.0" // {
dependencies = [
sources."ansi-regex-4.1.0"
- sources."emoji-regex-7.0.3"
- sources."is-fullwidth-code-point-2.0.0"
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
sources."wrap-ansi-5.1.0"
];
})
- sources."clone-2.1.2"
+ sources."clone-1.0.4"
sources."clone-response-1.0.2"
sources."co-4.6.0"
(sources."coa-2.0.2" // {
@@ -76490,20 +76299,15 @@ in
sources."copy-descriptor-0.1.1"
(sources."copy-webpack-plugin-6.0.4" // {
dependencies = [
- sources."array-union-2.1.0"
sources."find-cache-dir-3.3.1"
sources."find-up-4.1.0"
- sources."globby-11.0.2"
- sources."loader-utils-2.0.0"
sources."locate-path-5.0.0"
sources."make-dir-3.1.0"
- sources."p-limit-3.1.0"
(sources."p-locate-4.1.0" // {
dependencies = [
sources."p-limit-2.3.0"
];
})
- sources."path-exists-4.0.0"
sources."pkg-dir-4.2.0"
sources."semver-6.3.0"
];
@@ -76535,6 +76339,8 @@ in
sources."css-declaration-sorter-4.0.1"
(sources."css-loader-3.6.0" // {
dependencies = [
+ sources."json5-1.0.1"
+ sources."loader-utils-1.4.0"
sources."semver-6.3.0"
];
})
@@ -76578,24 +76384,23 @@ in
sources."decache-4.4.0"
sources."decamelize-1.2.0"
sources."decode-uri-component-0.2.0"
- sources."decompress-response-3.3.0"
+ (sources."decompress-response-6.0.0" // {
+ dependencies = [
+ sources."mimic-response-3.1.0"
+ ];
+ })
sources."deep-equal-2.0.5"
sources."deep-extend-0.6.0"
sources."deep-scope-analyser-1.7.0"
sources."deepmerge-4.2.2"
sources."default-gateway-4.2.0"
- (sources."defaults-1.0.3" // {
- dependencies = [
- sources."clone-1.0.4"
- ];
- })
- sources."defer-to-connect-1.1.3"
+ sources."defaults-1.0.3"
+ sources."defer-to-connect-2.0.1"
sources."define-properties-1.1.3"
sources."define-property-2.0.2"
- (sources."del-4.1.1" // {
+ (sources."del-6.0.0" // {
dependencies = [
- sources."p-map-2.1.0"
- sources."rimraf-2.7.1"
+ sources."rimraf-3.0.2"
];
})
sources."delayed-stream-1.0.0"
@@ -76604,7 +76409,7 @@ in
sources."deprecated-decorator-0.1.6"
sources."des.js-1.0.1"
sources."destroy-1.0.4"
- sources."detect-node-2.0.4"
+ sources."detect-node-2.0.5"
(sources."detect-port-alt-1.1.6" // {
dependencies = [
sources."debug-2.6.9"
@@ -76631,7 +76436,7 @@ in
sources."domelementtype-2.1.0"
sources."domhandler-3.3.0"
sources."domino-2.1.6"
- (sources."domutils-2.4.4" // {
+ (sources."domutils-2.5.0" // {
dependencies = [
sources."domhandler-4.0.0"
];
@@ -76647,13 +76452,13 @@ in
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
];
})
- sources."emoji-regex-8.0.0"
+ sources."emoji-regex-7.0.3"
sources."emojis-list-3.0.0"
sources."encodeurl-1.0.2"
(sources."encoding-0.1.13" // {
@@ -76669,7 +76474,7 @@ in
})
sources."entities-2.2.0"
sources."env-editor-0.4.2"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."envinfo-7.5.0"
sources."eol-0.9.1"
sources."err-code-2.0.3"
@@ -76699,10 +76504,15 @@ in
sources."etag-1.8.1"
sources."eventemitter3-2.0.3"
sources."events-3.3.0"
- sources."eventsource-1.0.7"
+ sources."eventsource-1.1.0"
sources."evp_bytestokey-1.0.3"
sources."exec-async-2.2.0"
- sources."execa-1.0.0"
+ (sources."execa-1.0.0" // {
+ dependencies = [
+ sources."get-stream-4.1.0"
+ sources."is-stream-1.1.0"
+ ];
+ })
sources."exif-parser-0.1.12"
(sources."expand-brackets-2.1.4" // {
dependencies = [
@@ -76724,7 +76534,7 @@ in
sources."ms-2.0.0"
];
})
- (sources."expo-pwa-0.0.66" // {
+ (sources."expo-pwa-0.0.69" // {
dependencies = [
sources."commander-2.20.0"
];
@@ -76748,18 +76558,14 @@ in
];
})
sources."extsprintf-1.3.0"
- sources."fast-deep-equal-1.1.0"
+ sources."fast-deep-equal-3.1.3"
sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
sources."fastq-1.11.0"
sources."faye-websocket-0.10.0"
sources."figgy-pudding-3.5.2"
sources."figures-3.2.0"
- (sources."file-loader-6.0.0" // {
- dependencies = [
- sources."loader-utils-2.0.0"
- ];
- })
+ sources."file-loader-6.0.0"
sources."file-type-9.0.0"
sources."file-uri-to-path-1.0.0"
sources."filesize-6.1.0"
@@ -76771,14 +76577,7 @@ in
];
})
sources."find-cache-dir-2.1.0"
- (sources."find-up-5.0.0" // {
- dependencies = [
- sources."locate-path-6.0.0"
- sources."p-limit-3.1.0"
- sources."p-locate-5.0.0"
- sources."path-exists-4.0.0"
- ];
- })
+ sources."find-up-5.0.0"
sources."find-yarn-workspace-root-2.0.0"
sources."flush-write-stream-1.1.1"
sources."follow-redirects-1.13.3"
@@ -76787,12 +76586,22 @@ in
sources."forever-agent-0.6.1"
(sources."fork-ts-checker-webpack-plugin-4.1.6" // {
dependencies = [
- sources."braces-2.3.2"
+ (sources."braces-2.3.2" // {
+ dependencies = [
+ sources."extend-shallow-2.0.1"
+ ];
+ })
sources."chalk-2.4.2"
- sources."extend-shallow-2.0.1"
- sources."fill-range-4.0.0"
- sources."is-number-3.0.0"
- sources."kind-of-3.2.2"
+ (sources."fill-range-4.0.0" // {
+ dependencies = [
+ sources."extend-shallow-2.0.1"
+ ];
+ })
+ (sources."is-number-3.0.0" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
sources."micromatch-3.1.10"
sources."semver-5.7.1"
sources."to-regex-range-2.1.1"
@@ -76804,16 +76613,7 @@ in
sources."freeport-async-2.0.0"
sources."fresh-0.5.2"
sources."from2-2.3.0"
- (sources."fs-extra-9.0.0" // {
- dependencies = [
- (sources."jsonfile-6.1.0" // {
- dependencies = [
- sources."universalify-2.0.0"
- ];
- })
- sources."universalify-1.0.0"
- ];
- })
+ sources."fs-extra-9.0.0"
(sources."fs-minipass-2.1.0" // {
dependencies = [
sources."minipass-3.1.3"
@@ -76836,9 +76636,9 @@ in
sources."get-intrinsic-1.1.1"
sources."get-own-enumerable-property-symbols-3.0.2"
sources."get-port-3.2.0"
- sources."get-stream-4.1.0"
+ sources."get-stream-5.2.0"
sources."get-value-2.0.6"
- sources."getenv-0.7.0"
+ sources."getenv-1.0.0"
sources."getpass-0.1.7"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
@@ -76846,28 +76646,8 @@ in
sources."global-modules-2.0.0"
sources."global-prefix-3.0.0"
sources."globals-11.12.0"
- (sources."globby-6.1.0" // {
- dependencies = [
- sources."pify-2.3.0"
- ];
- })
- (sources."got-11.8.2" // {
- dependencies = [
- sources."@sindresorhus/is-4.0.0"
- sources."@szmarczak/http-timer-4.0.5"
- sources."cacheable-request-7.0.1"
- sources."decompress-response-6.0.0"
- sources."defer-to-connect-2.0.1"
- sources."get-stream-5.2.0"
- sources."json-buffer-3.0.1"
- sources."keyv-4.0.3"
- sources."lowercase-keys-2.0.0"
- sources."mimic-response-3.1.0"
- sources."normalize-url-4.5.0"
- sources."p-cancelable-2.0.0"
- sources."responselike-2.0.0"
- ];
- })
+ sources."globby-11.0.1"
+ sources."got-11.8.2"
sources."graceful-fs-4.2.6"
sources."graphql-0.13.2"
(sources."graphql-tools-3.0.0" // {
@@ -76878,13 +76658,7 @@ in
sources."gzip-size-5.1.1"
sources."handle-thing-2.0.1"
sources."har-schema-2.0.0"
- (sources."har-validator-5.1.5" // {
- dependencies = [
- sources."ajv-6.12.6"
- sources."fast-deep-equal-3.1.3"
- sources."json-schema-traverse-0.4.1"
- ];
- })
+ sources."har-validator-5.1.5"
sources."has-1.0.3"
sources."has-bigints-1.0.1"
sources."has-flag-3.0.0"
@@ -76920,17 +76694,18 @@ in
sources."hsla-regex-1.0.0"
sources."html-comment-regex-1.1.2"
sources."html-entities-1.4.0"
- (sources."html-loader-1.1.0" // {
- dependencies = [
- sources."loader-utils-2.0.0"
- ];
- })
+ sources."html-loader-1.1.0"
(sources."html-minifier-terser-5.1.1" // {
dependencies = [
sources."commander-4.1.1"
];
})
- sources."html-webpack-plugin-4.3.0"
+ (sources."html-webpack-plugin-4.3.0" // {
+ dependencies = [
+ sources."json5-1.0.1"
+ sources."loader-utils-1.4.0"
+ ];
+ })
sources."htmlparser2-4.1.0"
sources."http-cache-semantics-4.1.0"
sources."http-deceiver-1.2.7"
@@ -77004,7 +76779,7 @@ in
sources."is-docker-2.1.1"
sources."is-extendable-0.1.1"
sources."is-extglob-2.1.1"
- sources."is-fullwidth-code-point-3.0.0"
+ sources."is-fullwidth-code-point-2.0.0"
sources."is-function-1.0.2"
sources."is-glob-4.0.1"
(sources."is-invalid-path-0.1.0" // {
@@ -77020,14 +76795,34 @@ in
sources."is-number-object-1.0.4"
sources."is-obj-2.0.0"
sources."is-path-cwd-2.2.0"
- sources."is-path-in-cwd-2.1.0"
- sources."is-path-inside-2.1.0"
+ (sources."is-path-in-cwd-2.1.0" // {
+ dependencies = [
+ sources."is-path-inside-2.1.0"
+ ];
+ })
+ sources."is-path-inside-3.0.3"
sources."is-plain-object-2.0.4"
sources."is-port-reachable-2.0.1"
(sources."is-reachable-4.0.0" // {
dependencies = [
+ sources."@sindresorhus/is-0.14.0"
+ sources."@szmarczak/http-timer-1.1.2"
+ (sources."cacheable-request-6.1.0" // {
+ dependencies = [
+ sources."get-stream-5.2.0"
+ sources."lowercase-keys-2.0.0"
+ ];
+ })
+ sources."decompress-response-3.3.0"
+ sources."defer-to-connect-1.1.3"
+ sources."get-stream-4.1.0"
sources."got-9.6.0"
+ sources."json-buffer-3.0.0"
+ sources."keyv-3.1.0"
+ sources."lowercase-keys-1.0.1"
+ sources."p-cancelable-1.1.0"
sources."p-timeout-3.2.0"
+ sources."responselike-1.0.2"
];
})
sources."is-regex-1.1.2"
@@ -77036,7 +76831,7 @@ in
sources."is-retry-allowed-1.2.0"
sources."is-root-2.1.0"
sources."is-set-2.0.2"
- sources."is-stream-1.1.0"
+ sources."is-stream-2.0.0"
sources."is-string-1.0.5"
sources."is-svg-3.0.0"
sources."is-symbol-1.0.3"
@@ -77046,7 +76841,7 @@ in
sources."is-weakmap-2.0.1"
sources."is-weakset-2.0.1"
sources."is-windows-1.0.2"
- sources."is-wsl-1.1.0"
+ sources."is-wsl-2.2.0"
sources."isarray-2.0.5"
sources."isemail-3.2.0"
sources."isexe-2.0.0"
@@ -77067,26 +76862,31 @@ in
sources."js-yaml-3.14.1"
sources."jsbn-0.1.1"
sources."jsesc-2.5.2"
- sources."json-buffer-3.0.0"
+ sources."json-buffer-3.0.1"
sources."json-parse-better-errors-1.0.2"
sources."json-parse-even-better-errors-2.3.1"
sources."json-schema-0.2.3"
(sources."json-schema-deref-sync-0.13.0" // {
dependencies = [
+ sources."clone-2.1.2"
sources."md5-2.2.1"
];
})
- sources."json-schema-traverse-0.3.1"
+ sources."json-schema-traverse-0.4.1"
sources."json-stable-stringify-1.0.1"
sources."json-stringify-safe-5.0.1"
sources."json3-3.3.3"
sources."json5-2.2.0"
- sources."jsonfile-4.0.0"
+ (sources."jsonfile-6.1.0" // {
+ dependencies = [
+ sources."universalify-2.0.0"
+ ];
+ })
sources."jsonify-0.0.0"
sources."jsonparse-1.3.1"
sources."jsprim-1.4.1"
sources."keychain-1.3.0"
- sources."keyv-3.1.0"
+ sources."keyv-4.0.3"
sources."killable-1.0.1"
sources."kind-of-6.0.3"
sources."kleur-3.0.3"
@@ -77099,12 +76899,8 @@ in
];
})
sources."loader-runner-2.4.0"
- (sources."loader-utils-1.4.0" // {
- dependencies = [
- sources."json5-1.0.1"
- ];
- })
- sources."locate-path-3.0.0"
+ sources."loader-utils-2.0.0"
+ sources."locate-path-6.0.0"
sources."lodash-4.17.21"
sources."lodash._reinterpolate-3.0.0"
sources."lodash.assign-4.2.0"
@@ -77127,7 +76923,7 @@ in
sources."tslib-2.1.0"
];
})
- sources."lowercase-keys-1.0.1"
+ sources."lowercase-keys-2.0.0"
sources."lru-cache-6.0.0"
(sources."make-dir-2.1.0" // {
dependencies = [
@@ -77173,9 +76969,8 @@ in
sources."min-document-2.19.0"
(sources."mini-css-extract-plugin-0.5.0" // {
dependencies = [
- sources."ajv-6.12.6"
- sources."fast-deep-equal-3.1.3"
- sources."json-schema-traverse-0.4.1"
+ sources."json5-1.0.1"
+ sources."loader-utils-1.4.0"
sources."schema-utils-1.0.0"
];
})
@@ -77196,7 +76991,6 @@ in
(sources."minipass-fetch-1.3.3" // {
dependencies = [
sources."minipass-3.1.3"
- sources."minizlib-2.1.2"
];
})
(sources."minipass-flush-1.0.5" // {
@@ -77219,10 +77013,9 @@ in
sources."minipass-3.1.3"
];
})
- (sources."minizlib-1.3.3" // {
+ (sources."minizlib-2.1.2" // {
dependencies = [
- sources."minipass-2.9.0"
- sources."yallist-3.1.1"
+ sources."minipass-3.1.3"
];
})
sources."mississippi-3.0.0"
@@ -77279,7 +77072,7 @@ in
sources."node-releases-1.1.71"
sources."nopt-5.0.0"
sources."normalize-path-3.0.0"
- sources."normalize-url-3.3.0"
+ sources."normalize-url-4.5.0"
sources."npm-bundled-1.1.1"
sources."npm-install-checks-4.0.0"
sources."npm-normalize-package-bin-1.0.1"
@@ -77290,16 +77083,19 @@ in
];
})
sources."npm-packlist-2.1.4"
- (sources."npm-pick-manifest-6.1.0" // {
+ (sources."npm-pick-manifest-6.1.1" // {
dependencies = [
- sources."npm-package-arg-8.1.1"
+ sources."hosted-git-info-4.0.2"
+ sources."npm-package-arg-8.1.2"
+ sources."semver-7.3.5"
];
})
(sources."npm-registry-fetch-9.0.0" // {
dependencies = [
+ sources."hosted-git-info-4.0.2"
sources."minipass-3.1.3"
- sources."minizlib-2.1.2"
- sources."npm-package-arg-8.1.1"
+ sources."npm-package-arg-8.1.2"
+ sources."semver-7.3.5"
];
})
sources."npm-run-path-2.0.2"
@@ -77337,8 +77133,12 @@ in
sources."on-headers-1.0.2"
sources."once-1.4.0"
sources."onetime-2.0.1"
- sources."open-6.4.0"
- sources."opn-5.5.0"
+ sources."open-7.4.2"
+ (sources."opn-5.5.0" // {
+ dependencies = [
+ sources."is-wsl-1.1.0"
+ ];
+ })
sources."optimize-css-assets-webpack-plugin-5.0.4"
sources."options-0.0.6"
(sources."ora-3.4.0" // {
@@ -77353,38 +77153,48 @@ in
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.5"
- (sources."p-any-2.1.0" // {
- dependencies = [
- sources."p-cancelable-2.0.0"
- ];
- })
- sources."p-cancelable-1.1.0"
+ sources."p-any-2.1.0"
+ sources."p-cancelable-2.1.0"
sources."p-finally-1.0.0"
- sources."p-limit-2.3.0"
- sources."p-locate-3.0.0"
- sources."p-map-3.0.0"
+ sources."p-limit-3.1.0"
+ sources."p-locate-5.0.0"
+ sources."p-map-4.0.0"
sources."p-retry-4.1.0"
- (sources."p-some-4.1.0" // {
- dependencies = [
- sources."p-cancelable-2.0.0"
- ];
- })
+ sources."p-some-4.1.0"
sources."p-timeout-3.1.0"
sources."p-try-2.2.0"
(sources."package-json-6.4.0" // {
dependencies = [
+ sources."@sindresorhus/is-0.14.0"
+ sources."@szmarczak/http-timer-1.1.2"
+ (sources."cacheable-request-6.1.0" // {
+ dependencies = [
+ sources."get-stream-5.2.0"
+ sources."lowercase-keys-2.0.0"
+ ];
+ })
+ sources."decompress-response-3.3.0"
+ sources."defer-to-connect-1.1.3"
+ sources."get-stream-4.1.0"
sources."got-9.6.0"
+ sources."json-buffer-3.0.0"
+ sources."keyv-3.1.0"
+ sources."lowercase-keys-1.0.1"
+ sources."p-cancelable-1.1.0"
sources."registry-auth-token-3.4.0"
sources."registry-url-5.1.0"
+ sources."responselike-1.0.2"
sources."semver-6.3.0"
];
})
- (sources."pacote-11.2.7" // {
+ (sources."pacote-11.3.1" // {
dependencies = [
+ sources."hosted-git-info-4.0.2"
sources."minipass-3.1.3"
sources."mkdirp-1.0.4"
- sources."npm-package-arg-8.1.1"
+ sources."npm-package-arg-8.1.2"
sources."rimraf-3.0.2"
+ sources."semver-7.3.5"
];
})
sources."pako-1.0.11"
@@ -77411,10 +77221,14 @@ in
];
})
sources."pascalcase-0.1.1"
- sources."password-prompt-1.1.2"
+ (sources."password-prompt-1.1.2" // {
+ dependencies = [
+ sources."ansi-escapes-3.2.0"
+ ];
+ })
sources."path-browserify-0.0.1"
sources."path-dirname-1.0.2"
- sources."path-exists-3.0.0"
+ sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
sources."path-is-inside-1.0.2"
sources."path-key-2.0.1"
@@ -77432,11 +77246,19 @@ in
(sources."pkg-dir-3.0.0" // {
dependencies = [
sources."find-up-3.0.0"
+ sources."locate-path-3.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-3.0.0"
+ sources."path-exists-3.0.0"
];
})
(sources."pkg-up-3.1.0" // {
dependencies = [
sources."find-up-3.0.0"
+ sources."locate-path-3.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-3.0.0"
+ sources."path-exists-3.0.0"
];
})
sources."plist-3.0.1"
@@ -77542,6 +77364,7 @@ in
})
(sources."postcss-normalize-url-4.0.1" // {
dependencies = [
+ sources."normalize-url-3.3.0"
sources."postcss-value-parser-3.3.1"
];
})
@@ -77596,7 +77419,6 @@ in
sources."bn.js-4.12.0"
];
})
- sources."puka-1.0.1"
sources."pump-3.0.0"
(sources."pumpify-1.5.1" // {
dependencies = [
@@ -77610,7 +77432,7 @@ in
sources."querystring-0.2.1"
sources."querystring-es3-0.2.1"
sources."querystringify-2.2.0"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-5.1.1"
sources."randombytes-2.1.0"
sources."randomfill-1.0.4"
@@ -77622,10 +77444,9 @@ in
})
sources."raw-body-2.3.3"
sources."rc-1.2.8"
- (sources."react-dev-utils-11.0.3" // {
+ (sources."react-dev-utils-11.0.4" // {
dependencies = [
sources."@babel/code-frame-7.10.4"
- sources."array-union-2.1.0"
sources."browserslist-4.14.2"
(sources."chalk-2.4.2" // {
dependencies = [
@@ -77635,17 +77456,12 @@ in
sources."cross-spawn-7.0.3"
sources."escape-string-regexp-2.0.0"
sources."find-up-4.1.0"
- sources."globby-11.0.1"
- sources."is-wsl-2.2.0"
- sources."loader-utils-2.0.0"
sources."locate-path-5.0.0"
- sources."open-7.4.2"
+ sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
- sources."path-exists-4.0.0"
sources."path-key-3.1.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
- sources."shell-quote-1.7.2"
sources."which-2.0.2"
];
})
@@ -77664,7 +77480,7 @@ in
sources."recursive-readdir-2.2.2"
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
sources."regex-not-1.0.2"
sources."regexp.prototype.flags-1.3.1"
@@ -77672,7 +77488,7 @@ in
sources."registry-auth-token-3.3.2"
sources."registry-url-3.1.0"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -77725,7 +77541,7 @@ in
})
sources."resolve-from-5.0.0"
sources."resolve-url-0.2.1"
- sources."responselike-1.0.2"
+ sources."responselike-2.0.0"
sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
sources."retry-0.12.0"
@@ -77746,13 +77562,7 @@ in
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
- (sources."schema-utils-2.7.1" // {
- dependencies = [
- sources."ajv-6.12.6"
- sources."fast-deep-equal-3.1.3"
- sources."json-schema-traverse-0.4.1"
- ];
- })
+ sources."schema-utils-2.7.1"
sources."select-hose-2.0.0"
sources."selfsigned-1.10.8"
sources."semver-7.3.2"
@@ -77787,11 +77597,7 @@ in
sources."sha.js-2.4.11"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
- (sources."shell-quote-1.6.1" // {
- dependencies = [
- sources."array-filter-0.0.1"
- ];
- })
+ sources."shell-quote-1.7.2"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.3"
sources."simple-plist-1.1.1"
@@ -77803,7 +77609,7 @@ in
sources."uuid-2.0.3"
];
})
- sources."slugify-1.4.7"
+ sources."slugify-1.5.0"
sources."smart-buffer-4.1.0"
(sources."snapdragon-0.8.2" // {
dependencies = [
@@ -77846,7 +77652,7 @@ in
sources."faye-websocket-0.11.3"
];
})
- sources."socks-2.5.1"
+ sources."socks-2.6.0"
sources."socks-proxy-agent-5.0.0"
sources."source-list-map-2.0.1"
sources."source-map-0.5.7"
@@ -77901,7 +77707,12 @@ in
];
})
sources."stream-shift-1.0.1"
- sources."string-width-4.2.2"
+ (sources."string-width-4.2.2" // {
+ dependencies = [
+ sources."emoji-regex-8.0.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ ];
+ })
sources."string.prototype.trimend-1.0.4"
sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.1.1"
@@ -77914,11 +77725,7 @@ in
sources."strip-comments-1.0.2"
sources."strip-eof-1.0.0"
sources."strip-json-comments-2.0.1"
- (sources."style-loader-1.2.1" // {
- dependencies = [
- sources."loader-utils-2.0.0"
- ];
- })
+ sources."style-loader-1.2.1"
(sources."stylehacks-4.0.3" // {
dependencies = [
sources."postcss-selector-parser-3.1.2"
@@ -77943,33 +77750,20 @@ in
(sources."tar-6.1.0" // {
dependencies = [
sources."minipass-3.1.3"
- sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
];
})
sources."temp-dir-1.0.0"
(sources."tempy-0.7.1" // {
dependencies = [
- sources."array-union-2.1.0"
sources."crypto-random-string-2.0.0"
- sources."del-6.0.0"
- sources."globby-11.0.2"
- sources."is-path-inside-3.0.3"
- sources."is-stream-2.0.0"
- sources."p-map-4.0.0"
- sources."rimraf-3.0.2"
sources."temp-dir-2.0.0"
sources."type-fest-0.16.0"
sources."unique-string-2.0.0"
];
})
sources."term-size-2.2.1"
- (sources."terminal-link-2.1.1" // {
- dependencies = [
- sources."ansi-escapes-4.3.1"
- sources."type-fest-0.11.0"
- ];
- })
+ sources."terminal-link-2.1.1"
(sources."terser-4.8.0" // {
dependencies = [
sources."commander-2.20.3"
@@ -77983,13 +77777,11 @@ in
sources."find-up-4.1.0"
sources."locate-path-5.0.0"
sources."make-dir-3.1.0"
- sources."p-limit-3.1.0"
(sources."p-locate-4.1.0" // {
dependencies = [
sources."p-limit-2.3.0"
];
})
- sources."path-exists-4.0.0"
sources."pkg-dir-4.2.0"
sources."semver-6.3.0"
sources."source-map-0.6.1"
@@ -78044,7 +77836,7 @@ in
sources."unique-filename-1.1.1"
sources."unique-slug-2.0.2"
sources."unique-string-1.0.0"
- sources."universalify-0.1.2"
+ sources."universalify-1.0.0"
sources."unpipe-1.0.0"
sources."unquote-1.1.1"
(sources."unset-value-1.0.0" // {
@@ -78074,10 +77866,6 @@ in
sources."url-join-4.0.0"
(sources."url-loader-4.1.1" // {
dependencies = [
- sources."ajv-6.12.6"
- sources."fast-deep-equal-3.1.3"
- sources."json-schema-traverse-0.4.1"
- sources."loader-utils-2.0.0"
sources."schema-utils-3.0.0"
];
})
@@ -78131,26 +77919,16 @@ in
sources."wcwidth-1.0.1"
(sources."webpack-4.43.0" // {
dependencies = [
- sources."ajv-6.12.6"
- (sources."braces-2.3.2" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
+ sources."braces-2.3.2"
sources."cacache-12.0.4"
sources."chownr-1.1.4"
- sources."fast-deep-equal-3.1.3"
- (sources."fill-range-4.0.0" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."json-schema-traverse-0.4.1"
+ sources."extend-shallow-2.0.1"
+ sources."fill-range-4.0.0"
+ sources."is-number-3.0.0"
+ sources."is-wsl-1.1.0"
+ sources."json5-1.0.1"
+ sources."kind-of-3.2.2"
+ sources."loader-utils-1.4.0"
sources."lru-cache-5.1.1"
sources."micromatch-3.1.10"
sources."rimraf-2.7.1"
@@ -78166,9 +77944,9 @@ in
sources."webpack-dev-middleware-3.7.3"
(sources."webpack-dev-server-3.11.0" // {
dependencies = [
- sources."ajv-6.12.6"
sources."ansi-regex-2.1.1"
sources."anymatch-2.0.0"
+ sources."array-union-1.0.2"
sources."binary-extensions-1.13.1"
(sources."body-parser-1.19.0" // {
dependencies = [
@@ -78180,13 +77958,13 @@ in
sources."chokidar-2.1.8"
sources."content-disposition-0.5.3"
sources."cookie-0.4.0"
+ sources."del-4.1.1"
(sources."express-4.17.1" // {
dependencies = [
sources."debug-2.6.9"
];
})
sources."extend-shallow-2.0.1"
- sources."fast-deep-equal-3.1.3"
sources."fill-range-4.0.0"
(sources."finalhandler-1.1.2" // {
dependencies = [
@@ -78195,6 +77973,7 @@ in
})
sources."fsevents-1.2.13"
sources."glob-parent-3.1.0"
+ sources."globby-6.1.0"
sources."http-errors-1.7.2"
sources."iconv-lite-0.4.24"
sources."inherits-2.0.3"
@@ -78202,16 +77981,18 @@ in
sources."is-binary-path-1.0.1"
sources."is-glob-3.1.0"
sources."is-number-3.0.0"
- sources."json-schema-traverse-0.4.1"
sources."kind-of-3.2.2"
sources."micromatch-3.1.10"
sources."mime-1.6.0"
sources."ms-2.0.0"
sources."normalize-path-2.1.1"
+ sources."p-map-2.1.0"
sources."p-retry-3.0.1"
+ sources."pify-2.3.0"
sources."qs-6.7.0"
sources."raw-body-2.4.0"
sources."readdirp-2.2.1"
+ sources."rimraf-2.7.1"
sources."schema-utils-1.0.0"
sources."semver-6.3.0"
(sources."send-0.17.1" // {
@@ -78241,6 +78022,8 @@ in
(sources."webpack-manifest-plugin-2.2.0" // {
dependencies = [
sources."fs-extra-7.0.1"
+ sources."jsonfile-4.0.0"
+ sources."universalify-0.1.2"
];
})
(sources."webpack-sources-1.4.3" // {
@@ -78250,12 +78033,10 @@ in
})
(sources."webpackbar-4.0.0" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
sources."ansi-styles-4.3.0"
sources."chalk-2.4.2"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."type-fest-0.11.0"
sources."wrap-ansi-6.2.0"
];
})
@@ -78269,7 +78050,6 @@ in
(sources."wide-align-1.1.3" // {
dependencies = [
sources."ansi-regex-3.0.0"
- sources."is-fullwidth-code-point-2.0.0"
sources."string-width-2.1.1"
sources."strip-ansi-4.0.0"
];
@@ -78281,7 +78061,9 @@ in
(sources."workbox-build-3.6.3" // {
dependencies = [
sources."fs-extra-4.0.3"
+ sources."jsonfile-4.0.0"
sources."pretty-bytes-4.0.2"
+ sources."universalify-0.1.2"
];
})
sources."workbox-cache-expiration-3.6.3"
@@ -78299,9 +78081,8 @@ in
sources."worker-farm-1.7.0"
(sources."worker-loader-2.0.0" // {
dependencies = [
- sources."ajv-6.12.6"
- sources."fast-deep-equal-3.1.3"
- sources."json-schema-traverse-0.4.1"
+ sources."json5-1.0.1"
+ sources."loader-utils-1.4.0"
sources."schema-utils-0.4.7"
];
})
@@ -78321,6 +78102,21 @@ in
sources."uuid-7.0.3"
];
})
+ (sources."xdl-59.0.27" // {
+ dependencies = [
+ sources."chownr-1.1.4"
+ sources."fs-minipass-1.2.7"
+ sources."indent-string-3.2.0"
+ sources."minipass-2.9.0"
+ sources."minizlib-1.3.3"
+ sources."p-map-3.0.0"
+ sources."tar-4.4.6"
+ sources."uuid-3.3.2"
+ sources."xcode-2.1.0"
+ sources."xmldom-0.1.27"
+ sources."yallist-3.1.1"
+ ];
+ })
sources."xhr-2.6.0"
sources."xml-js-1.6.11"
sources."xml-parse-from-string-1.0.1"
@@ -78337,9 +78133,11 @@ in
(sources."yargs-13.3.2" // {
dependencies = [
sources."ansi-regex-4.1.0"
- sources."emoji-regex-7.0.3"
sources."find-up-3.0.0"
- sources."is-fullwidth-code-point-2.0.0"
+ sources."locate-path-3.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-3.0.0"
+ sources."path-exists-3.0.0"
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
];
@@ -78584,7 +78382,7 @@ in
})
(sources."@oclif/config-1.17.0" // {
dependencies = [
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."tslib-2.1.0"
];
})
@@ -78677,7 +78475,7 @@ in
];
})
sources."clean-stack-3.0.1"
- sources."cli-table-0.3.5"
+ sources."cli-table-0.3.6"
(sources."cli-ux-4.9.3" // {
dependencies = [
sources."ansi-regex-4.1.0"
@@ -78703,7 +78501,7 @@ in
sources."concat-map-0.0.1"
sources."copy-descriptor-0.1.1"
sources."core-util-is-1.0.2"
- sources."cross-fetch-3.0.6"
+ sources."cross-fetch-3.1.2"
(sources."cross-spawn-6.0.5" // {
dependencies = [
sources."semver-5.7.1"
@@ -78954,7 +78752,7 @@ in
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."query-string-5.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
(sources."readable-stream-2.3.7" // {
dependencies = [
sources."safe-buffer-5.1.2"
@@ -78975,7 +78773,7 @@ in
sources."safe-buffer-5.2.1"
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."set-value-2.0.1" // {
dependencies = [
sources."extend-shallow-2.0.1"
@@ -79109,10 +78907,10 @@ in
firebase-tools = nodeEnv.buildNodePackage {
name = "firebase-tools";
packageName = "firebase-tools";
- version = "9.5.0";
+ version = "9.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.5.0.tgz";
- sha512 = "M73hIhqfdzGO4eMAd+Jj8V2RPG1KDmhjdnHQaZsJOwmPXyX4eBeOO7dpeHTXU5bYg8AeHVzkCOcLobBcXgYxZw==";
+ url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.7.0.tgz";
+ sha512 = "mQaNZ0EE/lOFIc7ycLRSsyWSWKqAAH1/0ND9V9A8HFqu3tAdfTfhxiUUj8dDv1u0u4YVG5hZjpco+AmxeJEnlg==";
};
dependencies = [
sources."@apidevtools/json-schema-ref-parser-9.0.7"
@@ -79123,10 +78921,10 @@ in
sources."@google-cloud/promisify-2.0.3"
(sources."@google-cloud/pubsub-2.10.0" // {
dependencies = [
- sources."google-auth-library-7.0.2"
+ sources."google-auth-library-7.0.3"
];
})
- (sources."@grpc/grpc-js-1.2.10" // {
+ (sources."@grpc/grpc-js-1.2.12" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -79137,7 +78935,7 @@ in
sources."@opentelemetry/context-base-0.12.0"
(sources."@opentelemetry/core-0.12.0" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."@opentelemetry/resources-0.12.0"
@@ -79160,8 +78958,8 @@ in
sources."@types/duplexify-3.6.0"
sources."@types/glob-7.1.3"
sources."@types/long-4.0.1"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.32"
+ sources."@types/minimatch-3.0.4"
+ sources."@types/node-14.14.35"
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
sources."abort-controller-3.0.0"
@@ -79270,8 +79068,8 @@ in
sources."cli-boxes-2.2.1"
sources."cli-color-1.4.0"
sources."cli-cursor-2.1.0"
- sources."cli-spinners-2.5.0"
- sources."cli-table-0.3.5"
+ sources."cli-spinners-2.6.0"
+ sources."cli-table-0.3.6"
sources."cli-width-2.2.1"
sources."clone-1.0.4"
sources."clone-response-1.0.2"
@@ -79313,6 +79111,7 @@ in
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
sources."core-util-is-1.0.2"
+ sources."cors-2.8.5"
sources."crc-32-1.2.0"
sources."crc32-stream-4.0.2"
(sources."cross-env-5.2.1" // {
@@ -79363,7 +79162,7 @@ in
sources."enabled-2.0.0"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."es5-ext-0.10.53"
sources."es6-iterator-2.0.3"
sources."es6-symbol-3.1.3"
@@ -79381,7 +79180,7 @@ in
sources."events-listener-1.1.0"
(sources."exegesis-2.5.6" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."exegesis-express-2.0.0"
@@ -79396,7 +79195,7 @@ in
})
(sources."ext-1.4.0" // {
dependencies = [
- sources."type-2.3.0"
+ sources."type-2.5.0"
];
})
sources."extend-3.0.2"
@@ -79483,9 +79282,9 @@ in
sources."glob-slasher-1.0.1"
sources."global-dirs-2.1.0"
sources."google-auth-library-6.1.6"
- (sources."google-gax-2.10.3" // {
+ (sources."google-gax-2.11.2" // {
dependencies = [
- sources."google-auth-library-7.0.2"
+ sources."google-auth-library-7.0.3"
];
})
sources."google-p12-pem-3.0.3"
@@ -79660,7 +79459,7 @@ in
(sources."node-gyp-7.1.2" // {
dependencies = [
sources."mkdirp-1.0.4"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."tar-6.1.0"
sources."which-2.0.2"
];
@@ -79712,7 +79511,7 @@ in
sources."promise-breaker-5.0.0"
(sources."protobufjs-6.10.2" // {
dependencies = [
- sources."@types/node-13.13.45"
+ sources."@types/node-13.13.47"
];
})
sources."proxy-addr-2.0.6"
@@ -79789,7 +79588,7 @@ in
sources."signal-exit-3.0.3"
sources."simple-swizzle-0.2.2"
sources."smart-buffer-4.1.0"
- sources."socks-2.5.1"
+ sources."socks-2.6.0"
sources."socks-proxy-agent-5.0.0"
sources."source-map-0.6.1"
sources."sprintf-js-1.0.3"
@@ -79989,7 +79788,7 @@ in
sources."wrappy-1.0.2"
sources."y18n-5.0.5"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -80012,7 +79811,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -80025,7 +79824,7 @@ in
sources."@types/minimist-1.2.1"
sources."@types/normalize-package-data-2.4.0"
sources."aggregate-error-3.1.0"
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."arrify-2.0.1"
@@ -80062,7 +79861,7 @@ in
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
sources."has-flag-4.0.0"
- sources."hosted-git-info-3.0.8"
+ sources."hosted-git-info-4.0.2"
sources."human-signals-2.1.0"
sources."iconv-lite-0.4.24"
sources."indent-string-4.0.0"
@@ -80081,7 +79880,7 @@ in
sources."locate-path-5.0.0"
sources."lodash-4.17.21"
sources."lru-cache-6.0.0"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
(sources."meow-8.1.2" // {
dependencies = [
sources."type-fest-0.18.1"
@@ -80096,7 +79895,7 @@ in
];
})
sources."mute-stream-0.0.8"
- sources."normalize-package-data-3.0.0"
+ sources."normalize-package-data-3.0.2"
sources."npm-run-path-4.0.1"
sources."num-sort-2.1.0"
sources."once-1.4.0"
@@ -80138,7 +79937,7 @@ in
sources."run-async-2.4.1"
sources."rxjs-6.6.6"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.3"
@@ -80163,12 +79962,12 @@ in
sources."tmp-0.0.33"
sources."trim-newlines-3.0.0"
sources."tslib-1.14.1"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."validate-npm-package-license-3.0.4"
sources."which-2.0.2"
sources."wrappy-1.0.2"
sources."yallist-4.0.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -80183,10 +79982,10 @@ in
flood = nodeEnv.buildNodePackage {
name = "flood";
packageName = "flood";
- version = "4.4.1";
+ version = "4.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/flood/-/flood-4.4.1.tgz";
- sha512 = "C15ULT/FBNrjhF4Qf6d235+Pnmyv9TO6fqy4t/dS41emoHAjJsFZe5opefo6OQXtZ7BBvUz0flgPclq4zM3mkg==";
+ url = "https://registry.npmjs.org/flood/-/flood-4.5.0.tgz";
+ sha512 = "wBXVekF7rU3EMm4y8aalSxMjxEx8qOJJuqWT8r11ED8+oO9cHT0JwvD6ihaZflyhQX1+P04xgoLYVxwbDCaqUg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -80820,7 +80619,7 @@ in
sources."separator-escape-0.0.1"
sources."sha.js-2.4.5"
sources."smart-buffer-4.1.0"
- sources."socks-2.5.1"
+ sources."socks-2.6.0"
sources."sodium-browserify-1.3.0"
(sources."sodium-browserify-tweetnacl-0.2.6" // {
dependencies = [
@@ -80901,15 +80700,15 @@ in
gitmoji-cli = nodeEnv.buildNodePackage {
name = "gitmoji-cli";
packageName = "gitmoji-cli";
- version = "3.3.0";
+ version = "3.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.3.0.tgz";
- sha512 = "xvuBiQdo0pbBaucrIIGEicPU5ibX+aCDdr9X7kHpsy55q+qqLlzhDJ0aF8LtYFgSI4/hsrk2gSYMVLRAyy6HQg==";
+ url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.3.1.tgz";
+ sha512 = "wsCS8L8QTb9ghnJJpn1qKj+LokhGQ7OlKSM/n6/LhB8E4w/Pn4hiSgqcBthaL5J6CwJiWjpbNSA4t3sE0yqEPw==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -80923,7 +80722,7 @@ in
sources."@szmarczak/http-timer-1.1.2"
sources."@types/minimist-1.2.1"
sources."@types/normalize-package-data-2.4.0"
- sources."ajv-7.2.1"
+ sources."ajv-7.2.3"
sources."ajv-formats-1.5.1"
(sources."ansi-align-3.0.0" // {
dependencies = [
@@ -80934,7 +80733,7 @@ in
sources."strip-ansi-5.2.0"
];
})
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."arrify-1.0.1"
@@ -80961,7 +80760,7 @@ in
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.1"
sources."cli-cursor-3.1.0"
- sources."cli-spinners-2.5.0"
+ sources."cli-spinners-2.6.0"
sources."cli-width-3.0.0"
sources."clone-1.0.4"
sources."clone-response-1.0.2"
@@ -80990,7 +80789,7 @@ in
sources."duplexer3-0.1.4"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."error-ex-1.3.2"
sources."escape-goat-2.1.1"
sources."escape-string-regexp-1.0.5"
@@ -81013,7 +80812,7 @@ in
sources."has-1.0.3"
sources."has-flag-4.0.0"
sources."has-yarn-2.1.0"
- sources."hosted-git-info-3.0.8"
+ sources."hosted-git-info-4.0.2"
sources."http-cache-semantics-4.1.0"
sources."human-signals-2.1.0"
sources."iconv-lite-0.4.24"
@@ -81037,6 +80836,7 @@ in
sources."is-plain-obj-1.1.0"
sources."is-stream-2.0.0"
sources."is-typedarray-1.0.0"
+ sources."is-unicode-supported-0.1.0"
sources."is-yarn-global-0.3.0"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
@@ -81054,7 +80854,7 @@ in
];
})
sources."lodash-4.17.21"
- sources."log-symbols-4.0.0"
+ sources."log-symbols-4.1.0"
sources."lowercase-keys-1.0.1"
sources."lru-cache-6.0.0"
(sources."make-dir-3.1.0" // {
@@ -81062,7 +80862,7 @@ in
sources."semver-6.3.0"
];
})
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
(sources."meow-9.0.0" // {
dependencies = [
sources."type-fest-0.18.1"
@@ -81076,7 +80876,7 @@ in
sources."minimist-options-4.1.0"
sources."mute-stream-0.0.8"
sources."node-fetch-2.6.1"
- sources."normalize-package-data-3.0.0"
+ sources."normalize-package-data-3.0.2"
sources."normalize-url-4.5.0"
sources."npm-run-path-4.0.1"
sources."once-1.4.0"
@@ -81085,7 +80885,7 @@ in
sources."mimic-fn-2.1.0"
];
})
- sources."ora-5.3.0"
+ sources."ora-5.4.0"
sources."os-tmpdir-1.0.2"
sources."p-cancelable-1.1.0"
sources."p-limit-2.3.0"
@@ -81139,7 +80939,7 @@ in
sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -81164,7 +80964,7 @@ in
sources."to-readable-stream-1.0.0"
sources."trim-newlines-3.0.0"
sources."tslib-1.14.1"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."unique-string-2.0.0"
sources."update-notifier-5.1.0"
@@ -81180,7 +80980,7 @@ in
sources."write-file-atomic-3.0.3"
sources."xdg-basedir-4.0.0"
sources."yallist-4.0.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -81204,7 +81004,7 @@ in
sources."@ardatan/aggregate-error-0.0.6"
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -81217,24 +81017,21 @@ in
sources."@exodus/schemasafe-1.0.0-rc.3"
sources."@graphql-cli/common-4.1.0"
sources."@graphql-cli/init-4.1.0"
- (sources."@graphql-tools/batch-execute-7.0.0" // {
+ (sources."@graphql-tools/batch-execute-7.1.0" // {
dependencies = [
- (sources."@graphql-tools/utils-7.5.0" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
+ sources."@graphql-tools/utils-7.7.1"
+ sources."tslib-2.1.0"
];
})
- (sources."@graphql-tools/delegate-7.0.10" // {
+ (sources."@graphql-tools/delegate-7.1.1" // {
dependencies = [
- sources."@graphql-tools/utils-7.5.0"
+ sources."@graphql-tools/utils-7.7.1"
sources."tslib-2.1.0"
];
})
(sources."@graphql-tools/graphql-file-loader-6.2.7" // {
dependencies = [
- sources."@graphql-tools/utils-7.5.0"
+ sources."@graphql-tools/utils-7.7.1"
sources."tslib-2.1.0"
];
})
@@ -81245,7 +81042,7 @@ in
})
(sources."@graphql-tools/json-file-loader-6.2.6" // {
dependencies = [
- (sources."@graphql-tools/utils-7.5.0" // {
+ (sources."@graphql-tools/utils-7.7.1" // {
dependencies = [
sources."tslib-2.1.0"
];
@@ -81253,21 +81050,22 @@ in
];
})
sources."@graphql-tools/load-6.2.4"
- (sources."@graphql-tools/merge-6.2.10" // {
+ (sources."@graphql-tools/merge-6.2.11" // {
dependencies = [
- sources."@graphql-tools/utils-7.5.0"
+ sources."@graphql-tools/utils-7.7.1"
sources."tslib-2.1.0"
];
})
(sources."@graphql-tools/schema-7.1.3" // {
dependencies = [
- sources."@graphql-tools/utils-7.5.0"
+ sources."@graphql-tools/utils-7.7.1"
sources."tslib-2.1.0"
];
})
- (sources."@graphql-tools/url-loader-6.8.1" // {
+ (sources."@graphql-tools/url-loader-6.8.2" // {
dependencies = [
- sources."@graphql-tools/utils-7.5.0"
+ sources."@graphql-tools/utils-7.7.1"
+ sources."cross-fetch-3.1.1"
sources."form-data-4.0.0"
sources."tslib-2.1.0"
];
@@ -81283,7 +81081,7 @@ in
})
(sources."@graphql-tools/wrap-7.0.5" // {
dependencies = [
- (sources."@graphql-tools/utils-7.5.0" // {
+ (sources."@graphql-tools/utils-7.7.1" // {
dependencies = [
sources."tslib-2.1.0"
];
@@ -81297,14 +81095,14 @@ in
sources."@nodelib/fs.walk-1.2.6"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/parse-json-4.0.0"
- sources."@types/websocket-1.0.1"
+ sources."@types/websocket-1.0.2"
sources."aggregate-error-3.1.0"
sources."ajv-6.12.6"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-4.1.0"
@@ -81346,7 +81144,7 @@ in
sources."chownr-2.0.0"
sources."clean-stack-2.2.0"
sources."cli-cursor-2.1.0"
- sources."cli-spinners-2.5.0"
+ sources."cli-spinners-2.6.0"
sources."cli-width-3.0.0"
(sources."cliui-7.0.4" // {
dependencies = [
@@ -81400,7 +81198,7 @@ in
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
sources."esprima-4.0.1"
- sources."eventsource-1.0.7"
+ sources."eventsource-1.1.0"
sources."execa-1.0.0"
sources."extend-3.0.2"
(sources."external-editor-3.1.0" // {
@@ -81451,7 +81249,7 @@ in
sources."graphql-subscriptions-1.2.1"
sources."graphql-type-json-0.3.2"
sources."graphql-upload-11.0.0"
- sources."graphql-ws-4.1.5"
+ sources."graphql-ws-4.2.2"
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."has-1.0.3"
@@ -81508,6 +81306,7 @@ in
sources."is-symbol-1.0.3"
sources."is-typed-array-1.1.5"
sources."is-typedarray-1.0.0"
+ sources."is-unicode-supported-0.1.0"
sources."is-weakmap-2.0.1"
sources."is-weakset-2.0.1"
sources."is-wsl-2.2.0"
@@ -81609,7 +81408,7 @@ in
dependencies = [
sources."ansi-regex-5.0.0"
sources."cli-cursor-3.1.0"
- sources."log-symbols-4.0.0"
+ sources."log-symbols-4.1.0"
sources."mimic-fn-2.1.0"
sources."onetime-5.1.2"
sources."restore-cursor-3.1.0"
@@ -81619,7 +81418,7 @@ in
sources."original-1.0.2"
sources."os-tmpdir-1.0.2"
sources."p-any-2.1.0"
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."p-defer-1.0.0"
sources."p-finally-1.0.0"
sources."p-is-promise-2.1.0"
@@ -81652,7 +81451,7 @@ in
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."querystringify-2.2.0"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."rc-1.2.8"
sources."reftools-1.1.8"
sources."regexp.prototype.flags-1.3.1"
@@ -81746,12 +81545,12 @@ in
];
})
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."y18n-5.0.5"
sources."yallist-4.0.0"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.2"
sources."yargs-16.0.3"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -82182,7 +81981,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
sources."ansi-term-0.0.2"
@@ -82194,7 +81993,7 @@ in
sources."cardinal-2.1.1"
sources."chalk-1.1.3"
sources."charm-0.1.2"
- sources."cli-table-0.3.5"
+ sources."cli-table-0.3.6"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."colors-1.0.3"
@@ -82244,9 +82043,9 @@ in
sources."supports-color-7.2.0"
];
})
- sources."systeminformation-4.34.15"
+ sources."systeminformation-4.34.19"
sources."term-canvas-0.0.5"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."wordwrap-0.0.3"
sources."x256-0.0.2"
sources."xml2js-0.4.23"
@@ -82362,7 +82161,11 @@ in
sources."concat-stream-1.6.2"
sources."convert-source-map-1.7.0"
sources."copy-descriptor-0.1.1"
- sources."copy-props-2.0.4"
+ (sources."copy-props-2.0.5" // {
+ dependencies = [
+ sources."is-plain-object-5.0.0"
+ ];
+ })
sources."core-util-is-1.0.2"
sources."d-1.0.1"
sources."debug-2.6.9"
@@ -82406,7 +82209,7 @@ in
sources."expand-tilde-2.0.2"
(sources."ext-1.4.0" // {
dependencies = [
- sources."type-2.3.0"
+ sources."type-2.5.0"
];
})
sources."extend-3.0.2"
@@ -82784,7 +82587,7 @@ in
sources."component-emitter-1.3.0"
sources."concat-stream-1.6.2"
sources."copy-descriptor-0.1.1"
- sources."copy-props-2.0.4"
+ sources."copy-props-2.0.5"
sources."core-util-is-1.0.2"
sources."d-1.0.1"
sources."debug-2.6.9"
@@ -82794,7 +82597,11 @@ in
sources."define-properties-1.1.3"
sources."define-property-2.0.2"
sources."detect-file-1.0.0"
- sources."each-props-1.3.2"
+ (sources."each-props-1.3.2" // {
+ dependencies = [
+ sources."is-plain-object-2.0.4"
+ ];
+ })
sources."error-ex-1.3.2"
sources."es5-ext-0.10.53"
sources."es6-iterator-2.0.3"
@@ -82812,13 +82619,14 @@ in
sources."expand-tilde-2.0.2"
(sources."ext-1.4.0" // {
dependencies = [
- sources."type-2.3.0"
+ sources."type-2.5.0"
];
})
sources."extend-3.0.2"
(sources."extend-shallow-3.0.2" // {
dependencies = [
sources."is-extendable-1.0.1"
+ sources."is-plain-object-2.0.4"
];
})
(sources."extglob-2.0.4" // {
@@ -82835,7 +82643,11 @@ in
})
sources."find-up-1.1.2"
sources."findup-sync-3.0.0"
- sources."fined-1.2.0"
+ (sources."fined-1.2.0" // {
+ dependencies = [
+ sources."is-plain-object-2.0.4"
+ ];
+ })
sources."flagged-respawn-1.0.1"
sources."for-in-1.0.2"
sources."for-own-1.0.0"
@@ -82891,7 +82703,7 @@ in
sources."kind-of-3.2.2"
];
})
- sources."is-plain-object-2.0.4"
+ sources."is-plain-object-5.0.0"
sources."is-relative-1.0.0"
sources."is-unc-path-1.0.0"
sources."is-utf8-0.2.1"
@@ -82901,7 +82713,11 @@ in
sources."isobject-3.0.1"
sources."kind-of-5.1.0"
sources."lcid-1.0.0"
- sources."liftoff-3.1.0"
+ (sources."liftoff-3.1.0" // {
+ dependencies = [
+ sources."is-plain-object-2.0.4"
+ ];
+ })
sources."load-json-file-1.1.0"
(sources."make-iterator-1.0.1" // {
dependencies = [
@@ -82924,6 +82740,7 @@ in
(sources."mixin-deep-1.3.2" // {
dependencies = [
sources."is-extendable-1.0.1"
+ sources."is-plain-object-2.0.4"
];
})
sources."ms-2.0.0"
@@ -82995,6 +82812,7 @@ in
(sources."set-value-2.0.1" // {
dependencies = [
sources."extend-shallow-2.0.1"
+ sources."is-plain-object-2.0.4"
];
})
(sources."snapdragon-0.8.2" // {
@@ -83121,7 +82939,7 @@ in
sources."param-case-2.1.1"
sources."relateurl-0.2.7"
sources."source-map-0.6.1"
- sources."uglify-js-3.13.0"
+ sources."uglify-js-3.13.2"
sources."upper-case-1.1.3"
];
buildInputs = globalBuildInputs;
@@ -83239,12 +83057,17 @@ in
dependencies = [
sources."async-2.6.3"
sources."basic-auth-1.1.0"
+ sources."call-bind-1.0.2"
sources."colors-1.4.0"
sources."corser-2.0.1"
sources."debug-3.2.7"
sources."ecstatic-3.3.2"
sources."eventemitter3-4.0.7"
sources."follow-redirects-1.13.3"
+ sources."function-bind-1.1.1"
+ sources."get-intrinsic-1.1.1"
+ sources."has-1.0.3"
+ sources."has-symbols-1.0.2"
sources."he-1.2.0"
sources."http-proxy-1.18.1"
sources."lodash-4.17.21"
@@ -83252,11 +83075,13 @@ in
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
sources."ms-2.1.3"
+ sources."object-inspect-1.9.0"
sources."opener-1.5.2"
sources."portfinder-1.0.28"
- sources."qs-6.9.6"
+ sources."qs-6.10.1"
sources."requires-port-1.0.0"
sources."secure-compare-3.0.1"
+ sources."side-channel-1.0.4"
sources."union-0.5.0"
sources."url-join-2.0.5"
];
@@ -83843,7 +83668,7 @@ in
sources."arch-2.2.0"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
- sources."clipboard-2.0.7"
+ sources."clipboard-2.0.8"
sources."clipboardy-2.3.0"
sources."clone-1.0.4"
sources."concat-map-0.0.1"
@@ -83939,6 +83764,7 @@ in
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."bytes-3.1.0"
+ sources."call-bind-1.0.2"
(sources."chalk-3.0.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -84006,11 +83832,15 @@ in
sources."string_decoder-0.10.31"
];
})
+ sources."function-bind-1.1.1"
+ sources."get-intrinsic-1.1.1"
sources."get-stream-4.1.0"
sources."get-uri-3.0.2"
sources."glob-7.1.6"
sources."graceful-fs-4.2.6"
+ sources."has-1.0.3"
sources."has-flag-4.0.0"
+ sources."has-symbols-1.0.2"
sources."http-errors-1.7.3"
sources."http-proxy-agent-4.0.1"
sources."https-proxy-agent-5.0.0"
@@ -84020,7 +83850,7 @@ in
sources."inherits-2.0.4"
(sources."inquirer-7.3.3" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
sources."cli-cursor-3.1.0"
@@ -84087,6 +83917,7 @@ in
sources."path-key-2.0.1"
];
})
+ sources."object-inspect-1.9.0"
sources."once-1.4.0"
sources."onetime-2.0.1"
sources."open-7.4.2"
@@ -84103,7 +83934,7 @@ in
sources."proxy-agent-4.0.1"
sources."proxy-from-env-1.1.0"
sources."pump-3.0.0"
- sources."qs-6.9.6"
+ sources."qs-6.10.1"
sources."raw-body-2.4.1"
sources."readable-stream-3.6.0"
sources."restore-cursor-2.0.0"
@@ -84118,6 +83949,7 @@ in
sources."setprototypeof-1.1.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
+ sources."side-channel-1.0.4"
sources."signal-exit-3.0.3"
(sources."slice-ansi-3.0.0" // {
dependencies = [
@@ -84128,7 +83960,7 @@ in
];
})
sources."smart-buffer-4.1.0"
- sources."socks-2.5.1"
+ sources."socks-2.6.0"
sources."socks-proxy-agent-5.0.0"
sources."source-map-0.6.1"
sources."split2-3.2.2"
@@ -84169,7 +84001,7 @@ in
sources."tree-kill-1.2.2"
sources."tslib-1.14.1"
sources."type-check-0.3.2"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."universalify-0.1.2"
sources."unpipe-1.0.0"
@@ -84274,7 +84106,7 @@ in
sources."@ot-builder/trace-1.0.3"
sources."@ot-builder/var-store-1.0.3"
sources."@ot-builder/variance-1.0.3"
- sources."@unicode/unicode-13.0.0-1.0.4"
+ sources."@unicode/unicode-13.0.0-1.0.6"
sources."amdefine-1.0.1"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
@@ -84283,7 +84115,6 @@ in
sources."at-least-node-1.0.0"
sources."atob-2.1.2"
sources."balanced-match-1.0.0"
- sources."bluebird-3.7.2"
sources."brace-expansion-1.1.11"
sources."camelcase-5.3.1"
sources."chainsaw-0.0.9"
@@ -84337,17 +84168,14 @@ in
sources."find-up-4.1.0"
sources."fs-extra-9.1.0"
sources."fs.realpath-1.0.0"
- sources."function-bind-1.1.1"
sources."get-caller-file-2.0.5"
sources."glob-7.1.6"
sources."graceful-fs-4.2.6"
- sources."has-1.0.3"
sources."has-flag-3.0.0"
sources."hashish-0.0.4"
sources."iconv-lite-0.6.2"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
- sources."is-core-module-2.2.0"
sources."is-fullwidth-code-point-3.0.0"
sources."isexe-2.0.0"
sources."jake-10.8.2"
@@ -84381,21 +84209,19 @@ in
sources."patel-0.34.0"
sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
- sources."path-parse-1.0.6"
sources."patrisika-0.22.2"
sources."patrisika-scopes-0.11.1"
sources."pegjs-0.10.0"
sources."prelude-ls-1.1.2"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
- sources."resolve-1.20.0"
sources."resolve-url-0.2.1"
sources."restore-cursor-3.1.0"
sources."resumer-0.0.0"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
sources."semaphore-async-await-1.5.1"
- (sources."semver-7.3.4" // {
+ (sources."semver-7.3.5" // {
dependencies = [
sources."lru-cache-6.0.0"
];
@@ -84411,9 +84237,7 @@ in
sources."tslib-1.14.1"
];
})
- sources."split-1.0.1"
sources."sprintf-js-1.0.3"
- sources."stack-trace-0.0.9"
sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
(sources."stylus-0.54.8" // {
@@ -84426,14 +84250,13 @@ in
sources."through-2.3.8"
sources."toposort-2.0.2"
sources."traverse-0.3.9"
- sources."ts-process-promises-1.0.2"
sources."tslib-2.1.0"
sources."type-check-0.3.2"
sources."typo-geom-0.11.2"
sources."unicoderegexp-0.4.1"
sources."universalify-2.0.0"
sources."urix-0.1.0"
- (sources."verda-1.2.1" // {
+ (sources."verda-1.2.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
@@ -84466,7 +84289,7 @@ in
sources."y18n-5.0.5"
sources."yallist-4.0.0"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -84524,7 +84347,7 @@ in
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."bufrw-1.3.0"
- sources."chai-4.3.3"
+ sources."chai-4.3.4"
sources."chai-as-promised-7.1.1"
sources."chalk-2.4.2"
sources."check-error-1.0.2"
@@ -84656,7 +84479,7 @@ in
sources."async-mutex-0.1.4"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.858.0" // {
+ (sources."aws-sdk-2.871.0" // {
dependencies = [
sources."sax-1.2.1"
sources."uuid-3.3.2"
@@ -84776,7 +84599,7 @@ in
sources."domelementtype-2.1.0"
sources."domexception-1.0.1"
sources."domhandler-3.3.0"
- (sources."domutils-2.4.4" // {
+ (sources."domutils-2.5.0" // {
dependencies = [
sources."domhandler-4.0.0"
];
@@ -84854,7 +84677,7 @@ in
sources."has-flag-4.0.0"
sources."has-unicode-2.0.1"
sources."he-1.2.0"
- sources."highlight.js-10.6.0"
+ sources."highlight.js-10.7.1"
sources."html-encoding-sniffer-1.0.2"
sources."html-entities-1.4.0"
sources."html-minifier-3.5.21"
@@ -84956,7 +84779,7 @@ in
];
})
sources."keytar-7.4.0"
- sources."khroma-1.2.0"
+ sources."khroma-1.3.0"
sources."klaw-1.3.1"
sources."lazyness-1.2.0"
sources."levenshtein-1.0.5"
@@ -85004,7 +84827,7 @@ in
sources."md5-2.3.0"
sources."md5-file-4.0.0"
sources."mdurl-1.0.1"
- sources."mermaid-8.9.1"
+ sources."mermaid-8.9.2"
sources."mime-db-1.46.0"
sources."mime-types-2.1.29"
sources."mimic-response-2.1.0"
@@ -85014,7 +84837,7 @@ in
sources."debug-4.3.2"
sources."html-minifier-4.0.0"
sources."ms-2.1.2"
- sources."uglify-js-3.13.0"
+ sources."uglify-js-3.13.2"
];
})
sources."minimatch-3.0.4"
@@ -85032,7 +84855,7 @@ in
sources."ms-2.1.3"
sources."multiparty-4.2.2"
sources."mustache-4.1.0"
- sources."nanoid-3.1.20"
+ sources."nanoid-3.1.22"
sources."napi-build-utils-1.0.2"
sources."ndarray-1.0.19"
sources."ndarray-pack-1.2.1"
@@ -85056,7 +84879,7 @@ in
sources."which-1.3.1"
];
})
- (sources."node-notifier-8.0.1" // {
+ (sources."node-notifier-8.0.2" // {
dependencies = [
sources."uuid-8.3.2"
];
@@ -85154,7 +84977,7 @@ in
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
sources."saxes-3.1.11"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."server-destroy-1.0.1"
sources."set-blocking-2.0.0"
sources."setimmediate-1.0.5"
@@ -85402,7 +85225,7 @@ in
sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ==";
};
dependencies = [
- sources."@babel/parser-7.13.9"
+ sources."@babel/parser-7.13.12"
sources."argparse-1.0.10"
sources."bluebird-3.7.2"
sources."catharsis-0.8.11"
@@ -85542,6 +85365,7 @@ in
dependencies = [
sources."argparse-1.0.10"
sources."asynckit-0.4.0"
+ sources."call-bind-1.0.2"
sources."combined-stream-1.0.8"
sources."commander-4.1.1"
sources."component-emitter-1.3.0"
@@ -85553,7 +85377,11 @@ in
sources."extend-3.0.2"
sources."form-data-2.5.1"
sources."formidable-1.2.2"
+ sources."function-bind-1.1.1"
+ sources."get-intrinsic-1.1.1"
sources."graphlib-2.1.8"
+ sources."has-1.0.3"
+ sources."has-symbols-1.0.2"
sources."inherits-2.0.4"
sources."isarray-1.0.0"
sources."js-yaml-3.14.1"
@@ -85564,12 +85392,14 @@ in
sources."mime-types-2.1.29"
sources."ms-2.1.3"
sources."native-promise-only-0.8.1"
+ sources."object-inspect-1.9.0"
sources."path-loader-1.0.10"
sources."process-nextick-args-2.0.1"
sources."punycode-2.1.1"
- sources."qs-6.9.6"
+ sources."qs-6.10.1"
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
+ sources."side-channel-1.0.4"
sources."slash-3.0.0"
sources."sprintf-js-1.0.3"
sources."string_decoder-1.1.1"
@@ -85729,7 +85559,7 @@ in
];
})
sources."ms-2.0.0"
- sources."nanoid-3.1.20"
+ sources."nanoid-3.1.22"
sources."negotiator-0.6.2"
sources."normalize-url-4.5.0"
sources."object-assign-4.1.1"
@@ -85765,7 +85595,7 @@ in
sources."responselike-1.0.2"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."semver-compare-1.0.0"
(sources."semver-diff-3.1.1" // {
dependencies = [
@@ -85818,7 +85648,7 @@ in
sources."y18n-5.0.5"
sources."yallist-4.0.0"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -85856,19 +85686,270 @@ in
bypassCache = true;
reconstructLock = true;
};
+ kaput-cli = nodeEnv.buildNodePackage {
+ name = "kaput-cli";
+ packageName = "kaput-cli";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kaput-cli/-/kaput-cli-1.1.1.tgz";
+ sha512 = "JbF3PiO1wNawJnOQlb4nJZ2rvDfDWnD7ROCdzqgFXhqi3XTNXBqjpoC7PT3ylfNR6BGibjchndH27VieqyMA0A==";
+ };
+ dependencies = [
+ sources."@nodelib/fs.scandir-2.1.4"
+ sources."@nodelib/fs.stat-2.0.4"
+ sources."@nodelib/fs.walk-1.2.6"
+ sources."@oclif/command-1.8.0"
+ (sources."@oclif/config-1.17.0" // {
+ dependencies = [
+ sources."tslib-2.1.0"
+ ];
+ })
+ sources."@oclif/errors-1.3.4"
+ sources."@oclif/linewrap-1.0.0"
+ (sources."@oclif/parser-3.8.5" // {
+ dependencies = [
+ sources."ansi-styles-3.2.1"
+ sources."chalk-2.4.2"
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."escape-string-regexp-1.0.5"
+ ];
+ })
+ (sources."@oclif/plugin-help-3.2.2" // {
+ dependencies = [
+ sources."ansi-regex-3.0.0"
+ sources."ansi-styles-3.2.1"
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."is-fullwidth-code-point-2.0.0"
+ (sources."wrap-ansi-4.0.0" // {
+ dependencies = [
+ sources."string-width-2.1.1"
+ sources."strip-ansi-4.0.0"
+ ];
+ })
+ ];
+ })
+ sources."@oclif/screen-1.0.4"
+ sources."@putdotio/api-client-8.15.1"
+ sources."ajv-6.12.6"
+ sources."ansi-escapes-4.3.2"
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."ansicolors-0.3.2"
+ sources."argparse-1.0.10"
+ sources."array-union-2.1.0"
+ sources."asynckit-0.4.0"
+ sources."axios-0.19.2"
+ sources."braces-3.0.2"
+ sources."call-bind-1.0.2"
+ sources."cardinal-2.1.1"
+ (sources."chalk-4.1.0" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ ];
+ })
+ sources."chardet-0.7.0"
+ sources."clean-stack-3.0.1"
+ sources."cli-cursor-3.1.0"
+ sources."cli-progress-3.9.0"
+ (sources."cli-ux-5.5.1" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ sources."tslib-2.1.0"
+ ];
+ })
+ sources."cli-width-3.0.0"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
+ sources."colors-1.4.0"
+ sources."combined-stream-1.0.8"
+ (sources."conf-6.2.4" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ (sources."cross-spawn-6.0.5" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ ];
+ })
+ (sources."d-1.0.1" // {
+ dependencies = [
+ sources."type-1.2.0"
+ ];
+ })
+ sources."debounce-fn-3.0.1"
+ sources."debug-4.3.2"
+ sources."delayed-stream-1.0.0"
+ sources."dir-glob-3.0.1"
+ sources."dot-prop-5.3.0"
+ sources."dotenv-8.2.0"
+ sources."emoji-regex-8.0.0"
+ sources."env-paths-2.2.1"
+ sources."es5-ext-0.10.53"
+ sources."es6-iterator-2.0.3"
+ sources."es6-symbol-3.1.3"
+ sources."escape-string-regexp-4.0.0"
+ sources."esprima-4.0.1"
+ sources."event-emitter-0.3.5"
+ sources."ext-1.4.0"
+ sources."external-editor-3.1.0"
+ sources."extract-stack-2.0.0"
+ sources."fast-deep-equal-3.1.3"
+ sources."fast-glob-3.2.5"
+ sources."fast-json-stable-stringify-2.1.0"
+ sources."fastq-1.11.0"
+ (sources."figures-3.2.0" // {
+ dependencies = [
+ sources."escape-string-regexp-1.0.5"
+ ];
+ })
+ sources."fill-range-7.0.1"
+ sources."find-up-3.0.0"
+ (sources."follow-redirects-1.5.10" // {
+ dependencies = [
+ sources."debug-3.1.0"
+ sources."ms-2.0.0"
+ ];
+ })
+ sources."form-data-3.0.1"
+ sources."fs-extra-8.1.0"
+ sources."function-bind-1.1.1"
+ sources."get-intrinsic-1.1.1"
+ sources."glob-parent-5.1.2"
+ sources."globby-11.0.3"
+ sources."graceful-fs-4.2.6"
+ sources."has-1.0.3"
+ sources."has-flag-3.0.0"
+ sources."has-symbols-1.0.2"
+ sources."hyperlinker-1.0.0"
+ sources."iconv-lite-0.4.24"
+ sources."ignore-5.1.8"
+ sources."imurmurhash-0.1.4"
+ sources."indent-string-4.0.0"
+ sources."inquirer-7.3.3"
+ sources."is-docker-2.1.1"
+ sources."is-extglob-2.1.1"
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."is-glob-4.0.1"
+ sources."is-number-7.0.0"
+ sources."is-obj-2.0.0"
+ sources."is-typedarray-1.0.0"
+ sources."is-wsl-2.2.0"
+ sources."isexe-2.0.0"
+ sources."js-base64-2.6.4"
+ sources."js-yaml-3.14.1"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-schema-typed-7.0.3"
+ sources."jsonfile-4.0.0"
+ sources."locate-path-3.0.0"
+ sources."lodash-4.17.21"
+ sources."lodash._reinterpolate-3.0.0"
+ sources."lodash.template-4.5.0"
+ sources."lodash.templatesettings-4.2.0"
+ sources."lru-cache-6.0.0"
+ (sources."make-dir-3.1.0" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."merge2-1.4.1"
+ sources."micromatch-4.0.2"
+ sources."mime-db-1.46.0"
+ sources."mime-types-2.1.29"
+ sources."mimic-fn-2.1.0"
+ sources."moment-2.29.1"
+ sources."ms-2.1.2"
+ sources."mute-stream-0.0.8"
+ sources."natural-orderby-2.0.3"
+ sources."next-tick-1.0.0"
+ sources."nice-try-1.0.5"
+ sources."node-downloader-helper-1.0.17"
+ sources."object-inspect-1.9.0"
+ sources."object-treeify-1.1.33"
+ sources."onetime-5.1.2"
+ sources."os-tmpdir-1.0.2"
+ sources."p-limit-2.3.0"
+ sources."p-locate-3.0.0"
+ sources."p-try-2.2.0"
+ (sources."password-prompt-1.1.2" // {
+ dependencies = [
+ sources."ansi-escapes-3.2.0"
+ ];
+ })
+ sources."path-exists-3.0.0"
+ sources."path-key-2.0.1"
+ sources."path-type-4.0.0"
+ sources."picomatch-2.2.2"
+ sources."pkg-up-3.1.0"
+ sources."punycode-2.1.1"
+ sources."qs-6.10.1"
+ sources."queue-microtask-1.2.3"
+ sources."redeyed-2.1.1"
+ sources."restore-cursor-3.1.0"
+ sources."reusify-1.0.4"
+ sources."run-async-2.4.1"
+ sources."run-parallel-1.2.0"
+ sources."rxjs-6.6.6"
+ sources."safer-buffer-2.1.2"
+ sources."semver-7.3.5"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."side-channel-1.0.4"
+ sources."signal-exit-3.0.3"
+ sources."slash-3.0.0"
+ sources."sprintf-js-1.0.3"
+ sources."string-width-4.2.2"
+ sources."strip-ansi-6.0.0"
+ sources."supports-color-5.5.0"
+ (sources."supports-hyperlinks-2.1.0" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ ];
+ })
+ sources."through-2.3.8"
+ sources."tmp-0.0.33"
+ sources."to-regex-range-5.0.1"
+ sources."tslib-1.14.1"
+ sources."type-2.5.0"
+ sources."type-fest-0.21.3"
+ sources."typedarray-to-buffer-3.1.5"
+ sources."universalify-0.1.2"
+ sources."uri-js-4.4.1"
+ sources."urijs-1.19.6"
+ sources."which-1.3.1"
+ sources."widest-line-3.1.0"
+ sources."wrap-ansi-7.0.0"
+ sources."write-file-atomic-3.0.3"
+ sources."yallist-4.0.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "CLI tools for Put.io";
+ homepage = "https://github.com/davidchalifoux/kaput-cli";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
karma = nodeEnv.buildNodePackage {
name = "karma";
packageName = "karma";
- version = "6.1.1";
+ version = "6.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/karma/-/karma-6.1.1.tgz";
- sha512 = "vVDFxFGAsclgmFjZA/qGw5xqWdZIWxVD7xLyCukYUYd5xs/uGzYbXGOT5zOruVBQleKEmXIr4H2hzGCTn+M9Cg==";
+ url = "https://registry.npmjs.org/karma/-/karma-6.3.1.tgz";
+ sha512 = "Is71g0f1dIpbLTXA+ULpev1i1soczQ1Dr8oum3zSmBFsDl3IWUlTLytsCb9os4v9xvUVWGDz0sCmLO4veANnSw==";
};
dependencies = [
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.0"
sources."@types/cors-2.8.10"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."accepts-1.3.7"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
@@ -85964,7 +86045,7 @@ in
sources."readdirp-3.5.0"
sources."require-directory-2.1.1"
sources."requires-port-1.0.0"
- sources."rfdc-1.2.0"
+ sources."rfdc-1.3.0"
sources."rimraf-3.0.2"
sources."safer-buffer-2.1.2"
sources."setprototypeof-1.1.1"
@@ -85996,7 +86077,7 @@ in
sources."to-regex-range-5.0.1"
sources."toidentifier-1.0.0"
sources."type-is-1.6.18"
- sources."ua-parser-js-0.7.24"
+ sources."ua-parser-js-0.7.25"
sources."universalify-0.1.2"
sources."unpipe-1.0.0"
sources."utils-merge-1.0.1"
@@ -86007,7 +86088,7 @@ in
sources."ws-7.4.4"
sources."y18n-5.0.5"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -86384,7 +86465,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -86443,7 +86524,7 @@ in
sources."@lerna/npm-install-4.0.0"
(sources."@lerna/npm-publish-4.0.0" // {
dependencies = [
- sources."normalize-package-data-3.0.0"
+ sources."normalize-package-data-3.0.2"
sources."pify-5.0.0"
sources."read-package-json-3.0.1"
];
@@ -86485,30 +86566,30 @@ in
sources."@npmcli/move-file-1.1.2"
sources."@npmcli/node-gyp-1.0.2"
sources."@npmcli/promise-spawn-1.3.2"
- sources."@npmcli/run-script-1.8.3"
+ sources."@npmcli/run-script-1.8.4"
sources."@octokit/auth-token-2.4.5"
- sources."@octokit/core-3.2.5"
+ sources."@octokit/core-3.3.1"
(sources."@octokit/endpoint-6.0.11" // {
dependencies = [
sources."is-plain-object-5.0.0"
];
})
- sources."@octokit/graphql-4.6.0"
- sources."@octokit/openapi-types-5.3.1"
+ sources."@octokit/graphql-4.6.1"
+ sources."@octokit/openapi-types-6.0.0"
sources."@octokit/plugin-enterprise-rest-6.0.1"
- sources."@octokit/plugin-paginate-rest-2.11.0"
+ sources."@octokit/plugin-paginate-rest-2.13.3"
sources."@octokit/plugin-request-log-1.0.3"
- sources."@octokit/plugin-rest-endpoint-methods-4.13.4"
+ sources."@octokit/plugin-rest-endpoint-methods-4.14.0"
(sources."@octokit/request-5.4.14" // {
dependencies = [
sources."is-plain-object-5.0.0"
];
})
sources."@octokit/request-error-2.0.5"
- sources."@octokit/rest-18.3.4"
- sources."@octokit/types-6.12.1"
+ sources."@octokit/rest-18.4.0"
+ sources."@octokit/types-6.13.0"
sources."@tootallnate/once-1.1.2"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/minimist-1.2.1"
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse-json-4.0.0"
@@ -86519,9 +86600,9 @@ in
sources."agentkeepalive-4.1.4"
sources."aggregate-error-3.1.0"
sources."ajv-6.12.6"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-2.1.1"
@@ -86555,7 +86636,7 @@ in
sources."builtins-1.0.3"
sources."byline-5.0.0"
sources."byte-size-7.0.1"
- sources."cacache-15.0.5"
+ sources."cacache-15.0.6"
sources."call-bind-1.0.2"
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
@@ -86594,7 +86675,7 @@ in
sources."conventional-changelog-angular-5.0.12"
(sources."conventional-changelog-core-4.2.2" // {
dependencies = [
- sources."normalize-package-data-3.0.0"
+ sources."normalize-package-data-3.0.2"
];
})
sources."conventional-changelog-preset-loader-2.3.4"
@@ -86637,7 +86718,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."emoji-regex-8.0.0"
sources."encoding-0.1.13"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."envinfo-7.7.4"
sources."err-code-2.0.3"
sources."error-ex-1.3.2"
@@ -86723,7 +86804,7 @@ in
sources."gitconfiglocal-1.0.0"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."graceful-fs-4.2.6"
sources."handlebars-4.7.7"
sources."har-schema-2.0.0"
@@ -86734,7 +86815,7 @@ in
sources."has-flag-4.0.0"
sources."has-symbols-1.0.2"
sources."has-unicode-2.0.1"
- sources."hosted-git-info-3.0.8"
+ sources."hosted-git-info-4.0.2"
sources."http-cache-semantics-4.1.0"
sources."http-proxy-agent-4.0.1"
sources."http-signature-1.2.0"
@@ -86758,7 +86839,7 @@ in
sources."ini-1.3.8"
(sources."init-package-json-2.0.2" // {
dependencies = [
- sources."normalize-package-data-3.0.0"
+ sources."normalize-package-data-3.0.2"
sources."read-package-json-3.0.1"
];
})
@@ -86814,7 +86895,7 @@ in
sources."libnpmaccess-4.0.1"
(sources."libnpmpublish-4.0.0" // {
dependencies = [
- sources."normalize-package-data-3.0.0"
+ sources."normalize-package-data-3.0.2"
];
})
sources."lines-and-columns-1.1.6"
@@ -86827,7 +86908,6 @@ in
sources."lodash-4.17.21"
sources."lodash._reinterpolate-3.0.0"
sources."lodash.ismatch-4.4.0"
- sources."lodash.sortby-4.7.0"
sources."lodash.template-4.5.0"
sources."lodash.templatesettings-4.2.0"
sources."loud-rejection-1.6.0"
@@ -86838,11 +86918,11 @@ in
];
})
sources."make-fetch-happen-8.0.14"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
(sources."meow-8.1.2" // {
dependencies = [
sources."hosted-git-info-2.8.8"
- sources."normalize-package-data-3.0.0"
+ sources."normalize-package-data-3.0.2"
(sources."read-pkg-5.2.0" // {
dependencies = [
sources."normalize-package-data-2.5.0"
@@ -86917,9 +86997,9 @@ in
];
})
sources."npm-normalize-package-bin-1.0.1"
- sources."npm-package-arg-8.1.1"
+ sources."npm-package-arg-8.1.2"
sources."npm-packlist-2.1.4"
- sources."npm-pick-manifest-6.1.0"
+ sources."npm-pick-manifest-6.1.1"
sources."npm-registry-fetch-9.0.0"
sources."npm-run-path-4.0.1"
sources."npmlog-4.1.2"
@@ -86946,13 +87026,13 @@ in
sources."p-timeout-3.2.0"
sources."p-try-2.2.0"
sources."p-waterfall-2.1.1"
- sources."pacote-11.2.7"
+ sources."pacote-11.3.1"
sources."parent-module-1.0.1"
sources."parse-github-repo-url-1.4.1"
sources."parse-json-5.2.0"
(sources."parse-path-4.0.3" // {
dependencies = [
- sources."qs-6.9.6"
+ sources."qs-6.10.1"
];
})
sources."parse-url-5.0.2"
@@ -86974,12 +87054,11 @@ in
sources."proto-list-1.2.4"
sources."protocols-1.4.8"
sources."psl-1.8.0"
- sources."puka-1.0.1"
sources."punycode-2.1.1"
sources."q-1.5.1"
sources."qs-6.5.2"
sources."query-string-6.14.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-4.0.1"
sources."read-1.0.7"
sources."read-cmd-shim-2.0.0"
@@ -87024,17 +87103,18 @@ in
sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."set-blocking-2.0.0"
sources."shallow-clone-3.0.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."shelljs-0.8.4"
+ sources."side-channel-1.0.4"
sources."signal-exit-3.0.3"
sources."slash-3.0.0"
sources."slide-1.1.6"
sources."smart-buffer-4.1.0"
- sources."socks-2.5.1"
+ sources."socks-2.6.0"
sources."socks-proxy-agent-5.0.0"
sources."sort-keys-2.0.0"
sources."source-map-0.6.1"
@@ -87086,7 +87166,7 @@ in
sources."type-fest-0.4.1"
sources."typedarray-0.0.6"
sources."typedarray-to-buffer-3.1.5"
- sources."uglify-js-3.13.0"
+ sources."uglify-js-3.13.2"
sources."uid-number-0.0.6"
sources."umask-1.1.0"
sources."unbox-primitive-1.0.0"
@@ -87104,7 +87184,7 @@ in
sources."verror-1.10.0"
sources."wcwidth-1.0.1"
sources."webidl-conversions-6.1.0"
- sources."whatwg-url-8.4.0"
+ sources."whatwg-url-8.5.0"
sources."which-2.0.2"
sources."which-boxed-primitive-1.0.2"
(sources."wide-align-1.1.3" // {
@@ -87142,9 +87222,9 @@ in
sources."xtend-4.0.2"
sources."y18n-5.0.5"
sources."yallist-4.0.0"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.2"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -88054,39 +88134,40 @@ in
src = ../interpreters/clojurescript/lumo;
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.8"
- sources."@babel/core-7.13.8"
+ sources."@babel/compat-data-7.13.12"
+ sources."@babel/core-7.13.10"
sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
- sources."@babel/helper-compilation-targets-7.13.8"
- sources."@babel/helper-create-class-features-plugin-7.13.8"
+ sources."@babel/helper-compilation-targets-7.13.10"
+ sources."@babel/helper-create-class-features-plugin-7.13.11"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
sources."@babel/helper-define-polyfill-provider-0.1.5"
sources."@babel/helper-explode-assignable-expression-7.13.0"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
sources."@babel/helper-hoist-variables-7.13.0"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
sources."@babel/helper-remap-async-to-generator-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
sources."@babel/helper-wrap-function-7.13.0"
- sources."@babel/helpers-7.13.0"
- (sources."@babel/highlight-7.13.8" // {
+ sources."@babel/helpers-7.13.10"
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.13.9"
+ sources."@babel/parser-7.13.12"
+ sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12"
sources."@babel/plugin-external-helpers-7.8.3"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.13.0"
@@ -88098,7 +88179,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -88140,7 +88221,7 @@ in
sources."@babel/plugin-transform-property-literals-7.12.13"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
- sources."@babel/plugin-transform-runtime-7.13.9"
+ sources."@babel/plugin-transform-runtime-7.13.10"
sources."@babel/plugin-transform-shorthand-properties-7.12.13"
sources."@babel/plugin-transform-spread-7.13.0"
sources."@babel/plugin-transform-sticky-regex-7.12.13"
@@ -88148,13 +88229,13 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- sources."@babel/preset-env-7.13.9"
+ sources."@babel/preset-env-7.13.12"
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-stage-2-7.8.3"
- sources."@babel/runtime-7.13.9"
+ sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@cnakazawa/watch-1.0.4"
sources."@comandeer/babel-plugin-banner-5.0.0"
sources."@istanbuljs/load-nyc-config-1.1.0"
@@ -88165,17 +88246,17 @@ in
];
})
sources."@jest/types-25.5.0"
- sources."@types/babel__core-7.1.12"
+ sources."@types/babel__core-7.1.14"
sources."@types/babel__generator-7.6.2"
sources."@types/babel__template-7.4.0"
- sources."@types/babel__traverse-7.11.0"
- sources."@types/estree-0.0.46"
+ sources."@types/babel__traverse-7.11.1"
+ sources."@types/estree-0.0.47"
sources."@types/graceful-fs-4.1.5"
sources."@types/istanbul-lib-coverage-2.0.3"
sources."@types/istanbul-lib-report-3.0.0"
sources."@types/istanbul-reports-1.1.2"
sources."@types/json-schema-7.0.7"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/normalize-package-data-2.4.0"
sources."@types/resolve-0.0.8"
sources."@types/yargs-15.0.13"
@@ -88348,7 +88429,7 @@ in
sources."cached-path-relative-1.0.2"
sources."call-bind-1.0.2"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
sources."capture-exit-2.0.0"
sources."caseless-0.12.0"
(sources."chalk-3.0.0" // {
@@ -88472,7 +88553,7 @@ in
sources."duplexer2-0.1.4"
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -88503,7 +88584,7 @@ in
sources."esutils-2.0.3"
sources."events-2.1.0"
sources."evp_bytestokey-1.0.3"
- sources."exec-sh-0.3.4"
+ sources."exec-sh-0.3.6"
sources."execa-1.0.0"
(sources."expand-brackets-2.1.4" // {
dependencies = [
@@ -88869,12 +88950,12 @@ in
sources."realpath-native-2.0.0"
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
sources."regex-not-1.0.2"
sources."regexpu-core-4.7.1"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -89312,10 +89393,10 @@ in
mastodon-bot = nodeEnv.buildNodePackage {
name = "mastodon-bot";
packageName = "mastodon-bot";
- version = "1.10.5-1";
+ version = "1.10.11";
src = fetchurl {
- url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.5-1.tgz";
- sha512 = "cW4oo3EfOk1Jt8Fkwj+uJfJJ32NdFf9xYZKdTlMah8kSXtKmnFkSfGTsFaWNacpjTYyPyvNylq+qrYWTOdlmrQ==";
+ url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.11.tgz";
+ sha512 = "FRPAQcg7lUuWbxxvESO+bgxWg7brSKju7mD/0Lc8lGFv/VqR4RH+9v7ufRFNIrG7hrisyy9N+63/AwSCU8NqNg==";
};
dependencies = [
sources."acorn-5.7.4"
@@ -89412,7 +89493,7 @@ in
sources."exit-hook-1.1.1"
(sources."ext-1.4.0" // {
dependencies = [
- sources."type-2.3.0"
+ sources."type-2.5.0"
];
})
sources."extend-3.0.2"
@@ -89662,14 +89743,14 @@ in
"@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage {
name = "_at_mermaid-js_slash_mermaid-cli";
packageName = "@mermaid-js/mermaid-cli";
- version = "8.9.1";
+ version = "8.9.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.1.tgz";
- sha512 = "I/p3LzJv6gOAgHWdx0QMVbLVBN/xolqi5elACsbEWAnKuLPC+bjELsWDj35AYWBJalX01u8q1LdV0uhcCIJlMg==";
+ url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.2.tgz";
+ sha512 = "Hw44+V/n4s6ViCnh5RR/uiza5QxaeUv/A4Q62ho+U1W1yoCLHle6kbx1ZXRSF3Jvl3BfQHuaoE3t+dyx2L4hnA==";
};
dependencies = [
sources."@braintree/sanitize-url-3.1.0"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/yauzl-2.9.1"
sources."agent-base-6.0.2"
sources."ansi-styles-4.3.0"
@@ -89728,7 +89809,7 @@ in
sources."dagre-0.8.5"
sources."dagre-d3-0.6.4"
sources."debug-4.3.2"
- sources."devtools-protocol-0.0.847576"
+ sources."devtools-protocol-0.0.854822"
sources."end-of-stream-1.4.4"
sources."entity-decode-2.0.2"
sources."extract-zip-2.0.1"
@@ -89751,11 +89832,11 @@ in
sources."ieee754-1.2.1"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
- sources."khroma-1.2.0"
+ sources."khroma-1.3.0"
sources."locate-path-5.0.0"
sources."lodash-4.17.21"
sources."lower-case-1.1.4"
- sources."mermaid-8.9.1"
+ sources."mermaid-8.9.2"
sources."minify-4.1.3"
sources."minimatch-3.0.4"
sources."mkdirp-classic-0.5.3"
@@ -89775,7 +89856,7 @@ in
sources."progress-2.0.3"
sources."proxy-from-env-1.1.0"
sources."pump-3.0.0"
- sources."puppeteer-7.1.0"
+ sources."puppeteer-8.0.0"
sources."readable-stream-3.6.0"
sources."relateurl-0.2.7"
sources."rimraf-3.0.2"
@@ -89797,7 +89878,7 @@ in
sources."through-2.3.8"
sources."try-catch-2.0.1"
sources."try-to-catch-1.1.1"
- sources."uglify-js-3.13.0"
+ sources."uglify-js-3.13.2"
sources."unbzip2-stream-1.4.3"
sources."upper-case-1.1.3"
sources."util-deprecate-1.0.2"
@@ -89827,19 +89908,19 @@ in
sources."@fluentui/date-time-utilities-7.9.1"
sources."@fluentui/dom-utilities-1.1.2"
sources."@fluentui/keyboard-key-0.2.14"
- sources."@fluentui/react-7.162.1"
- sources."@fluentui/react-focus-7.17.5"
+ sources."@fluentui/react-7.165.1"
+ sources."@fluentui/react-focus-7.17.6"
sources."@fluentui/react-window-provider-1.0.2"
sources."@fluentui/theme-1.7.4"
- sources."@microsoft/load-themed-styles-1.10.149"
+ sources."@microsoft/load-themed-styles-1.10.153"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@uifabric/foundation-7.9.25"
- sources."@uifabric/icons-7.5.22"
+ sources."@uifabric/foundation-7.9.26"
+ sources."@uifabric/icons-7.5.23"
sources."@uifabric/merge-styles-7.19.2"
- sources."@uifabric/react-hooks-7.13.12"
+ sources."@uifabric/react-hooks-7.14.0"
sources."@uifabric/set-version-7.0.24"
- sources."@uifabric/styling-7.18.1"
+ sources."@uifabric/styling-7.19.0"
sources."@uifabric/utilities-7.33.5"
sources."accepts-1.3.7"
sources."ajv-6.12.6"
@@ -89967,7 +90048,7 @@ in
sources."node-fetch-1.6.3"
sources."normalize-url-4.5.0"
sources."object-assign-4.1.1"
- sources."office-ui-fabric-react-7.162.1"
+ sources."office-ui-fabric-react-7.165.1"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
sources."once-1.4.0"
@@ -90024,7 +90105,7 @@ in
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."scheduler-0.19.1"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."send-0.17.1" // {
dependencies = [
sources."ms-2.1.1"
@@ -90058,7 +90139,7 @@ in
sources."strip-json-comments-2.0.1"
sources."supports-color-2.0.0"
sources."swagger-schema-official-2.0.0-bab6bed"
- sources."swagger-ui-dist-3.44.1"
+ sources."swagger-ui-dist-3.45.1"
sources."tail-2.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
@@ -90090,10 +90171,10 @@ in
mocha = nodeEnv.buildNodePackage {
name = "mocha";
packageName = "mocha";
- version = "8.3.1";
+ version = "8.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/mocha/-/mocha-8.3.1.tgz";
- sha512 = "5SBMxANWqOv5bw3Hx+HVgaWlcWcFEQDUdaUAr1AUU+qwtx6cowhn7gEDT/DwQP7uYxnvShdUOVLbTYAHOEGfDQ==";
+ url = "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz";
+ sha512 = "UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg==";
};
dependencies = [
sources."@ungap/promise-all-settled-1.1.2"
@@ -90224,6 +90305,7 @@ in
dependencies = [
sources."argparse-1.0.10"
sources."asynckit-0.4.0"
+ sources."call-bind-1.0.2"
sources."combined-stream-1.0.8"
sources."commander-2.20.3"
sources."component-emitter-1.3.0"
@@ -90235,7 +90317,11 @@ in
sources."extend-3.0.2"
sources."form-data-2.5.1"
sources."formidable-1.2.2"
+ sources."function-bind-1.1.1"
+ sources."get-intrinsic-1.1.1"
sources."graphlib-2.1.8"
+ sources."has-1.0.3"
+ sources."has-symbols-1.0.2"
sources."inherits-2.0.4"
sources."isarray-1.0.0"
sources."js-yaml-3.14.1"
@@ -90251,12 +90337,14 @@ in
sources."mime-types-2.1.29"
sources."ms-2.1.3"
sources."native-promise-only-0.8.1"
+ sources."object-inspect-1.9.0"
sources."path-loader-1.0.10"
sources."process-nextick-args-2.0.1"
sources."punycode-2.1.1"
- sources."qs-6.9.6"
+ sources."qs-6.10.1"
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
+ sources."side-channel-1.0.4"
sources."slash-3.0.0"
sources."sprintf-js-1.0.3"
sources."string_decoder-1.1.1"
@@ -90312,7 +90400,7 @@ in
sources."process-nextick-args-2.0.1"
sources."readable-stream-3.6.0"
sources."safe-buffer-5.2.1"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."simple-swizzle-0.2.2"
sources."stack-trace-0.0.10"
sources."string_decoder-1.3.0"
@@ -90342,15 +90430,15 @@ in
netlify-cli = nodeEnv.buildNodePackage {
name = "netlify-cli";
packageName = "netlify-cli";
- version = "3.10.6";
+ version = "3.13.7";
src = fetchurl {
- url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.10.6.tgz";
- sha512 = "z/TQ+ehXvNhYQkJXNwxOSYq1jFP3rt1yvD2pILnbCrRZavzYc+GoIEKhKj+gPRgezwzXN9LnGiNQES4zyNcJJA==";
+ url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.13.7.tgz";
+ sha512 = "I5aY4yOi3R5yNzhMy3RK9LG42jD422Eni/iiwv7+As9EpkYYcWXFwPLy7mE1bxE9xtyxkE1zKxKqEqDjLqt2kA==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.8"
- (sources."@babel/core-7.13.8" // {
+ sources."@babel/compat-data-7.13.12"
+ (sources."@babel/core-7.13.10" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -90358,12 +90446,12 @@ in
sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
- (sources."@babel/helper-compilation-targets-7.13.8" // {
+ (sources."@babel/helper-compilation-targets-7.13.10" // {
dependencies = [
sources."semver-6.3.0"
];
})
- sources."@babel/helper-create-class-features-plugin-7.13.8"
+ sources."@babel/helper-create-class-features-plugin-7.13.11"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
(sources."@babel/helper-define-polyfill-provider-0.1.5" // {
dependencies = [
@@ -90374,22 +90462,23 @@ in
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
sources."@babel/helper-hoist-variables-7.13.0"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
sources."@babel/helper-remap-async-to-generator-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
sources."@babel/helper-wrap-function-7.13.0"
- sources."@babel/helpers-7.13.0"
- sources."@babel/highlight-7.13.8"
- sources."@babel/parser-7.13.9"
+ sources."@babel/helpers-7.13.10"
+ sources."@babel/highlight-7.13.10"
+ sources."@babel/parser-7.13.12"
+ sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.13.0"
sources."@babel/plugin-proposal-dynamic-import-7.13.8"
@@ -90400,7 +90489,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -90447,32 +90536,33 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- (sources."@babel/preset-env-7.13.9" // {
+ (sources."@babel/preset-env-7.13.12" // {
dependencies = [
sources."semver-6.3.0"
];
})
sources."@babel/preset-modules-0.1.4"
- sources."@babel/runtime-7.13.9"
+ sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
- sources."@bugsnag/browser-7.7.0"
- sources."@bugsnag/core-7.7.0"
+ sources."@babel/types-7.13.12"
+ sources."@bugsnag/browser-7.9.0"
+ sources."@bugsnag/core-7.9.0"
sources."@bugsnag/cuid-3.0.0"
- sources."@bugsnag/js-7.8.0"
- sources."@bugsnag/node-7.8.0"
+ sources."@bugsnag/js-7.9.0"
+ sources."@bugsnag/node-7.9.0"
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-9.8.5" // {
+ (sources."@netlify/build-9.13.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-3.0.0"
sources."execa-3.4.0"
sources."locate-path-5.0.0"
sources."resolve-2.0.0-next.3"
+ sources."semver-6.3.0"
];
})
(sources."@netlify/cache-utils-1.0.7" // {
@@ -90480,19 +90570,19 @@ in
sources."locate-path-5.0.0"
];
})
- (sources."@netlify/config-4.0.4" // {
+ (sources."@netlify/config-4.3.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-3.0.0"
sources."execa-3.4.0"
];
})
- (sources."@netlify/framework-info-2.3.0" // {
+ (sources."@netlify/framework-info-3.2.0" // {
dependencies = [
sources."locate-path-5.0.0"
];
})
- sources."@netlify/functions-utils-1.3.17"
+ sources."@netlify/functions-utils-1.3.21"
(sources."@netlify/git-utils-1.0.8" // {
dependencies = [
sources."braces-3.0.2"
@@ -90504,7 +90594,7 @@ in
];
})
sources."@netlify/open-api-1.3.0"
- (sources."@netlify/plugin-edge-handlers-1.11.5" // {
+ (sources."@netlify/plugin-edge-handlers-1.11.6" // {
dependencies = [
sources."@nodelib/fs.stat-2.0.4"
sources."array-union-2.1.0"
@@ -90514,7 +90604,7 @@ in
sources."fast-glob-3.2.5"
sources."fill-range-7.0.1"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."ignore-5.1.8"
sources."is-number-7.0.0"
sources."micromatch-4.0.2"
@@ -90523,8 +90613,8 @@ in
sources."to-regex-range-5.0.1"
];
})
- sources."@netlify/plugins-list-2.4.0"
- (sources."@netlify/run-utils-1.0.6" // {
+ sources."@netlify/plugins-list-2.5.0"
+ (sources."@netlify/run-utils-1.0.7" // {
dependencies = [
sources."execa-3.4.0"
];
@@ -90533,10 +90623,11 @@ in
sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10"
sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10"
sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10"
- (sources."@netlify/zip-it-and-ship-it-2.5.0" // {
+ (sources."@netlify/zip-it-and-ship-it-3.0.1" // {
dependencies = [
sources."locate-path-5.0.0"
sources."resolve-2.0.0-next.3"
+ sources."semver-6.3.0"
];
})
(sources."@nodelib/fs.scandir-2.1.4" // {
@@ -90591,7 +90682,7 @@ in
sources."fast-glob-3.2.5"
sources."fill-range-7.0.1"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."ignore-5.1.8"
sources."is-number-7.0.0"
sources."micromatch-4.0.2"
@@ -90667,7 +90758,7 @@ in
sources."universal-user-agent-6.0.0"
];
})
- sources."@octokit/openapi-types-5.3.1"
+ sources."@octokit/openapi-types-6.0.0"
(sources."@octokit/plugin-paginate-rest-1.1.2" // {
dependencies = [
sources."@octokit/types-2.16.2"
@@ -90692,7 +90783,7 @@ in
];
})
sources."@octokit/rest-16.43.2"
- sources."@octokit/types-6.12.1"
+ sources."@octokit/types-6.13.0"
sources."@rollup/plugin-babel-5.3.0"
(sources."@rollup/plugin-commonjs-17.1.0" // {
dependencies = [
@@ -90716,23 +90807,27 @@ in
];
})
sources."@szmarczak/http-timer-1.1.2"
+ sources."@types/cacheable-request-6.0.1"
sources."@types/decompress-4.2.3"
sources."@types/download-6.2.4"
sources."@types/estree-0.0.39"
sources."@types/glob-7.1.3"
sources."@types/got-8.3.5"
sources."@types/hast-2.3.1"
+ sources."@types/http-cache-semantics-4.0.0"
sources."@types/http-proxy-1.17.5"
sources."@types/istanbul-lib-coverage-2.0.3"
sources."@types/istanbul-lib-report-3.0.0"
sources."@types/istanbul-reports-1.1.2"
- sources."@types/minimatch-3.0.3"
+ sources."@types/keyv-3.1.1"
+ sources."@types/minimatch-3.0.4"
sources."@types/mkdirp-0.5.2"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/node-fetch-2.5.8"
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse5-5.0.3"
sources."@types/resolve-1.17.1"
+ sources."@types/responselike-1.0.0"
sources."@types/semver-5.5.0"
sources."@types/unist-2.0.3"
sources."@types/yargs-13.0.11"
@@ -90742,7 +90837,20 @@ in
sources."accepts-1.3.7"
sources."agent-base-6.0.2"
sources."aggregate-error-3.1.0"
- sources."ajv-7.2.1"
+ sources."ajv-7.2.3"
+ (sources."all-node-versions-8.0.0" // {
+ dependencies = [
+ sources."@jest/types-25.5.0"
+ sources."@types/yargs-15.0.13"
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."chalk-3.0.0"
+ sources."global-cache-dir-2.0.0"
+ sources."jest-get-type-25.2.6"
+ sources."jest-validate-25.5.0"
+ sources."pretty-format-25.5.0"
+ ];
+ })
(sources."ansi-align-3.0.0" // {
dependencies = [
sources."emoji-regex-7.0.3"
@@ -90787,7 +90895,7 @@ in
sources."at-least-node-1.0.0"
sources."atob-2.1.2"
sources."atob-lite-2.0.0"
- (sources."aws-sdk-2.858.0" // {
+ (sources."aws-sdk-2.871.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -90846,6 +90954,12 @@ in
sources."byline-5.0.0"
sources."bytes-3.1.0"
sources."cache-base-1.0.1"
+ (sources."cacheable-lookup-2.0.1" // {
+ dependencies = [
+ sources."json-buffer-3.0.1"
+ sources."keyv-4.0.3"
+ ];
+ })
(sources."cacheable-request-6.1.0" // {
dependencies = [
sources."lowercase-keys-2.0.0"
@@ -90855,7 +90969,7 @@ in
sources."call-bind-1.0.2"
sources."call-me-maybe-1.0.1"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
sources."cardinal-2.1.1"
sources."caw-2.0.1"
sources."ccount-1.1.0"
@@ -90877,10 +90991,11 @@ in
sources."fill-range-7.0.1"
sources."glob-parent-5.1.2"
sources."is-number-7.0.0"
+ sources."readdirp-3.5.0"
sources."to-regex-range-5.0.1"
];
})
- sources."ci-info-2.0.0"
+ sources."ci-info-3.1.1"
(sources."class-utils-0.3.6" // {
dependencies = [
sources."define-property-0.2.5"
@@ -90903,7 +91018,7 @@ in
sources."cli-boxes-2.2.1"
sources."cli-cursor-2.1.0"
sources."cli-progress-3.9.0"
- sources."cli-spinners-2.5.0"
+ sources."cli-spinners-2.6.0"
(sources."cli-truncate-0.2.1" // {
dependencies = [
sources."ansi-regex-2.1.1"
@@ -90914,7 +91029,7 @@ in
})
(sources."cli-ux-5.5.1" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-styles-4.3.0"
sources."argparse-1.0.10"
sources."chalk-4.1.0"
@@ -90924,7 +91039,7 @@ in
sources."js-yaml-3.14.1"
sources."supports-hyperlinks-2.1.0"
sources."tslib-2.1.0"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."cli-width-2.2.1"
@@ -91069,7 +91184,7 @@ in
sources."depd-1.1.2"
sources."deprecation-2.3.1"
sources."destroy-1.0.4"
- sources."detective-amd-3.0.1"
+ sources."detective-amd-3.1.0"
sources."detective-cjs-3.1.1"
sources."detective-es6-2.2.0"
sources."detective-less-1.0.2"
@@ -91112,30 +91227,30 @@ in
})
sources."duplexer3-0.1.4"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
sources."elegant-spinner-1.0.1"
sources."elf-cam-0.1.1"
sources."emoji-regex-8.0.0"
sources."enabled-2.0.0"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."envinfo-7.7.4"
sources."error-ex-1.3.2"
sources."error-stack-parser-2.0.6"
- sources."esbuild-0.8.57"
+ sources."esbuild-0.9.7"
sources."escalade-3.1.1"
sources."escape-goat-2.1.1"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
- (sources."escodegen-1.14.3" // {
+ (sources."escodegen-2.0.0" // {
dependencies = [
sources."source-map-0.6.1"
];
})
sources."eslint-visitor-keys-1.3.0"
sources."esprima-4.0.1"
- sources."estraverse-4.3.0"
+ sources."estraverse-5.2.0"
sources."estree-walker-1.0.1"
sources."esutils-2.0.3"
sources."etag-1.8.1"
@@ -91204,6 +91319,39 @@ in
sources."fastq-1.11.0"
sources."fd-slicer-1.1.0"
sources."fecha-4.2.0"
+ (sources."fetch-node-website-5.0.3" // {
+ dependencies = [
+ (sources."@jest/types-25.5.0" // {
+ dependencies = [
+ sources."chalk-3.0.0"
+ ];
+ })
+ sources."@sindresorhus/is-2.1.1"
+ sources."@szmarczak/http-timer-4.0.5"
+ sources."@types/yargs-15.0.13"
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."cacheable-request-7.0.1"
+ sources."chalk-4.1.0"
+ sources."decompress-response-5.0.0"
+ sources."defer-to-connect-2.0.1"
+ sources."got-10.7.0"
+ sources."jest-get-type-25.2.6"
+ (sources."jest-validate-25.5.0" // {
+ dependencies = [
+ sources."chalk-3.0.0"
+ ];
+ })
+ sources."json-buffer-3.0.1"
+ sources."keyv-4.0.3"
+ sources."lowercase-keys-2.0.0"
+ sources."mimic-response-2.1.0"
+ sources."p-cancelable-2.1.0"
+ sources."pretty-format-25.5.0"
+ sources."responselike-2.0.0"
+ sources."type-fest-0.10.0"
+ ];
+ })
sources."figures-3.2.0"
sources."file-size-0.0.5"
sources."file-type-8.1.0"
@@ -91390,10 +91538,10 @@ in
})
(sources."inquirer-autocomplete-prompt-1.3.0" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."into-stream-3.1.0"
@@ -91402,9 +91550,9 @@ in
sources."is-arrayish-0.2.1"
sources."is-binary-path-2.1.0"
sources."is-buffer-1.1.6"
- (sources."is-ci-3.0.0" // {
+ (sources."is-ci-2.0.0" // {
dependencies = [
- sources."ci-info-3.1.1"
+ sources."ci-info-2.0.0"
];
})
sources."is-core-module-2.2.0"
@@ -91576,7 +91724,7 @@ in
];
})
sources."map-cache-0.2.2"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
sources."map-visit-1.0.0"
sources."maxstache-1.0.7"
(sources."maxstache-stream-1.0.4" // {
@@ -91589,6 +91737,7 @@ in
sources."media-typer-0.3.0"
sources."memoize-one-5.1.1"
sources."merge-descriptors-1.0.1"
+ sources."merge-options-3.0.4"
sources."merge-stream-2.0.0"
sources."merge2-1.4.1"
sources."methods-1.1.2"
@@ -91609,7 +91758,7 @@ in
})
sources."mkdirp-0.5.5"
sources."module-definition-3.3.1"
- sources."moize-6.0.0"
+ sources."moize-6.0.1"
(sources."move-file-1.2.0" // {
dependencies = [
(sources."cp-file-6.2.0" // {
@@ -91633,19 +91782,48 @@ in
sources."natural-orderby-2.0.3"
sources."negotiator-0.6.2"
sources."nested-error-stacks-2.1.0"
- (sources."netlify-6.1.13" // {
+ (sources."netlify-6.1.16" // {
dependencies = [
- sources."qs-6.9.6"
+ sources."@netlify/zip-it-and-ship-it-2.7.1"
+ sources."esbuild-0.8.57"
+ sources."locate-path-5.0.0"
+ sources."qs-6.10.1"
+ sources."resolve-2.0.0-next.3"
+ sources."semver-6.3.0"
];
})
sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16"
- sources."netlify-redirect-parser-3.0.4"
+ sources."netlify-redirect-parser-3.0.7"
sources."netlify-redirector-0.2.1"
sources."nice-try-1.0.5"
sources."node-fetch-2.6.1"
sources."node-releases-1.1.71"
sources."node-source-walk-4.2.0"
+ (sources."node-version-alias-1.0.1" // {
+ dependencies = [
+ sources."@jest/types-25.5.0"
+ sources."@types/yargs-15.0.13"
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."chalk-3.0.0"
+ sources."jest-get-type-25.2.6"
+ sources."jest-validate-25.5.0"
+ sources."pretty-format-25.5.0"
+ ];
+ })
sources."noop2-2.0.0"
+ (sources."normalize-node-version-10.0.0" // {
+ dependencies = [
+ sources."@jest/types-25.5.0"
+ sources."@types/yargs-15.0.13"
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."chalk-3.0.0"
+ sources."jest-get-type-25.2.6"
+ sources."jest-validate-25.5.0"
+ sources."pretty-format-25.5.0"
+ ];
+ })
(sources."normalize-package-data-2.5.0" // {
dependencies = [
sources."semver-5.7.1"
@@ -91674,8 +91852,9 @@ in
sources."kind-of-3.2.2"
];
})
+ sources."object-inspect-1.9.0"
sources."object-keys-1.1.1"
- sources."object-treeify-1.1.31"
+ sources."object-treeify-1.1.33"
sources."object-visit-1.0.1"
sources."object.assign-4.1.2"
sources."object.pick-1.3.0"
@@ -91711,6 +91890,11 @@ in
})
sources."p-cancelable-1.1.0"
sources."p-event-4.2.0"
+ (sources."p-every-2.0.0" // {
+ dependencies = [
+ sources."p-map-2.1.0"
+ ];
+ })
(sources."p-filter-2.1.0" // {
dependencies = [
sources."p-map-2.1.0"
@@ -91804,7 +91988,7 @@ in
sources."qs-6.7.0"
sources."query-string-5.1.1"
sources."querystring-0.2.0"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-bytes-1.0.0"
sources."random-item-3.1.0"
sources."randombytes-2.1.0"
@@ -91823,18 +92007,18 @@ in
})
sources."read-pkg-up-7.0.1"
sources."readable-stream-3.6.0"
- sources."readdirp-3.5.0"
+ sources."readdirp-3.6.0"
sources."redeyed-2.1.1"
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
sources."regex-not-1.0.2"
sources."regexpu-core-4.7.1"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -91861,7 +92045,7 @@ in
sources."ret-0.1.15"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
- sources."rollup-2.40.0"
+ sources."rollup-2.42.4"
(sources."rollup-plugin-inject-3.0.2" // {
dependencies = [
sources."estree-walker-0.6.1"
@@ -91884,7 +92068,7 @@ in
sources."safer-buffer-2.1.2"
sources."sax-1.2.1"
sources."seek-bzip-1.0.6"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -91911,6 +92095,7 @@ in
sources."setprototypeof-1.1.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
+ sources."side-channel-1.0.4"
sources."signal-exit-3.0.3"
(sources."simple-swizzle-0.2.2" // {
dependencies = [
@@ -92045,7 +92230,7 @@ in
];
})
sources."term-size-2.2.1"
- (sources."terser-5.6.0" // {
+ (sources."terser-5.6.1" // {
dependencies = [
sources."source-map-0.7.3"
];
@@ -92129,7 +92314,6 @@ in
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-3.0.0"
- sources."is-ci-2.0.0"
];
})
sources."uri-js-4.4.1"
@@ -92274,7 +92458,7 @@ in
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
sources."ecc-jsbn-0.1.2"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-3.1.3"
@@ -92327,7 +92511,7 @@ in
sources."rimraf-3.0.2"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.3"
sources."sshpk-1.16.1"
@@ -92767,7 +92951,7 @@ in
sha512 = "1BXFaT7oDd5VM80O+1Lf72P9wCkYjg3CODROPRIPvcSEke6ubMo1M5GFsgh5EwGPLlTTlkuSgI+a4T3UhjAzbQ==";
};
dependencies = [
- sources."@babel/runtime-7.13.9"
+ sources."@babel/runtime-7.13.10"
sources."@node-red/editor-api-1.2.9"
sources."@node-red/editor-client-1.2.9"
(sources."@node-red/nodes-1.2.9" // {
@@ -92859,7 +93043,7 @@ in
sources."caseless-0.12.0"
sources."cheerio-0.22.0"
sources."chownr-2.0.0"
- sources."cli-table-0.3.5"
+ sources."cli-table-0.3.6"
sources."clone-2.1.2"
sources."code-point-at-1.1.0"
sources."colors-1.0.3"
@@ -93145,7 +93329,7 @@ in
sources."rc-1.2.8"
sources."read-1.0.7"
sources."readable-stream-1.1.14"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."reinterval-1.1.0"
sources."remove-trailing-separator-1.1.0"
(sources."request-2.88.0" // {
@@ -93388,7 +93572,7 @@ in
sources."rimraf-2.6.3"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.3"
sources."slasp-0.0.4"
@@ -93612,7 +93796,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -93637,7 +93821,7 @@ in
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
sources."@types/minimist-1.2.1"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse-json-4.0.0"
sources."@types/responselike-1.0.0"
@@ -93651,7 +93835,7 @@ in
sources."strip-ansi-5.2.0"
];
})
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."any-observable-0.5.1"
@@ -93748,7 +93932,7 @@ in
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
sources."global-dirs-2.1.0"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
(sources."got-10.7.0" // {
dependencies = [
sources."get-stream-5.2.0"
@@ -93839,6 +94023,7 @@ in
sources."is-scoped-2.1.0"
sources."is-stream-2.0.0"
sources."is-typedarray-1.0.0"
+ sources."is-unicode-supported-0.1.0"
sources."is-url-superb-4.0.0"
sources."is-wsl-2.2.0"
sources."is-yarn-global-0.3.0"
@@ -93891,7 +94076,7 @@ in
sources."lodash-4.17.21"
sources."lodash.isequal-4.5.0"
sources."lodash.zip-4.2.0"
- sources."log-symbols-4.0.0"
+ sources."log-symbols-4.1.0"
(sources."log-update-2.3.0" // {
dependencies = [
sources."ansi-escapes-3.2.0"
@@ -93908,7 +94093,7 @@ in
];
})
sources."map-age-cleaner-0.1.3"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
(sources."mem-6.1.1" // {
dependencies = [
sources."mimic-fn-3.1.0"
@@ -93934,7 +94119,11 @@ in
sources."type-fest-0.4.1"
];
})
- sources."normalize-package-data-3.0.0"
+ (sources."normalize-package-data-3.0.2" // {
+ dependencies = [
+ sources."hosted-git-info-4.0.2"
+ ];
+ })
sources."normalize-url-4.5.0"
(sources."npm-name-6.0.1" // {
dependencies = [
@@ -93959,7 +94148,7 @@ in
sources."type-fest-0.20.2"
];
})
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."p-defer-1.0.0"
(sources."p-event-4.2.0" // {
dependencies = [
@@ -94024,7 +94213,7 @@ in
sources."escape-goat-2.1.1"
];
})
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-4.0.1"
sources."rc-1.2.8"
(sources."read-pkg-5.2.0" // {
@@ -94059,7 +94248,7 @@ in
sources."rxjs-6.6.6"
sources."safer-buffer-2.1.2"
sources."scoped-regex-2.1.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -94090,7 +94279,7 @@ in
sources."to-regex-range-5.0.1"
sources."trim-newlines-3.0.0"
sources."tslib-1.14.1"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."unique-string-2.0.0"
(sources."update-notifier-5.1.0" // {
@@ -94118,8 +94307,8 @@ in
sources."write-file-atomic-3.0.3"
sources."xdg-basedir-4.0.0"
sources."yallist-4.0.0"
- sources."yaml-1.10.0"
- sources."yargs-parser-20.2.6"
+ sources."yaml-1.10.2"
+ sources."yargs-parser-20.2.7"
sources."yocto-queue-0.1.0"
];
buildInputs = globalBuildInputs;
@@ -94135,10 +94324,10 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "7.6.1";
+ version = "7.7.4";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-7.6.1.tgz";
- sha512 = "L9xChb/o6XOYqTEBK+5+T3ph5Q7eCDYuY6Wz5a0s+I+hfMy5L2Kj8t4P5zsP2qJVts0etAx9MHD1meiApvtb9A==";
+ url = "https://registry.npmjs.org/npm/-/npm-7.7.4.tgz";
+ sha512 = "+gUjp4hbUnN7S1z2S3uDTnac94uRiztzFkMLNimHsB4KpuvhO+xjg30ARoptq7UYqF6KTXA4L8XLDMuriyB9Fg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -94153,10 +94342,10 @@ in
npm-check-updates = nodeEnv.buildNodePackage {
name = "npm-check-updates";
packageName = "npm-check-updates";
- version = "11.2.0";
+ version = "11.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.2.0.tgz";
- sha512 = "JCQHyn3/kxaWHbxefb8JKNZTZgFySnGcPZQbhx33rZEW55VoCjS3/GRNCN5ITIIR/aHNobDtwM1MX7MF31jC2A==";
+ url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.3.0.tgz";
+ sha512 = "7GMDj40cWw/nRn3BsN+20ca3T6CvHqIiFhooVa5a3VybrS7TNBdbR3/BIi9dw4vFORgFZw/OsW3ZtRTFamnPDQ==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.4"
@@ -94168,7 +94357,7 @@ in
sources."@npmcli/move-file-1.1.2"
sources."@npmcli/node-gyp-1.0.2"
sources."@npmcli/promise-spawn-1.3.2"
- sources."@npmcli/run-script-1.8.3"
+ sources."@npmcli/run-script-1.8.4"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@tootallnate/once-1.1.2"
@@ -94210,7 +94399,7 @@ in
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
sources."builtins-1.0.3"
- sources."cacache-15.0.5"
+ sources."cacache-15.0.6"
(sources."cacheable-request-6.1.0" // {
dependencies = [
sources."get-stream-5.2.0"
@@ -94225,7 +94414,7 @@ in
sources."cint-8.2.1"
sources."clean-stack-2.2.0"
sources."cli-boxes-2.2.1"
- sources."cli-table-0.3.5"
+ sources."cli-table-0.3.6"
sources."clone-response-1.0.2"
sources."code-point-at-1.1.0"
sources."color-convert-2.0.1"
@@ -94253,7 +94442,7 @@ in
sources."emoji-regex-7.0.3"
sources."encoding-0.1.13"
sources."end-of-stream-1.4.4"
- sources."env-paths-2.2.0"
+ sources."env-paths-2.2.1"
sources."err-code-2.0.3"
sources."escape-goat-2.1.1"
sources."extend-3.0.2"
@@ -94281,7 +94470,7 @@ in
sources."ini-2.0.0"
];
})
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."got-9.6.0"
sources."graceful-fs-4.2.6"
sources."har-schema-2.0.0"
@@ -94289,7 +94478,7 @@ in
sources."has-flag-4.0.0"
sources."has-unicode-2.0.1"
sources."has-yarn-2.1.0"
- sources."hosted-git-info-3.0.8"
+ sources."hosted-git-info-4.0.2"
sources."http-cache-semantics-4.1.0"
sources."http-proxy-agent-4.0.1"
sources."http-signature-1.2.0"
@@ -94357,7 +94546,7 @@ in
})
sources."make-fetch-happen-8.0.14"
sources."map-age-cleaner-0.1.3"
- sources."mem-8.0.0"
+ sources."mem-8.1.0"
sources."merge2-1.4.1"
sources."micromatch-4.0.2"
sources."mime-db-1.46.0"
@@ -94382,9 +94571,9 @@ in
sources."npm-bundled-1.1.1"
sources."npm-install-checks-4.0.0"
sources."npm-normalize-package-bin-1.0.1"
- sources."npm-package-arg-8.1.1"
+ sources."npm-package-arg-8.1.2"
sources."npm-packlist-2.1.4"
- sources."npm-pick-manifest-6.1.0"
+ sources."npm-pick-manifest-6.1.1"
sources."npm-registry-fetch-9.0.0"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
@@ -94402,7 +94591,7 @@ in
sources."semver-6.3.0"
];
})
- sources."pacote-11.2.7"
+ sources."pacote-11.3.1"
sources."parse-github-url-1.0.2"
sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
@@ -94416,12 +94605,11 @@ in
sources."promise-retry-2.0.1"
sources."prompts-2.4.0"
sources."psl-1.8.0"
- sources."puka-1.0.1"
sources."pump-3.0.0"
sources."punycode-2.1.1"
sources."pupa-2.1.1"
sources."qs-6.5.2"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."rc-1.2.8"
sources."rc-config-loader-4.0.0"
sources."read-package-json-fast-2.0.2"
@@ -94438,7 +94626,7 @@ in
sources."run-parallel-1.2.0"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -94450,7 +94638,7 @@ in
sources."sisteransi-1.0.5"
sources."slash-3.0.0"
sources."smart-buffer-4.1.0"
- sources."socks-2.5.1"
+ sources."socks-2.6.0"
sources."socks-proxy-agent-5.0.0"
sources."spawn-please-1.0.0"
sources."sshpk-1.16.1"
@@ -94732,15 +94920,15 @@ in
parcel-bundler = nodeEnv.buildNodePackage {
name = "parcel-bundler";
packageName = "parcel-bundler";
- version = "1.12.4";
+ version = "1.12.5";
src = fetchurl {
- url = "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.12.4.tgz";
- sha512 = "G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ==";
+ url = "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.12.5.tgz";
+ sha512 = "hpku8mW67U6PXQIenW6NBbphBOMb8XzW6B9r093DUhYj5GN2FUB/CXCiz5hKoPYUsusZ35BpProH8AUF9bh5IQ==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.8"
- (sources."@babel/core-7.13.8" // {
+ sources."@babel/compat-data-7.13.12"
+ (sources."@babel/core-7.13.10" // {
dependencies = [
sources."json5-2.2.0"
sources."semver-6.3.0"
@@ -94754,12 +94942,12 @@ in
})
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
- (sources."@babel/helper-compilation-targets-7.13.8" // {
+ (sources."@babel/helper-compilation-targets-7.13.10" // {
dependencies = [
sources."semver-6.3.0"
];
})
- sources."@babel/helper-create-class-features-plugin-7.13.8"
+ sources."@babel/helper-create-class-features-plugin-7.13.11"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
(sources."@babel/helper-define-polyfill-provider-0.1.5" // {
dependencies = [
@@ -94770,22 +94958,23 @@ in
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
sources."@babel/helper-hoist-variables-7.13.0"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
sources."@babel/helper-remap-async-to-generator-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
sources."@babel/helper-wrap-function-7.13.0"
- sources."@babel/helpers-7.13.0"
- sources."@babel/highlight-7.13.8"
- sources."@babel/parser-7.13.9"
+ sources."@babel/helpers-7.13.10"
+ sources."@babel/highlight-7.13.10"
+ sources."@babel/parser-7.13.12"
+ sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.13.0"
sources."@babel/plugin-proposal-dynamic-import-7.13.8"
@@ -94796,7 +94985,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -94837,7 +95026,7 @@ in
sources."@babel/plugin-transform-object-super-7.12.13"
sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
- sources."@babel/plugin-transform-react-jsx-7.12.17"
+ sources."@babel/plugin-transform-react-jsx-7.13.12"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
sources."@babel/plugin-transform-shorthand-properties-7.12.13"
@@ -94847,16 +95036,16 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- (sources."@babel/preset-env-7.13.9" // {
+ (sources."@babel/preset-env-7.13.12" // {
dependencies = [
sources."semver-6.3.0"
];
})
sources."@babel/preset-modules-0.1.4"
- sources."@babel/runtime-7.13.9"
+ sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@iarna/toml-2.2.5"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
@@ -94978,7 +95167,7 @@ in
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -95113,7 +95302,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.682"
+ sources."electron-to-chromium-1.3.699"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -95368,7 +95557,7 @@ in
})
sources."nice-try-1.0.5"
sources."node-addon-api-1.7.2"
- sources."node-forge-0.7.6"
+ sources."node-forge-0.10.0"
(sources."node-libs-browser-2.2.1" // {
dependencies = [
sources."punycode-1.4.1"
@@ -95514,7 +95703,7 @@ in
sources."readdirp-2.2.1"
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
(sources."regex-not-1.0.2" // {
dependencies = [
@@ -95524,7 +95713,7 @@ in
})
sources."regexpu-core-4.7.1"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -95889,7 +96078,7 @@ in
sources."mkdirp-0.5.5"
sources."moment-2.29.1"
sources."ms-2.0.0"
- sources."msgpack5-3.6.0"
+ sources."msgpack5-3.6.1"
sources."mv-2.1.1"
sources."nan-2.14.2"
sources."ncp-2.0.0"
@@ -95956,7 +96145,7 @@ in
sources."serve-static-1.14.1"
(sources."service-runner-2.8.1" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."yargs-14.2.3"
];
})
@@ -95977,7 +96166,7 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-is-1.6.18"
- sources."uglify-js-3.13.0"
+ sources."uglify-js-3.13.2"
sources."unix-dgram-2.0.4"
sources."unpipe-1.0.0"
sources."uri-js-4.4.1"
@@ -96015,10 +96204,10 @@ in
patch-package = nodeEnv.buildNodePackage {
name = "patch-package";
packageName = "patch-package";
- version = "6.4.6";
+ version = "6.4.7";
src = fetchurl {
- url = "https://registry.npmjs.org/patch-package/-/patch-package-6.4.6.tgz";
- sha512 = "AO2bh42z8AQL+0OUdcRpS5Z/0X8k9IQ1uc1HzlVye+2RQrtDeNgTk5SbS4rdbLJKtUWRpvPISrYZeyh+OK4AKw==";
+ url = "https://registry.npmjs.org/patch-package/-/patch-package-6.4.7.tgz";
+ sha512 = "S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==";
};
dependencies = [
sources."@yarnpkg/lockfile-1.1.0"
@@ -96295,7 +96484,7 @@ in
sources."plist-1.2.0"
sources."process-nextick-args-2.0.1"
sources."pump-2.0.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-iterate-1.0.1"
@@ -96644,7 +96833,7 @@ in
sources."pump-3.0.0"
sources."punycode-2.1.1"
sources."qs-6.7.0"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-bytes-1.0.0"
@@ -97002,7 +97191,7 @@ in
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
- (sources."semver-7.3.4" // {
+ (sources."semver-7.3.5" // {
dependencies = [
sources."lru-cache-6.0.0"
sources."yallist-4.0.0"
@@ -97058,10 +97247,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
- version = "5.18.3";
+ version = "5.18.8";
src = fetchurl {
- url = "https://registry.npmjs.org/pnpm/-/pnpm-5.18.3.tgz";
- sha512 = "2PJ6eY+qq/4WUBX6uxkyuCJzRT18uIUF9QOZJBBjhOamLsB3mE1mIyNP/dc9n9pt4MT3/ZJDdKpKG7h5rLvzqQ==";
+ url = "https://registry.npmjs.org/pnpm/-/pnpm-5.18.8.tgz";
+ sha512 = "MO0XZoJfZFn6KjhcDpS03P9MeKx3xzgoXJcIcTjJ29/pKeS1O5x/SeLjzsCsAbkPLrv6JdY5uotIz7LRKEe88w==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -97112,7 +97301,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -97155,7 +97344,7 @@ in
sources."get-caller-file-2.0.5"
sources."get-stdin-8.0.0"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."graceful-fs-4.2.6"
sources."has-flag-4.0.0"
sources."ignore-5.1.8"
@@ -97192,7 +97381,7 @@ in
sources."postcss-load-config-3.0.1"
sources."postcss-reporter-7.0.2"
sources."pretty-hrtime-1.0.3"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."read-cache-1.0.0"
sources."readdirp-3.5.0"
sources."require-directory-2.1.1"
@@ -97207,9 +97396,9 @@ in
sources."universalify-2.0.0"
sources."wrap-ansi-7.0.0"
sources."y18n-5.0.5"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.2"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -97610,10 +97799,10 @@ in
pyright = nodeEnv.buildNodePackage {
name = "pyright";
packageName = "pyright";
- version = "1.1.118";
+ version = "1.1.125";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.118.tgz";
- sha512 = "nUBcMqJqzcXbNmXPA3BLa5E77lG+APARhBbY0d4q2KGs3Od9FR6YTABK6sUq3O1rVQf4MScz8ji4KbEBsD8FNg==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.125.tgz";
+ sha512 = "MPaMGCnMR0i0VePXUPpXMHr23A2mkbW1Su+aTAWsqHho1rhQcxBtjeyhR0xqiwTxcC+c9eK9VwFHbd+OMGC6fQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -97836,7 +98025,7 @@ in
sources."wrappy-1.0.2"
sources."xtend-4.0.2"
sources."y18n-4.0.1"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.2"
sources."yargs-12.0.5"
sources."yargs-parser-11.1.1"
];
@@ -98010,16 +98199,16 @@ in
readability-cli = nodeEnv.buildNodePackage {
name = "readability-cli";
packageName = "readability-cli";
- version = "2.2.1-pre";
+ version = "2.2.3-pre";
src = fetchurl {
- url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.2.1-pre.tgz";
- sha512 = "1f8y1ZeGRYskJyZZQzXVw5OlzQKs597JEr48wBzD6ZhmDhUbtqxswsFYROfCigWpkxywBsykesDy8ENKDOYQZg==";
+ url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.2.3-pre.tgz";
+ sha512 = "7dAkgA92K/xzFu+ZeS1oVDgjIMmBuWQBo0CNFucPxyWds7I8liDDdt2ph64eaZauzrSlfy3T8G895SDQb188cA==";
};
dependencies = [
sources."@gardenapple/yargs-17.0.0-candidate.0"
sources."@mozilla/readability-0.4.1"
sources."abab-2.0.5"
- sources."acorn-8.0.5"
+ sources."acorn-8.1.0"
(sources."acorn-globals-6.0.0" // {
dependencies = [
sources."acorn-7.4.1"
@@ -98058,7 +98247,7 @@ in
sources."webidl-conversions-5.0.0"
];
})
- sources."dompurify-2.2.6"
+ sources."dompurify-2.2.7"
sources."ecc-jsbn-0.1.2"
sources."emoji-regex-8.0.0"
sources."escalade-3.1.1"
@@ -98085,14 +98274,13 @@ in
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."jsbn-0.1.1"
- sources."jsdom-16.5.0"
+ sources."jsdom-16.5.1"
sources."json-schema-0.2.3"
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."levn-0.3.0"
sources."lodash-4.17.21"
- sources."lodash.sortby-4.7.0"
sources."mime-db-1.46.0"
sources."mime-types-2.1.29"
sources."nwsapi-2.2.0"
@@ -98139,14 +98327,14 @@ in
sources."webidl-conversions-6.1.0"
sources."whatwg-encoding-1.0.5"
sources."whatwg-mimetype-2.3.0"
- sources."whatwg-url-8.4.0"
+ sources."whatwg-url-8.5.0"
sources."word-wrap-1.2.3"
sources."wrap-ansi-7.0.0"
sources."ws-7.4.4"
sources."xml-name-validator-3.0.0"
sources."xmlchars-2.2.0"
sources."y18n-5.0.5"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -98176,22 +98364,22 @@ in
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-module-imports-7.12.13"
+ sources."@babel/helper-module-imports-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.13.8"
- sources."@babel/parser-7.13.9"
- sources."@babel/runtime-7.13.9"
+ sources."@babel/highlight-7.13.10"
+ sources."@babel/parser-7.13.12"
+ sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@emotion/is-prop-valid-0.8.8"
sources."@emotion/memoize-0.7.4"
sources."@emotion/stylis-0.8.5"
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.45"
+ sources."@types/node-13.13.47"
sources."ajv-5.5.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
@@ -98240,7 +98428,7 @@ in
sources."chokidar-3.5.1"
sources."cipher-base-1.0.4"
sources."classnames-2.2.6"
- sources."clipboard-2.0.7"
+ sources."clipboard-2.0.8"
sources."cliui-7.0.4"
sources."clsx-1.1.1"
sources."co-4.6.0"
@@ -98272,7 +98460,7 @@ in
];
})
sources."domain-browser-1.2.0"
- sources."dompurify-2.2.6"
+ sources."dompurify-2.2.7"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -98402,7 +98590,7 @@ in
sources."react-16.14.0"
sources."react-dom-16.14.0"
sources."react-is-16.13.1"
- sources."react-tabs-3.2.0"
+ sources."react-tabs-3.2.1"
(sources."readable-stream-2.3.7" // {
dependencies = [
sources."inherits-2.0.4"
@@ -98414,7 +98602,7 @@ in
sources."readdirp-3.5.0"
sources."redoc-2.0.0-rc.48"
sources."reftools-1.1.8"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
sources."ripemd160-2.0.2"
@@ -98432,7 +98620,7 @@ in
sources."should-type-1.4.0"
sources."should-type-adaptors-1.1.0"
sources."should-util-1.0.1"
- sources."slugify-1.4.7"
+ sources."slugify-1.5.0"
sources."source-map-0.6.1"
sources."sprintf-js-1.0.3"
sources."stickyfill-1.1.1"
@@ -98451,7 +98639,7 @@ in
sources."to-regex-range-5.0.1"
sources."tslib-2.1.0"
sources."tty-browserify-0.0.0"
- sources."uglify-js-3.13.0"
+ sources."uglify-js-3.13.2"
(sources."url-0.11.0" // {
dependencies = [
sources."punycode-1.3.2"
@@ -98476,7 +98664,7 @@ in
})
sources."xtend-4.0.2"
sources."y18n-5.0.5"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.2"
(sources."yargs-15.4.1" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -98488,7 +98676,7 @@ in
sources."yargs-parser-18.1.3"
];
})
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -98552,10 +98740,10 @@ in
rollup = nodeEnv.buildNodePackage {
name = "rollup";
packageName = "rollup";
- version = "2.40.0";
+ version = "2.42.4";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.40.0.tgz";
- sha512 = "WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.42.4.tgz";
+ sha512 = "Zqv3EvNfcllBHyyEUM754npqsZw82VIjK34cDQMwrQ1d6aqxzeYu5yFb7smGkPU4C1Bj7HupIMeT6WU7uIdnMw==";
};
dependencies = [
sources."fsevents-2.3.2"
@@ -98578,13 +98766,14 @@ in
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."chalk-2.4.2"
];
})
(sources."@eslint/eslintrc-0.4.0" // {
dependencies = [
+ sources."globals-12.4.0"
sources."ignore-4.0.6"
];
})
@@ -98602,19 +98791,19 @@ in
sources."@types/estree-0.0.39"
sources."@types/glob-7.1.3"
sources."@types/json-schema-7.0.7"
- sources."@types/minimatch-3.0.3"
- sources."@types/mocha-8.2.1"
+ sources."@types/minimatch-3.0.4"
+ sources."@types/mocha-8.2.2"
sources."@types/node-12.12.70"
sources."@types/node-fetch-2.5.8"
sources."@types/resolve-1.17.1"
sources."@types/vscode-1.54.0"
- sources."@typescript-eslint/eslint-plugin-4.16.1"
- sources."@typescript-eslint/experimental-utils-4.16.1"
- sources."@typescript-eslint/parser-4.16.1"
- sources."@typescript-eslint/scope-manager-4.16.1"
- sources."@typescript-eslint/types-4.16.1"
- sources."@typescript-eslint/typescript-estree-4.16.1"
- sources."@typescript-eslint/visitor-keys-4.16.1"
+ sources."@typescript-eslint/eslint-plugin-4.19.0"
+ sources."@typescript-eslint/experimental-utils-4.19.0"
+ sources."@typescript-eslint/parser-4.19.0"
+ sources."@typescript-eslint/scope-manager-4.19.0"
+ sources."@typescript-eslint/types-4.19.0"
+ sources."@typescript-eslint/typescript-estree-4.19.0"
+ sources."@typescript-eslint/visitor-keys-4.19.0"
sources."@ungap/promise-all-settled-1.1.2"
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
@@ -98681,7 +98870,7 @@ in
sources."dom-serializer-1.2.0"
sources."domelementtype-2.1.0"
sources."domhandler-4.0.0"
- sources."domutils-2.4.4"
+ sources."domutils-2.5.0"
sources."duplexer2-0.1.4"
(sources."editorconfig-0.15.3" // {
dependencies = [
@@ -98695,7 +98884,7 @@ in
sources."entities-2.1.0"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
- (sources."eslint-7.21.0" // {
+ (sources."eslint-7.22.0" // {
dependencies = [
sources."ignore-4.0.6"
];
@@ -98751,8 +98940,12 @@ in
sources."get-caller-file-2.0.5"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globals-12.4.0"
- sources."globby-11.0.2"
+ (sources."globals-13.7.0" // {
+ dependencies = [
+ sources."type-fest-0.20.2"
+ ];
+ })
+ sources."globby-11.0.3"
sources."graceful-fs-4.2.6"
sources."growl-1.10.5"
sources."has-1.0.3"
@@ -98804,7 +98997,7 @@ in
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
- (sources."mocha-8.3.1" // {
+ (sources."mocha-8.3.2" // {
dependencies = [
sources."argparse-2.0.1"
(sources."debug-4.3.1" // {
@@ -98854,7 +99047,7 @@ in
sources."progress-2.0.3"
sources."pseudomap-1.0.2"
sources."punycode-2.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."randombytes-2.1.0"
sources."read-1.0.7"
(sources."readable-stream-2.3.7" // {
@@ -98870,10 +99063,10 @@ in
sources."resolve-from-4.0.0"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
- sources."rollup-2.40.0"
+ sources."rollup-2.42.4"
sources."run-parallel-1.2.0"
sources."safe-buffer-5.2.1"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."serialize-javascript-5.0.1"
sources."setimmediate-1.0.5"
sources."shebang-command-2.0.0"
@@ -98900,7 +99093,7 @@ in
sources."supports-color-5.5.0"
(sources."table-6.0.7" // {
dependencies = [
- sources."ajv-7.2.1"
+ sources."ajv-7.2.3"
sources."json-schema-traverse-1.0.0"
];
})
@@ -98927,7 +99120,7 @@ in
sources."url-join-1.1.0"
sources."util-deprecate-1.0.2"
sources."v8-compile-cache-2.3.0"
- (sources."vsce-1.85.1" // {
+ (sources."vsce-1.87.0" // {
dependencies = [
sources."chalk-2.4.2"
sources."commander-6.2.1"
@@ -99144,10 +99337,10 @@ in
semver = nodeEnv.buildNodePackage {
name = "semver";
packageName = "semver";
- version = "7.3.4";
+ version = "7.3.5";
src = fetchurl {
- url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
- sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
+ url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz";
+ sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==";
};
dependencies = [
sources."lru-cache-6.0.0"
@@ -99272,10 +99465,10 @@ in
serverless = nodeEnv.buildNodePackage {
name = "serverless";
packageName = "serverless";
- version = "2.28.7";
+ version = "2.31.0";
src = fetchurl {
- url = "https://registry.npmjs.org/serverless/-/serverless-2.28.7.tgz";
- sha512 = "WNHY7DGi5cIskeby/pKa81mHZp3p/+xBIdig/lHD+0++vf9nHhwGVVTyqPvjx4cX9t+rfh09Y8OFvjaCLDR3VA==";
+ url = "https://registry.npmjs.org/serverless/-/serverless-2.31.0.tgz";
+ sha512 = "gqjiMemQKvOEYgAQB8IuPA4v6GMg83kkxREy8i55oHnv4xwMJQ2RX11Z83Sk05qPR5fl59e3ZNuLgvXZKoOgBA==";
};
dependencies = [
sources."2-thenable-1.0.0"
@@ -99307,12 +99500,24 @@ in
];
})
sources."@serverless/component-metrics-1.0.8"
- (sources."@serverless/components-3.7.2" // {
+ (sources."@serverless/components-3.7.7" // {
dependencies = [
+ (sources."@serverless/utils-3.1.0" // {
+ dependencies = [
+ sources."js-yaml-4.0.0"
+ ];
+ })
sources."ansi-regex-5.0.0"
- sources."js-yaml-3.14.1"
+ sources."argparse-2.0.1"
+ (sources."js-yaml-3.14.1" // {
+ dependencies = [
+ sources."argparse-1.0.10"
+ ];
+ })
+ sources."jwt-decode-3.1.2"
sources."ramda-0.27.1"
sources."strip-ansi-6.0.0"
+ sources."write-file-atomic-3.0.3"
];
})
(sources."@serverless/core-1.1.2" // {
@@ -99322,38 +99527,25 @@ in
sources."semver-6.3.0"
];
})
- (sources."@serverless/enterprise-plugin-4.4.3" // {
+ (sources."@serverless/enterprise-plugin-4.5.2" // {
dependencies = [
- sources."@serverless/platform-client-3.11.1"
sources."js-yaml-3.14.1"
];
})
sources."@serverless/event-mocks-1.1.1"
- (sources."@serverless/platform-client-4.2.0" // {
+ (sources."@serverless/platform-client-4.2.2" // {
dependencies = [
+ sources."adm-zip-0.4.16"
sources."js-yaml-3.14.1"
];
})
- (sources."@serverless/platform-client-china-2.1.7" // {
+ (sources."@serverless/platform-client-china-2.1.9" // {
dependencies = [
- sources."adm-zip-0.5.4"
sources."js-yaml-3.14.1"
];
})
- (sources."@serverless/platform-sdk-2.3.2" // {
- dependencies = [
- sources."chalk-2.4.2"
- sources."debug-4.3.2"
- sources."https-proxy-agent-4.0.0"
- sources."is-docker-1.1.0"
- sources."ms-2.1.2"
- sources."ramda-0.25.0"
- sources."uuid-3.4.0"
- sources."ws-6.2.1"
- ];
- })
sources."@serverless/template-1.1.4"
- (sources."@serverless/utils-3.1.0" // {
+ (sources."@serverless/utils-4.0.0" // {
dependencies = [
sources."jwt-decode-3.1.2"
sources."write-file-atomic-3.0.3"
@@ -99369,14 +99561,19 @@ in
sources."@types/keyv-3.1.1"
sources."@types/lodash-4.14.168"
sources."@types/long-4.0.1"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/request-2.48.5"
sources."@types/request-promise-native-1.0.17"
sources."@types/responselike-1.0.0"
sources."@types/tough-cookie-4.0.0"
- sources."adm-zip-0.4.16"
+ sources."adm-zip-0.5.4"
sources."after-0.8.2"
- sources."agent-base-5.1.1"
+ (sources."agent-base-6.0.2" // {
+ dependencies = [
+ sources."debug-4.3.2"
+ sources."ms-2.1.2"
+ ];
+ })
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
(sources."ansi-align-3.0.0" // {
@@ -99386,7 +99583,7 @@ in
sources."string-width-3.1.0"
];
})
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-4.1.0"
sources."ansi-styles-3.2.1"
sources."anymatch-3.1.1"
@@ -99423,10 +99620,9 @@ in
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-2.6.3"
- sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
- (sources."aws-sdk-2.858.0" // {
+ (sources."aws-sdk-2.871.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -99477,7 +99673,6 @@ in
sources."buffer-alloc-unsafe-1.1.0"
sources."buffer-crc32-0.2.13"
sources."buffer-fill-1.0.0"
- sources."buffer-from-1.1.1"
sources."buffermaker-1.2.1"
sources."buffers-0.1.1"
sources."builtin-modules-3.2.0"
@@ -99509,6 +99704,7 @@ in
sources."child-process-ext-2.1.1"
sources."chokidar-3.5.1"
sources."chownr-1.1.4"
+ sources."ci-info-3.1.1"
sources."cli-boxes-2.2.1"
(sources."cli-color-2.0.0" // {
dependencies = [
@@ -99699,7 +99895,7 @@ in
sources."github-from-package-0.0.0"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
(sources."got-11.8.2" // {
dependencies = [
sources."@sindresorhus/is-4.0.0"
@@ -99712,7 +99908,7 @@ in
sources."keyv-4.0.3"
sources."lowercase-keys-2.0.0"
sources."mimic-response-3.1.0"
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."responselike-2.0.0"
];
})
@@ -99735,7 +99931,6 @@ in
sources."http2-wrapper-1.0.3"
(sources."https-proxy-agent-5.0.0" // {
dependencies = [
- sources."agent-base-6.0.2"
sources."debug-4.3.2"
sources."ms-2.1.2"
];
@@ -99895,11 +100090,6 @@ in
sources."one-time-0.0.4"
sources."onetime-5.1.2"
sources."open-7.4.2"
- (sources."opn-5.5.0" // {
- dependencies = [
- sources."is-wsl-1.1.0"
- ];
- })
sources."optional-0.1.4"
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
@@ -99940,7 +100130,7 @@ in
sources."promise-queue-2.2.5"
(sources."protobufjs-6.10.2" // {
dependencies = [
- sources."@types/node-13.13.45"
+ sources."@types/node-13.13.47"
sources."long-4.0.0"
];
})
@@ -99951,14 +100141,13 @@ in
sources."qs-6.5.2"
sources."query-string-5.1.1"
sources."querystring-0.2.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-5.1.1"
sources."ramda-0.26.1"
sources."rc-1.2.8"
sources."readable-stream-3.6.0"
sources."readdir-glob-1.1.1"
sources."readdirp-3.5.0"
- sources."regenerator-runtime-0.13.7"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
sources."replaceall-0.1.6"
@@ -99983,7 +100172,7 @@ in
sources."safer-buffer-2.1.2"
sources."sax-1.2.1"
sources."seek-bzip-1.0.6"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."set-blocking-2.0.0"
sources."set-immediate-shim-1.0.1"
sources."shebang-command-1.2.0"
@@ -99992,7 +100181,7 @@ in
sources."signal-exit-3.0.3"
sources."simple-concat-1.0.1"
sources."simple-get-2.8.1"
- (sources."simple-git-2.36.1" // {
+ (sources."simple-git-2.37.0" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
@@ -100014,8 +100203,6 @@ in
})
sources."sort-keys-1.1.2"
sources."sort-keys-length-1.0.1"
- sources."source-map-0.6.1"
- sources."source-map-support-0.5.19"
sources."split2-3.2.2"
sources."sprintf-js-1.0.3"
sources."sprintf-kit-2.0.0"
@@ -100103,8 +100290,8 @@ in
sources."tslib-1.14.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."type-2.3.0"
- sources."type-fest-0.11.0"
+ sources."type-2.5.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."unbzip2-stream-1.4.3"
sources."universalify-0.1.2"
@@ -100453,7 +100640,7 @@ in
sources."kind-of-5.1.0"
];
})
- sources."cli-table-0.3.5"
+ sources."cli-table-0.3.6"
sources."collection-visit-1.0.0"
sources."colors-1.0.3"
sources."commander-2.9.0"
@@ -100804,10 +100991,10 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.476.0";
+ version = "1.509.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.476.0.tgz";
- sha512 = "GLOZC1EQ9mcA38WF+6a6z4rZtvHTGUiokXYp66DVf70OoNDPwM00nL3AwWtFc39bLb04TSl8INgL87LIXiYLUg==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.509.0.tgz";
+ sha512 = "3vdfa79Phr16O6Laun5zkNOxhQ7VIPeqb+aWwREkY3xOldLiZmOgQxfwKkllc/kImDmxB1CdDmRRwSJvPGMJ3Q==";
};
dependencies = [
sources."@deepcode/dcignore-1.0.2"
@@ -100819,13 +101006,17 @@ in
sources."@sindresorhus/is-2.1.1"
sources."@snyk/cli-interface-2.11.0"
sources."@snyk/cocoapods-lockfile-parser-3.6.2"
- (sources."@snyk/code-client-3.1.4" // {
+ (sources."@snyk/code-client-3.1.5" // {
dependencies = [
sources."uuid-8.3.2"
];
})
sources."@snyk/composer-lockfile-parser-1.4.1"
- sources."@snyk/dep-graph-1.23.1"
+ (sources."@snyk/dep-graph-1.28.0" // {
+ dependencies = [
+ sources."semver-7.3.5"
+ ];
+ })
sources."@snyk/docker-registry-v2-client-1.13.9"
sources."@snyk/fast-glob-3.2.6-patch"
sources."@snyk/gemfile-1.2.0"
@@ -100833,7 +101024,7 @@ in
sources."@snyk/graphlib-2.1.9-patch.3"
(sources."@snyk/inquirer-7.3.3-patch" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."chalk-4.1.0"
sources."strip-ansi-6.0.0"
];
@@ -100869,7 +101060,7 @@ in
sources."@types/lodash.omit-4.5.6"
sources."@types/lodash.union-4.6.6"
sources."@types/micromatch-4.0.1"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/responselike-1.0.0"
sources."@types/sarif-2.1.3"
sources."@types/uuid-8.3.0"
@@ -100942,6 +101133,7 @@ in
})
sources."chardet-0.7.0"
sources."child-process-1.0.2"
+ sources."chownr-2.0.0"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.1"
sources."cli-cursor-3.1.0"
@@ -100984,7 +101176,7 @@ in
sources."string_decoder-1.3.0"
];
})
- sources."dockerfile-ast-0.1.0"
+ sources."dockerfile-ast-0.2.0"
sources."dot-prop-5.3.0"
sources."dotnet-deps-parser-5.0.0"
sources."duplexer3-0.1.4"
@@ -101017,6 +101209,7 @@ in
sources."fill-range-7.0.1"
sources."follow-redirects-1.13.3"
sources."fs-constants-1.0.0"
+ sources."fs-minipass-2.1.0"
sources."fs.realpath-1.0.0"
(sources."ftp-0.3.10" // {
dependencies = [
@@ -101042,12 +101235,7 @@ in
sources."debug-3.2.7"
];
})
- (sources."hosted-git-info-3.0.8" // {
- dependencies = [
- sources."lru-cache-6.0.0"
- sources."yallist-4.0.0"
- ];
- })
+ sources."hosted-git-info-3.0.8"
sources."http-cache-semantics-4.1.0"
sources."http-errors-1.7.3"
(sources."http-proxy-agent-2.1.0" // {
@@ -101149,7 +101337,7 @@ in
sources."lodash.upperfirst-4.3.1"
sources."lodash.values-4.3.0"
sources."lowercase-keys-2.0.0"
- sources."lru-cache-5.1.1"
+ sources."lru-cache-6.0.0"
sources."macos-release-2.4.1"
sources."make-dir-3.1.0"
sources."merge2-1.4.1"
@@ -101158,6 +101346,8 @@ in
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
+ sources."minipass-3.1.3"
+ sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
sources."mute-stream-0.0.8"
@@ -101177,7 +101367,7 @@ in
sources."optionator-0.8.3"
sources."os-name-3.1.0"
sources."os-tmpdir-1.0.2"
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."p-finally-1.0.0"
sources."p-map-2.1.0"
sources."pac-proxy-agent-3.0.1"
@@ -101215,7 +101405,12 @@ in
sources."promise-7.3.1"
sources."promise-fs-2.1.1"
sources."promise-queue-2.2.5"
- sources."proxy-agent-3.1.1"
+ (sources."proxy-agent-3.1.1" // {
+ dependencies = [
+ sources."lru-cache-5.1.1"
+ sources."yallist-3.1.1"
+ ];
+ })
sources."proxy-from-env-1.1.0"
sources."pseudomap-1.0.2"
sources."pump-3.0.0"
@@ -101226,7 +101421,7 @@ in
})
sources."pupa-2.1.1"
sources."queue-6.0.2"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-5.1.1"
sources."raw-body-2.4.1"
sources."rc-1.2.8"
@@ -101264,9 +101459,10 @@ in
sources."tslib-2.1.0"
];
})
- (sources."snyk-docker-plugin-4.17.3" // {
+ (sources."snyk-docker-plugin-4.19.3" // {
dependencies = [
sources."rimraf-3.0.2"
+ sources."semver-7.3.5"
sources."snyk-nodejs-lockfile-parser-1.30.2"
sources."tmp-0.2.1"
sources."uuid-8.3.2"
@@ -101328,10 +101524,12 @@ in
})
(sources."snyk-policy-1.19.0" // {
dependencies = [
+ sources."lru-cache-5.1.1"
sources."snyk-try-require-2.0.1"
+ sources."yallist-3.1.1"
];
})
- sources."snyk-python-plugin-1.19.5"
+ sources."snyk-python-plugin-1.19.7"
sources."snyk-resolve-1.1.0"
(sources."snyk-resolve-deps-4.7.2" // {
dependencies = [
@@ -101382,6 +101580,7 @@ in
sources."strip-eof-1.0.0"
sources."strip-json-comments-2.0.1"
sources."supports-color-7.2.0"
+ sources."tar-6.1.0"
(sources."tar-stream-2.2.0" // {
dependencies = [
sources."readable-stream-3.6.0"
@@ -101409,7 +101608,7 @@ in
sources."tslib-1.14.1"
sources."tweetnacl-0.14.5"
sources."type-check-0.3.2"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."unique-string-2.0.0"
sources."unpipe-1.0.0"
@@ -101445,8 +101644,8 @@ in
sources."xmlbuilder-11.0.1"
sources."xregexp-2.0.0"
sources."xtend-4.0.2"
- sources."yallist-3.1.1"
- sources."yaml-1.10.0"
+ sources."yallist-4.0.0"
+ sources."yaml-1.10.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -101461,16 +101660,16 @@ in
"socket.io" = nodeEnv.buildNodePackage {
name = "socket.io";
packageName = "socket.io";
- version = "3.1.2";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz";
- sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw==";
+ url = "https://registry.npmjs.org/socket.io/-/socket.io-4.0.0.tgz";
+ sha512 = "/c1riZMV/4yz7KEpaMhDQbwhJDIoO55whXaRKgyEBQrLU9zUHXo9rzeTMvTOqwL9mbKfHKdrXcMoCeQ/1YtMsg==";
};
dependencies = [
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.0"
sources."@types/cors-2.8.10"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."accepts-1.3.7"
sources."base64-arraybuffer-0.1.4"
sources."base64id-2.0.0"
@@ -101478,14 +101677,14 @@ in
sources."cookie-0.4.1"
sources."cors-2.8.5"
sources."debug-4.3.2"
- sources."engine.io-4.1.1"
+ sources."engine.io-5.0.0"
sources."engine.io-parser-4.0.2"
sources."mime-db-1.46.0"
sources."mime-types-2.1.29"
sources."ms-2.1.2"
sources."negotiator-0.6.2"
sources."object-assign-4.1.1"
- sources."socket.io-adapter-2.1.0"
+ sources."socket.io-adapter-2.2.0"
sources."socket.io-parser-4.0.4"
sources."vary-1.1.2"
sources."ws-7.4.4"
@@ -101524,7 +101723,7 @@ in
sources."ci-info-1.6.0"
sources."cli-boxes-1.0.0"
sources."cli-cursor-2.1.0"
- sources."cli-spinners-2.5.0"
+ sources."cli-spinners-2.6.0"
sources."clone-1.0.4"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
@@ -101690,7 +101889,7 @@ in
sources."random-access-storage-1.3.0"
];
})
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."abstract-leveldown-6.0.3"
sources."aligned-block-file-1.2.2"
sources."ansi-escapes-1.4.0"
@@ -101879,7 +102078,7 @@ in
sources."extend.js-0.0.2"
sources."extglob-0.3.2"
sources."fastintcompression-0.0.4"
- sources."fastpriorityqueue-0.6.3"
+ sources."fastpriorityqueue-0.7.0"
sources."file-uri-to-path-1.0.0"
sources."filename-regex-2.0.1"
sources."fill-range-2.2.4"
@@ -102033,7 +102232,7 @@ in
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."isobject-2.1.0"
- (sources."jitdb-2.3.3" // {
+ (sources."jitdb-2.3.4" // {
dependencies = [
sources."mkdirp-1.0.4"
sources."push-stream-11.0.0"
@@ -102221,11 +102420,17 @@ in
sources."prr-1.0.1"
sources."pull-abortable-4.0.0"
sources."pull-async-1.0.0"
+ (sources."pull-async-filter-1.0.0" // {
+ dependencies = [
+ sources."pull-stream-2.28.4"
+ ];
+ })
sources."pull-awaitable-1.0.0"
sources."pull-box-stream-1.0.13"
sources."pull-cat-1.1.11"
sources."pull-catch-1.0.1"
sources."pull-cont-0.1.1"
+ sources."pull-core-1.1.0"
sources."pull-cursor-3.0.0"
sources."pull-defer-0.2.3"
sources."pull-drain-gently-1.1.0"
@@ -102438,7 +102643,7 @@ in
];
})
sources."snapdragon-util-3.0.1"
- sources."socks-2.5.1"
+ sources."socks-2.6.0"
sources."sodium-browserify-1.3.0"
(sources."sodium-browserify-tweetnacl-0.2.6" // {
dependencies = [
@@ -102458,7 +102663,7 @@ in
sources."ssb-client-4.9.0"
sources."ssb-config-3.4.5"
sources."ssb-db-19.2.0"
- (sources."ssb-db2-1.18.2" // {
+ (sources."ssb-db2-1.18.6" // {
dependencies = [
sources."abstract-leveldown-6.2.3"
(sources."flumecodec-0.0.1" // {
@@ -102472,7 +102677,7 @@ in
sources."mkdirp-1.0.4"
sources."push-stream-11.0.0"
sources."rimraf-3.0.2"
- (sources."ssb-keys-8.0.2" // {
+ (sources."ssb-keys-8.1.0" // {
dependencies = [
sources."mkdirp-0.5.5"
];
@@ -102722,7 +102927,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.858.0" // {
+ (sources."aws-sdk-2.871.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -103107,6 +103312,7 @@ in
sources."oauth-sign-0.8.2"
sources."object-assign-4.1.1"
sources."object-hash-0.3.0"
+ sources."object-inspect-1.9.0"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
sources."once-1.4.0"
@@ -103247,6 +103453,7 @@ in
sources."setprototypeof-1.1.1"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
+ sources."side-channel-1.0.4"
sources."signal-exit-3.0.3"
sources."slash-1.0.0"
sources."sntp-1.0.9"
@@ -103312,7 +103519,7 @@ in
dependencies = [
sources."debug-3.2.7"
sources."form-data-2.5.1"
- sources."qs-6.9.6"
+ sources."qs-6.10.1"
sources."readable-stream-2.3.7"
sources."string_decoder-1.1.1"
];
@@ -103325,7 +103532,7 @@ in
sources."esprima-4.0.1"
sources."js-yaml-3.14.1"
sources."lodash-3.10.1"
- sources."qs-6.9.6"
+ sources."qs-6.10.1"
];
})
sources."swagger-schema-official-2.0.0-bab6bed"
@@ -103497,31 +103704,31 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.8"
- sources."@babel/core-7.13.8"
+ sources."@babel/compat-data-7.13.12"
+ sources."@babel/core-7.13.10"
sources."@babel/generator-7.13.9"
- sources."@babel/helper-compilation-targets-7.13.8"
+ sources."@babel/helper-compilation-targets-7.13.10"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- sources."@babel/helpers-7.13.0"
- (sources."@babel/highlight-7.13.8" // {
+ sources."@babel/helpers-7.13.10"
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.13.9"
+ sources."@babel/parser-7.13.12"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@nodelib/fs.scandir-2.1.4"
sources."@nodelib/fs.stat-2.0.4"
sources."@nodelib/fs.walk-1.2.6"
@@ -103532,7 +103739,7 @@ in
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse-json-4.0.0"
sources."@types/unist-2.0.3"
- sources."ajv-7.2.1"
+ sources."ajv-7.2.3"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
sources."array-union-2.1.0"
@@ -103547,7 +103754,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
(sources."chalk-4.1.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -103585,7 +103792,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -103611,13 +103818,13 @@ in
sources."global-modules-2.0.0"
sources."global-prefix-3.0.0"
sources."globals-11.12.0"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."globjoin-0.1.4"
sources."gonzales-pe-4.3.0"
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
sources."has-flag-3.0.0"
- sources."hosted-git-info-3.0.8"
+ sources."hosted-git-info-4.0.2"
sources."html-tags-3.1.0"
sources."htmlparser2-3.10.1"
sources."ignore-5.1.8"
@@ -103647,6 +103854,7 @@ in
sources."is-plain-obj-2.1.0"
sources."is-regexp-2.1.0"
sources."is-typedarray-1.0.0"
+ sources."is-unicode-supported-0.1.0"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
sources."jsesc-2.5.2"
@@ -103658,10 +103866,10 @@ in
sources."lines-and-columns-1.1.6"
sources."locate-path-5.0.0"
sources."lodash-4.17.21"
- sources."log-symbols-4.0.0"
+ sources."log-symbols-4.1.0"
sources."longest-streak-2.0.4"
sources."lru-cache-6.0.0"
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
sources."mathml-tag-names-2.1.3"
sources."mdast-util-from-markdown-0.8.5"
sources."mdast-util-to-markdown-0.6.5"
@@ -103680,9 +103888,9 @@ in
})
sources."ms-2.1.2"
sources."node-releases-1.1.71"
- (sources."normalize-package-data-3.0.0" // {
+ (sources."normalize-package-data-3.0.2" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."normalize-range-0.1.2"
@@ -103722,7 +103930,7 @@ in
sources."postcss-syntax-0.36.2"
sources."postcss-value-parser-4.1.0"
sources."punycode-2.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-4.0.1"
(sources."read-pkg-5.2.0" // {
dependencies = [
@@ -103800,8 +104008,8 @@ in
sources."wrappy-1.0.2"
sources."write-file-atomic-3.0.3"
sources."yallist-4.0.0"
- sources."yaml-1.10.0"
- sources."yargs-parser-20.2.6"
+ sources."yaml-1.10.2"
+ sources."yargs-parser-20.2.7"
sources."zwitch-1.0.5"
];
buildInputs = globalBuildInputs;
@@ -103817,19 +104025,19 @@ in
svelte-language-server = nodeEnv.buildNodePackage {
name = "svelte-language-server";
packageName = "svelte-language-server";
- version = "0.12.19";
+ version = "0.12.24";
src = fetchurl {
- url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.19.tgz";
- sha512 = "u4f5Zn1UvOTeNSTH83z/v8fifhU+kNEpbMff07kMkZFBFxTXdMEh2/qS9VFjJu/0Ala646HnapgZgnakVvnZuQ==";
+ url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.24.tgz";
+ sha512 = "kArBDbgiSj24dgd+u9KU9XgmN6plEETUQDgXcj9o/XEYp6Ii2VBZwxTbIxHAa4AFcOwIUxq5B6gX8zzt3y7v+Q==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.13.8"
- sources."@emmetio/abbreviation-2.2.1"
- sources."@emmetio/css-abbreviation-2.1.2"
+ sources."@babel/highlight-7.13.10"
+ sources."@emmetio/abbreviation-2.2.2"
+ sources."@emmetio/css-abbreviation-2.1.4"
sources."@emmetio/scanner-1.0.0"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/parse-json-4.0.0"
sources."@types/pug-2.0.4"
sources."@types/sass-1.16.0"
@@ -103845,7 +104053,7 @@ in
sources."cosmiconfig-7.0.0"
sources."dedent-js-1.0.1"
sources."detect-indent-6.0.0"
- sources."emmet-2.3.2"
+ sources."emmet-2.3.4"
sources."error-ex-1.3.2"
sources."escape-string-regexp-1.0.5"
sources."estree-walker-2.0.2"
@@ -103882,7 +104090,7 @@ in
sources."supports-color-5.5.0"
sources."svelte-3.35.0"
sources."svelte-preprocess-4.6.9"
- sources."svelte2tsx-0.1.179"
+ sources."svelte2tsx-0.1.184"
sources."to-regex-range-5.0.1"
sources."tslib-2.1.0"
sources."typescript-4.2.3"
@@ -103896,7 +104104,7 @@ in
sources."vscode-languageserver-types-3.16.0"
sources."vscode-nls-5.0.0"
sources."vscode-uri-2.1.2"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -103911,10 +104119,10 @@ in
svgo = nodeEnv.buildNodePackage {
name = "svgo";
packageName = "svgo";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/svgo/-/svgo-2.2.1.tgz";
- sha512 = "WrKhe5CMm/O5gchTQKGogKYXGbOC0JBZnHqvaCTEbsMuq4prxQHB/AZgif8WwD4+9Nim4EECObmyjvkdC43iNg==";
+ url = "https://registry.npmjs.org/svgo/-/svgo-2.2.2.tgz";
+ sha512 = "kJugY2d0yrsONnG4YavppVkKmKULMw2iFRbB9+usyWqzTaqoBuUaqdMnQ2G1n5P1dmOA2tZvc5zmMM6sPOVBSQ==";
};
dependencies = [
sources."@trysound/sax-0.1.1"
@@ -103923,7 +104131,7 @@ in
sources."chalk-4.1.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."commander-7.1.0"
+ sources."commander-7.2.0"
sources."css-select-3.1.2"
sources."css-tree-1.1.2"
sources."css-what-4.0.0"
@@ -103931,7 +104139,7 @@ in
sources."dom-serializer-1.2.0"
sources."domelementtype-2.1.0"
sources."domhandler-4.0.0"
- sources."domutils-2.4.4"
+ sources."domutils-2.5.0"
sources."entities-2.2.0"
sources."has-flag-4.0.0"
sources."mdn-data-2.0.14"
@@ -104023,6 +104231,7 @@ in
})
sources."bytes-1.0.0"
sources."cache-base-1.0.1"
+ sources."call-bind-1.0.2"
sources."camelcase-4.1.0"
sources."capture-stack-trace-1.0.1"
sources."chalk-1.1.3"
@@ -104145,6 +104354,8 @@ in
sources."fs-extra-0.24.0"
sources."fs.realpath-1.0.0"
sources."fsevents-1.2.13"
+ sources."function-bind-1.1.1"
+ sources."get-intrinsic-1.1.1"
sources."get-stream-3.0.0"
sources."get-value-2.0.6"
sources."glob-7.1.6"
@@ -104168,8 +104379,10 @@ in
sources."source-map-0.6.1"
];
})
+ sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -104328,6 +104541,7 @@ in
sources."kind-of-3.2.2"
];
})
+ sources."object-inspect-1.9.0"
sources."object-visit-1.0.1"
sources."object.pick-1.3.0"
sources."on-finished-2.3.0"
@@ -104345,7 +104559,7 @@ in
dependencies = [
sources."debug-3.2.7"
sources."ms-2.1.3"
- sources."qs-6.9.6"
+ sources."qs-6.10.1"
sources."superagent-3.8.3"
];
})
@@ -104409,6 +104623,7 @@ in
sources."setprototypeof-1.1.1"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
+ sources."side-channel-1.0.4"
sources."sigmund-1.0.1"
sources."signal-exit-3.0.3"
sources."slash-1.0.0"
@@ -104522,7 +104737,7 @@ in
sources."truncate-utf8-bytes-1.0.2"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
- sources."uglify-js-3.13.0"
+ sources."uglify-js-3.13.2"
sources."undefsafe-2.0.3"
(sources."union-value-1.0.1" // {
dependencies = [
@@ -104754,29 +104969,29 @@ in
textlint = nodeEnv.buildNodePackage {
name = "textlint";
packageName = "textlint";
- version = "11.8.2";
+ version = "11.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/textlint/-/textlint-11.8.2.tgz";
- sha512 = "YrTGagGzWKXYw6VjW4uhJ1y7LoW8zqWZIr8sWgeQVIFE84+G/cHPoZ8RhFlia+RZ4YryZPNOqevuF4vG+dbKNQ==";
+ url = "https://registry.npmjs.org/textlint/-/textlint-11.9.0.tgz";
+ sha512 = "a9ZCfCOcOTNxEQsRbYBDFNu8m5cjJC+znnXCBommGSdP0W+9QmwZnkralwpxrVhRgWvLz+QyuDXtLBZcqfDmHg==";
};
dependencies = [
sources."@azu/format-text-1.0.1"
sources."@azu/style-format-1.0.0"
- sources."@textlint/ast-node-types-4.4.1"
- sources."@textlint/ast-tester-2.3.2"
- sources."@textlint/ast-traverse-2.3.2"
- sources."@textlint/feature-flag-3.3.2"
- sources."@textlint/fixer-formatter-3.3.2"
- sources."@textlint/kernel-3.4.2"
- sources."@textlint/linter-formatter-3.3.2"
- sources."@textlint/markdown-to-ast-6.3.2"
- sources."@textlint/module-interop-1.2.2"
- sources."@textlint/source-code-fixer-3.4.2"
- sources."@textlint/text-to-ast-3.3.2"
- sources."@textlint/textlint-plugin-markdown-5.3.2"
- sources."@textlint/textlint-plugin-text-4.3.2"
- sources."@textlint/types-1.5.2"
- sources."@textlint/utils-1.2.2"
+ sources."@textlint/ast-node-types-4.4.2"
+ sources."@textlint/ast-tester-2.3.4"
+ sources."@textlint/ast-traverse-2.3.4"
+ sources."@textlint/feature-flag-3.3.4"
+ sources."@textlint/fixer-formatter-3.3.4"
+ sources."@textlint/kernel-3.4.4"
+ sources."@textlint/linter-formatter-3.3.4"
+ sources."@textlint/markdown-to-ast-6.3.4"
+ sources."@textlint/module-interop-1.2.4"
+ sources."@textlint/source-code-fixer-3.4.4"
+ sources."@textlint/text-to-ast-3.3.4"
+ sources."@textlint/textlint-plugin-markdown-5.3.4"
+ sources."@textlint/textlint-plugin-text-4.3.4"
+ sources."@textlint/types-1.5.4"
+ sources."@textlint/utils-1.2.4"
sources."ajv-4.11.8"
sources."ajv-keywords-1.5.1"
sources."ansi-regex-2.1.1"
@@ -104987,7 +105202,7 @@ in
sha1 = "9139c65b8da891c983b368a50a286338cd76777a";
};
dependencies = [
- sources."@textlint/ast-node-types-4.4.1"
+ sources."@textlint/ast-node-types-4.4.2"
sources."txt-to-ast-3.0.3"
];
buildInputs = globalBuildInputs;
@@ -105040,16 +105255,18 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.13.8"
+ sources."@babel/highlight-7.13.10"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@textlint/ast-node-types-4.4.1"
- sources."@textlint/types-1.5.2"
+ sources."@textlint/ast-node-types-4.4.2"
+ sources."@textlint/types-1.5.4"
sources."@types/hast-2.3.1"
sources."@types/minimist-1.2.1"
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse5-5.0.3"
sources."@types/unist-2.0.3"
+ sources."acorn-8.1.0"
+ sources."acorn-jsx-5.3.1"
sources."alex-9.1.0"
(sources."ansi-align-3.0.0" // {
dependencies = [
@@ -105130,6 +105347,7 @@ in
sources."escape-goat-2.1.1"
sources."escape-string-regexp-1.0.5"
sources."esprima-4.0.1"
+ sources."estree-util-is-identifier-name-1.1.0"
sources."event-stream-3.1.7"
sources."extend-3.0.2"
sources."fault-1.0.4"
@@ -105180,7 +105398,6 @@ in
sources."inherits-2.0.4"
sources."ini-1.3.8"
sources."is-alphabetical-1.0.4"
- sources."is-alphanumeric-1.0.0"
sources."is-alphanumerical-1.0.4"
sources."is-arrayish-0.2.1"
sources."is-buffer-2.0.5"
@@ -105228,14 +105445,25 @@ in
sources."semver-6.3.0"
];
})
- sources."map-obj-4.1.0"
+ sources."map-obj-4.2.0"
sources."map-stream-0.1.0"
sources."markdown-escapes-1.0.4"
- sources."markdown-table-2.0.0"
sources."mdast-comment-marker-1.1.2"
- sources."mdast-util-compact-2.0.1"
+ sources."mdast-util-mdx-0.1.1"
+ sources."mdast-util-mdx-expression-0.1.1"
+ sources."mdast-util-mdx-jsx-0.1.4"
+ sources."mdast-util-mdxjs-esm-0.1.1"
+ sources."mdast-util-to-markdown-0.6.5"
sources."mdast-util-to-nlcst-4.0.1"
+ sources."mdast-util-to-string-2.0.0"
sources."meow-7.1.1"
+ sources."micromark-2.11.4"
+ sources."micromark-extension-mdx-0.2.1"
+ sources."micromark-extension-mdx-expression-0.3.2"
+ sources."micromark-extension-mdx-jsx-0.3.3"
+ sources."micromark-extension-mdx-md-0.1.1"
+ sources."micromark-extension-mdxjs-0.3.0"
+ sources."micromark-extension-mdxjs-esm-0.3.0"
sources."mimic-response-1.0.1"
sources."min-indent-1.0.1"
sources."minimatch-3.0.4"
@@ -105295,11 +105523,14 @@ in
sources."rehype-parse-7.0.1"
sources."rehype-retext-2.0.4"
sources."remark-frontmatter-2.0.0"
- sources."remark-mdx-2.0.0-next.8"
+ sources."remark-mdx-2.0.0-next.9"
sources."remark-message-control-6.0.0"
- sources."remark-parse-8.0.3"
+ (sources."remark-parse-8.0.3" // {
+ dependencies = [
+ sources."unist-util-remove-position-2.0.1"
+ ];
+ })
sources."remark-retext-4.0.0"
- sources."remark-stringify-8.1.1"
sources."repeat-string-1.6.1"
sources."resolve-1.20.0"
sources."resolve-from-5.0.0"
@@ -105397,7 +105628,7 @@ in
sources."unist-util-is-4.1.0"
sources."unist-util-modify-children-2.0.0"
sources."unist-util-position-3.1.0"
- sources."unist-util-remove-position-2.0.1"
+ sources."unist-util-remove-position-3.0.0"
sources."unist-util-stringify-position-2.0.3"
sources."unist-util-visit-2.0.3"
sources."unist-util-visit-children-1.1.4"
@@ -105433,6 +105664,7 @@ in
sources."xdg-basedir-4.0.0"
sources."xtend-4.0.2"
sources."yargs-parser-18.1.3"
+ sources."zwitch-1.0.5"
];
buildInputs = globalBuildInputs;
meta = {
@@ -105574,8 +105806,8 @@ in
sha512 = "HydBbkWjnMn4KrnlpnusY1BGjIG+64UySxRCvRphUAIiuJL2nbkdrIIiOjwfQhllKUa7Sf33bs6RAcbEWjZVfg==";
};
dependencies = [
- sources."@textlint/ast-node-types-4.4.1"
- sources."@textlint/types-1.5.2"
+ sources."@textlint/ast-node-types-4.4.2"
+ sources."@textlint/types-1.5.4"
sources."boundary-1.0.1"
sources."buffer-from-1.1.1"
sources."call-bind-1.0.2"
@@ -105687,11 +105919,11 @@ in
sha512 = "UW7nWrqBUHfz/sRLTFo40BNjwXOiXSHg00TJuYY4GVDQtsWRLyAsOnXSBqClP4i6wl7ejMBeYmB5mfllYAYMgA==";
};
dependencies = [
- sources."@textlint/ast-node-types-4.4.1"
- sources."@textlint/types-1.5.2"
+ sources."@textlint/ast-node-types-4.4.2"
+ sources."@textlint/types-1.5.4"
sources."boundary-1.0.1"
sources."lodash-4.17.21"
- sources."split-lines-2.0.0"
+ sources."split-lines-2.1.0"
sources."structured-source-3.0.2"
sources."textlint-rule-helper-2.1.1"
sources."unist-util-is-3.0.0"
@@ -105717,8 +105949,8 @@ in
sha512 = "VW+ea4ByLPddSUqoFkVVJF8zWnO8kqKwvC681wGFAjI4CYz9WhjEQH1ikhoEHXnd5AFXNArcjyoa8hoihrXy0w==";
};
dependencies = [
- sources."@textlint/ast-node-types-4.4.1"
- sources."@textlint/types-1.5.2"
+ sources."@textlint/ast-node-types-4.4.2"
+ sources."@textlint/types-1.5.4"
sources."boundary-1.0.1"
sources."lodash-4.17.21"
sources."strip-json-comments-3.1.1"
@@ -105794,8 +106026,8 @@ in
sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e";
};
dependencies = [
- sources."@textlint/ast-node-types-4.4.1"
- sources."@textlint/types-1.5.2"
+ sources."@textlint/ast-node-types-4.4.2"
+ sources."@textlint/types-1.5.4"
sources."adverb-where-0.0.9"
sources."boundary-1.0.1"
sources."call-bind-1.0.2"
@@ -105844,7 +106076,7 @@ in
sources."@types/debug-4.1.5"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/responselike-1.0.0"
sources."abbrev-1.1.1"
sources."abstract-logging-2.0.1"
@@ -106112,7 +106344,7 @@ in
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.5"
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."p-finally-1.0.0"
sources."p-try-2.2.0"
(sources."package-json-6.5.0" // {
@@ -106162,7 +106394,7 @@ in
sources."read-chunk-3.2.0"
sources."readable-stream-3.6.0"
sources."readable-web-to-node-stream-2.0.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
(sources."request-2.88.2" // {
@@ -106404,7 +106636,7 @@ in
sources."rimraf-2.6.3"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."sprintf-0.1.5"
sources."sshpk-1.16.1"
sources."stack-trace-0.0.10"
@@ -106765,10 +106997,10 @@ in
uglify-js = nodeEnv.buildNodePackage {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.13.0";
+ version = "3.13.2";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.0.tgz";
- sha512 = "TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.2.tgz";
+ sha512 = "SbMu4D2Vo95LMC/MetNaso1194M1htEA+JrqE9Hk+G2DhI+itfS9TRu9ZKeCahLDNa/J3n4MqUJ/fOHMzQpRWw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -106814,7 +107046,7 @@ in
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.0"
sources."@types/cors-2.8.10"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."ansi-regex-5.0.0"
@@ -106943,7 +107175,7 @@ in
sources."lowercase-keys-1.0.1"
sources."lru-cache-4.1.5"
sources."media-typer-0.3.0"
- (sources."memorystore-1.6.5" // {
+ (sources."memorystore-1.6.6" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
@@ -107003,7 +107235,7 @@ in
sources."rimraf-3.0.2"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
- (sources."semver-7.3.4" // {
+ (sources."semver-7.3.5" // {
dependencies = [
sources."lru-cache-6.0.0"
sources."yallist-4.0.0"
@@ -107072,7 +107304,7 @@ in
sources."y18n-5.0.5"
sources."yallist-2.1.2"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -107087,10 +107319,10 @@ in
vega-cli = nodeEnv.buildNodePackage {
name = "vega-cli";
packageName = "vega-cli";
- version = "5.19.1";
+ version = "5.20.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.19.1.tgz";
- sha512 = "zUyyUYl2GgpAqdaQ3f/riNdaued3030hiJAjreX7/3XBiJ64vmF1l42x3KD8rq24ff9xLFwe0qyfnQOk4nK+fg==";
+ url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.20.0.tgz";
+ sha512 = "B7vV6u/6oXP+6WP91uPLKPmKXXu4YHncxue13mJwz8noRxsEYpeb0VtaCtwy+tf8otdXsM+YuKYzOJbtpuLXYQ==";
};
dependencies = [
sources."abbrev-1.1.1"
@@ -107117,7 +107349,7 @@ in
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
sources."core-util-is-1.0.2"
- sources."d3-array-2.11.0"
+ sources."d3-array-2.12.1"
sources."d3-color-2.0.0"
sources."d3-delaunay-5.3.0"
sources."d3-dispatch-2.0.0"
@@ -107131,7 +107363,7 @@ in
sources."d3-path-2.0.0"
sources."d3-quadtree-2.0.0"
sources."d3-scale-3.2.3"
- sources."d3-shape-2.0.0"
+ sources."d3-shape-2.1.0"
sources."d3-time-2.0.0"
sources."d3-time-format-3.0.0"
sources."d3-timer-2.0.0"
@@ -107156,7 +107388,7 @@ in
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.8"
- sources."internmap-1.0.0"
+ sources."internmap-1.0.1"
sources."is-core-module-2.2.0"
sources."is-fullwidth-code-point-1.0.0"
sources."isarray-1.0.0"
@@ -107206,7 +107438,7 @@ in
sources."tar-4.4.13"
sources."topojson-client-3.1.0"
sources."util-deprecate-1.0.2"
- sources."vega-5.19.1"
+ sources."vega-5.20.0"
sources."vega-canvas-1.2.6"
sources."vega-crossfilter-4.0.5"
sources."vega-dataflow-5.7.3"
@@ -107225,14 +107457,14 @@ in
sources."vega-regression-1.0.9"
sources."vega-runtime-6.1.3"
sources."vega-scale-7.1.1"
- sources."vega-scenegraph-4.9.3"
+ sources."vega-scenegraph-4.9.4"
sources."vega-selections-5.3.0"
sources."vega-statistics-1.7.9"
sources."vega-time-2.0.4"
sources."vega-transforms-4.9.3"
- sources."vega-typings-0.19.2"
- sources."vega-util-1.16.0"
- sources."vega-view-5.9.2"
+ sources."vega-typings-0.20.0"
+ sources."vega-util-1.16.1"
+ sources."vega-view-5.10.0"
sources."vega-view-transforms-4.5.8"
sources."vega-voronoi-4.1.5"
sources."vega-wordcloud-4.1.3"
@@ -107256,7 +107488,7 @@ in
sources."strip-ansi-6.0.0"
];
})
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -107299,11 +107531,11 @@ in
sources."tslib-2.1.0"
sources."vega-event-selector-2.0.6"
sources."vega-expression-4.0.1"
- sources."vega-util-1.16.0"
+ sources."vega-util-1.16.1"
sources."wrap-ansi-7.0.0"
sources."y18n-5.0.5"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.6"
+ sources."yargs-parser-20.2.7"
];
buildInputs = globalBuildInputs;
meta = {
@@ -107681,7 +107913,7 @@ in
sources."domain-browser-1.2.0"
sources."domelementtype-2.1.0"
sources."domhandler-4.0.0"
- sources."domutils-2.4.4"
+ sources."domutils-2.5.0"
(sources."duplexify-3.7.1" // {
dependencies = [
sources."isarray-1.0.0"
@@ -108223,9 +108455,9 @@ in
sources."util-deprecate-1.0.2"
sources."v8-compile-cache-2.3.0"
sources."vm-browserify-1.1.2"
- sources."vsce-1.85.1"
- sources."vscode-debugadapter-testsupport-1.45.0"
- sources."vscode-debugprotocol-1.45.0"
+ sources."vsce-1.87.0"
+ sources."vscode-debugadapter-testsupport-1.46.0"
+ sources."vscode-debugprotocol-1.46.0"
(sources."watchpack-1.7.5" // {
dependencies = [
sources."chokidar-3.5.1"
@@ -108279,7 +108511,7 @@ in
sources."xtend-4.0.2"
sources."y18n-4.0.1"
sources."yallist-3.1.1"
- sources."yaml-1.10.0"
+ sources."yaml-1.10.2"
(sources."yargs-13.3.2" // {
dependencies = [
sources."ansi-regex-4.1.0"
@@ -108552,7 +108784,7 @@ in
sources."tslib-1.14.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."uglify-js-3.13.0"
+ sources."uglify-js-3.13.2"
sources."uid-0.0.2"
sources."unbzip2-stream-1.4.3"
sources."unyield-0.0.1"
@@ -108595,7 +108827,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.13.8"
+ sources."@babel/highlight-7.13.10"
sources."@emmetio/extract-abbreviation-0.1.6"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
@@ -108611,7 +108843,7 @@ in
sources."@starptech/rehype-webparser-0.10.0"
sources."@starptech/webparser-0.10.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
@@ -109197,7 +109429,7 @@ in
];
})
sources."readable-stream-2.3.7"
- sources."readdirp-3.5.0"
+ sources."readdirp-3.6.0"
sources."redent-2.0.0"
sources."regenerator-runtime-0.11.1"
sources."regex-not-1.0.2"
@@ -109522,15 +109754,15 @@ in
web-ext = nodeEnv.buildNodePackage {
name = "web-ext";
packageName = "web-ext";
- version = "5.5.0";
+ version = "6.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/web-ext/-/web-ext-5.5.0.tgz";
- sha512 = "f+NHiYwbTS0X6eSLkBDWoCYkkIJweVazGf4MD8S+kRX/5z40WsYsnRdVWG+p34Z6rCyNvlHHrnO2S1W8WWg7Tw==";
+ url = "https://registry.npmjs.org/web-ext/-/web-ext-6.0.0.tgz";
+ sha512 = "djjTY89kM5ULdKYQo+6TYJSlT+0zNkanW5hQJNybOqGyovUYpH7C3Ns9Pd1cy6ApbmG2VV4Gds9u4yCSuRfHUw==";
};
dependencies = [
- sources."@babel/code-frame-7.12.13"
+ sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.13.8" // {
+ (sources."@babel/highlight-7.13.10" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -109540,35 +109772,27 @@ in
sources."supports-color-5.5.0"
];
})
- sources."@babel/polyfill-7.12.1"
- sources."@babel/runtime-7.12.5"
- sources."@cliqz-oss/firefox-client-0.3.1"
- sources."@cliqz-oss/node-firefox-connect-1.2.1"
+ sources."@babel/runtime-7.13.9"
sources."@devicefarmer/adbkit-2.11.3"
sources."@devicefarmer/adbkit-logcat-1.1.0"
sources."@devicefarmer/adbkit-monkey-1.0.1"
- (sources."@eslint/eslintrc-0.2.2" // {
+ (sources."@eslint/eslintrc-0.4.0" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
];
})
- sources."@mdn/browser-compat-data-2.0.7"
+ sources."@mdn/browser-compat-data-3.1.3"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.32"
+ sources."@types/minimatch-3.0.4"
+ sources."@types/node-14.14.35"
sources."@types/yauzl-2.9.1"
- sources."JSONSelect-0.2.1"
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
- (sources."addons-linter-2.13.1" // {
- dependencies = [
- sources."yargs-16.1.1"
- ];
- })
- sources."addons-scanner-utils-4.0.0"
- sources."adm-zip-0.4.16"
+ sources."addons-linter-2.21.0"
+ sources."addons-scanner-utils-4.2.0"
+ sources."adm-zip-0.5.4"
sources."ajv-6.12.6"
sources."ajv-merge-patch-4.1.0"
(sources."ansi-align-3.0.0" // {
@@ -109584,8 +109808,7 @@ in
sources."ansi-regex-2.1.1"
sources."ansi-styles-4.3.0"
sources."any-promise-1.3.0"
- sources."anymatch-3.1.1"
- (sources."archiver-5.0.2" // {
+ (sources."archiver-5.2.0" // {
dependencies = [
sources."async-3.2.0"
];
@@ -109594,59 +109817,41 @@ in
dependencies = [
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
- sources."string_decoder-1.1.1"
];
})
sources."argparse-1.0.10"
- sources."arr-diff-4.0.0"
- sources."arr-flatten-1.1.0"
- sources."arr-union-3.1.0"
sources."array-differ-3.0.0"
sources."array-filter-0.0.1"
sources."array-map-0.0.0"
sources."array-reduce-0.0.0"
sources."array-union-2.1.0"
- sources."array-unique-0.3.2"
sources."arrify-2.0.1"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
- sources."assign-symbols-1.0.0"
- sources."astral-regex-1.0.0"
+ sources."astral-regex-2.0.0"
sources."async-0.2.10"
- sources."async-each-1.0.3"
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
- sources."atob-2.1.2"
sources."atomic-sleep-1.0.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."balanced-match-1.0.0"
- (sources."base-0.11.2" // {
- dependencies = [
- sources."define-property-1.0.0"
- ];
- })
sources."base64-js-1.5.1"
sources."bcrypt-pbkdf-1.0.2"
- sources."binary-extensions-2.2.0"
- sources."bindings-1.5.0"
sources."bl-4.1.0"
sources."bluebird-2.9.34"
sources."boolbase-1.0.0"
- (sources."boxen-4.2.0" // {
+ (sources."boxen-5.0.0" // {
dependencies = [
- sources."camelcase-5.3.1"
- sources."chalk-3.0.0"
+ sources."type-fest-0.20.2"
];
})
sources."brace-expansion-1.1.11"
- sources."braces-3.0.2"
sources."buffer-5.7.1"
sources."buffer-crc32-0.2.13"
sources."buffer-equal-constant-time-1.0.1"
sources."buffer-from-1.1.1"
- sources."bunyan-1.8.14"
- sources."cache-base-1.0.1"
+ sources."bunyan-1.8.15"
(sources."cacheable-request-6.1.0" // {
dependencies = [
sources."lowercase-keys-2.0.0"
@@ -109654,39 +109859,17 @@ in
})
sources."call-bind-1.0.2"
sources."callsites-3.1.0"
- sources."camelcase-6.0.0"
+ sources."camelcase-6.2.0"
sources."caseless-0.12.0"
sources."chalk-4.1.0"
- sources."cheerio-1.0.0-rc.3"
- (sources."chokidar-3.5.1" // {
- dependencies = [
- sources."fsevents-2.3.2"
- ];
- })
+ sources."cheerio-1.0.0-rc.5"
+ sources."cheerio-select-tmp-0.1.1"
(sources."chrome-launcher-0.13.4" // {
dependencies = [
sources."mkdirp-0.5.5"
- sources."rimraf-3.0.2"
];
})
sources."ci-info-2.0.0"
- (sources."class-utils-0.3.6" // {
- dependencies = [
- sources."define-property-0.2.5"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- ];
- })
sources."cli-boxes-2.2.1"
(sources."cliui-7.0.4" // {
dependencies = [
@@ -109696,40 +109879,34 @@ in
})
sources."clone-1.0.4"
sources."clone-response-1.0.2"
- sources."collection-visit-1.0.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."colorette-1.2.2"
- sources."colors-0.5.1"
sources."columnify-1.5.4"
sources."combined-stream-1.0.8"
sources."commander-2.20.3"
sources."common-tags-1.8.0"
- sources."component-emitter-1.3.0"
sources."compress-commons-4.1.0"
sources."concat-map-0.0.1"
(sources."concat-stream-1.6.2" // {
dependencies = [
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
- sources."string_decoder-1.1.1"
];
})
sources."configstore-5.0.1"
- sources."copy-descriptor-0.1.1"
- sources."core-js-2.6.12"
+ sources."core-js-3.8.3"
sources."core-util-is-1.0.2"
sources."crc-32-1.2.0"
sources."crc32-stream-4.0.2"
sources."cross-spawn-7.0.3"
sources."crypto-random-string-2.0.0"
- sources."css-select-1.2.0"
- sources."css-what-2.1.3"
+ sources."css-select-3.1.2"
+ sources."css-what-4.0.0"
sources."dashdash-1.14.1"
sources."debounce-1.2.0"
sources."debug-2.6.9"
- sources."decamelize-4.0.0"
- sources."decode-uri-component-0.2.0"
+ sources."decamelize-5.0.0"
sources."decompress-response-3.3.0"
sources."deep-equal-1.1.1"
sources."deep-extend-0.6.0"
@@ -109739,19 +109916,18 @@ in
sources."defaults-1.0.3"
sources."defer-to-connect-1.1.3"
sources."define-properties-1.1.3"
- sources."define-property-2.0.2"
sources."delayed-stream-1.0.0"
- (sources."dispensary-0.59.0" // {
+ (sources."dispensary-0.61.0" // {
dependencies = [
sources."async-3.2.0"
- sources."yargs-16.1.1"
+ sources."pino-6.9.0"
];
})
sources."doctrine-3.0.0"
- sources."dom-serializer-0.1.1"
- sources."domelementtype-1.3.1"
- sources."domhandler-2.4.2"
- sources."domutils-1.5.1"
+ sources."dom-serializer-1.2.0"
+ sources."domelementtype-2.1.0"
+ sources."domhandler-4.0.0"
+ sources."domutils-2.5.0"
sources."dot-prop-5.3.0"
sources."dtrace-provider-0.8.8"
sources."duplexer3-0.1.4"
@@ -109760,15 +109936,14 @@ in
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."enquirer-2.3.6"
- sources."entities-1.1.2"
+ sources."entities-2.1.0"
sources."error-ex-1.3.2"
sources."es6-error-4.1.1"
- sources."es6-promise-2.3.0"
sources."es6-promisify-6.1.1"
sources."escalade-3.1.1"
sources."escape-goat-2.1.1"
sources."escape-string-regexp-1.0.5"
- (sources."eslint-7.14.0" // {
+ (sources."eslint-7.21.0" // {
dependencies = [
sources."ansi-regex-5.0.0"
sources."debug-4.3.2"
@@ -109784,7 +109959,7 @@ in
];
})
sources."eslint-visitor-keys-2.0.0"
- (sources."espree-7.3.0" // {
+ (sources."espree-7.3.1" // {
dependencies = [
sources."eslint-visitor-keys-1.3.0"
];
@@ -109805,36 +109980,7 @@ in
sources."event-to-promise-0.8.0"
sources."execa-4.1.0"
sources."exit-on-epipe-1.0.1"
- (sources."expand-brackets-2.1.4" // {
- dependencies = [
- sources."define-property-0.2.5"
- sources."extend-shallow-2.0.1"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- ];
- })
sources."extend-3.0.2"
- (sources."extend-shallow-3.0.2" // {
- dependencies = [
- sources."is-extendable-1.0.1"
- ];
- })
- (sources."extglob-2.0.4" // {
- dependencies = [
- sources."define-property-1.0.0"
- sources."extend-shallow-2.0.1"
- ];
- })
sources."extsprintf-1.3.0"
sources."fast-deep-equal-3.1.3"
(sources."fast-json-patch-2.2.1" // {
@@ -109847,38 +109993,28 @@ in
sources."fast-redact-3.0.0"
sources."fast-safe-stringify-2.0.7"
sources."fd-slicer-1.1.0"
- sources."file-entry-cache-5.0.1"
- sources."file-uri-to-path-1.0.0"
- sources."fill-range-7.0.1"
- sources."find-up-4.1.0"
- (sources."firefox-profile-4.0.0" // {
+ sources."file-entry-cache-6.0.1"
+ (sources."firefox-profile-4.1.0" // {
dependencies = [
- sources."async-2.5.0"
- sources."fs-extra-4.0.3"
+ sources."fs-extra-9.0.1"
+ sources."uuid-8.3.2"
];
})
sources."first-chunk-stream-3.0.0"
- sources."flat-cache-2.0.1"
+ sources."flat-cache-3.0.4"
sources."flatstr-1.0.12"
- sources."flatted-2.0.2"
+ sources."flatted-3.1.1"
sources."fluent-syntax-0.13.0"
- sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
- sources."fragment-cache-0.2.1"
sources."fs-constants-1.0.0"
- (sources."fs-extra-9.0.1" // {
+ (sources."fs-extra-9.1.0" // {
dependencies = [
- (sources."jsonfile-6.1.0" // {
- dependencies = [
- sources."universalify-2.0.0"
- ];
- })
- sources."universalify-1.0.0"
+ sources."universalify-2.0.0"
];
})
sources."fs.realpath-1.0.0"
- sources."fsevents-2.2.1"
+ sources."fsevents-2.3.2"
sources."function-bind-1.1.1"
sources."functional-red-black-tree-1.0.1"
(sources."fx-runner-1.0.13" // {
@@ -109891,15 +110027,11 @@ in
sources."get-caller-file-2.0.5"
sources."get-intrinsic-1.1.1"
sources."get-stream-5.2.0"
- sources."get-value-2.0.6"
sources."getpass-0.1.7"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- (sources."global-dirs-2.1.0" // {
- dependencies = [
- sources."ini-1.3.7"
- ];
- })
+ sources."glob-to-regexp-0.4.1"
+ sources."global-dirs-3.0.0"
sources."globals-12.4.0"
(sources."got-9.6.0" // {
dependencies = [
@@ -109914,79 +110046,62 @@ in
sources."has-1.0.3"
sources."has-flag-4.0.0"
sources."has-symbols-1.0.2"
- sources."has-value-1.0.0"
- (sources."has-values-1.0.0" // {
- dependencies = [
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."kind-of-4.0.0"
- ];
- })
sources."has-yarn-2.1.0"
- sources."htmlparser2-3.10.1"
+ sources."htmlparser2-6.0.1"
sources."http-cache-semantics-4.1.0"
sources."http-signature-1.2.0"
sources."human-signals-1.1.1"
+ sources."iconv-lite-0.4.24"
sources."ieee754-1.2.1"
sources."ignore-4.0.6"
+ sources."immediate-3.0.6"
sources."import-fresh-3.3.0"
sources."import-lazy-2.1.0"
sources."imurmurhash-0.1.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
- sources."ini-1.3.8"
+ sources."ini-2.0.0"
sources."invert-kv-3.0.1"
sources."is-absolute-0.1.7"
- sources."is-accessor-descriptor-1.0.0"
sources."is-arguments-1.1.0"
sources."is-arrayish-0.2.1"
- sources."is-binary-path-2.1.0"
- sources."is-buffer-1.1.6"
sources."is-ci-2.0.0"
- sources."is-data-descriptor-1.0.0"
sources."is-date-object-1.0.2"
- sources."is-descriptor-1.0.2"
sources."is-docker-2.1.1"
- sources."is-extendable-0.1.1"
sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-3.0.0"
sources."is-glob-4.0.1"
- sources."is-installed-globally-0.3.2"
+ sources."is-installed-globally-0.4.0"
sources."is-mergeable-object-1.1.1"
sources."is-npm-5.0.0"
- sources."is-number-7.0.0"
sources."is-obj-2.0.0"
sources."is-path-inside-3.0.3"
- sources."is-plain-object-2.0.4"
sources."is-regex-1.1.2"
sources."is-relative-0.1.3"
sources."is-stream-2.0.0"
sources."is-typedarray-1.0.0"
sources."is-utf8-0.2.1"
- sources."is-windows-1.0.2"
sources."is-wsl-2.2.0"
sources."is-yarn-global-0.3.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
- sources."isobject-3.0.1"
sources."isstream-0.1.2"
sources."jed-1.1.1"
- sources."jetpack-id-1.0.0"
- sources."js-select-0.6.0"
sources."js-tokens-4.0.0"
sources."js-yaml-3.14.1"
sources."jsbn-0.1.1"
sources."json-buffer-3.0.0"
sources."json-merge-patch-0.2.3"
- sources."json-parse-better-errors-1.0.2"
+ sources."json-parse-even-better-errors-2.3.1"
sources."json-schema-0.2.3"
sources."json-schema-traverse-0.4.1"
sources."json-stable-stringify-without-jsonify-1.0.1"
sources."json-stringify-safe-5.0.1"
- sources."jsonfile-4.0.0"
+ (sources."jsonfile-6.1.0" // {
+ dependencies = [
+ sources."universalify-2.0.0"
+ ];
+ })
sources."jsonify-0.0.0"
(sources."jsonwebtoken-8.5.1" // {
dependencies = [
@@ -109995,24 +110110,27 @@ in
];
})
sources."jsprim-1.4.1"
- sources."jszip-2.6.1"
+ (sources."jszip-3.6.0" // {
+ dependencies = [
+ sources."readable-stream-2.3.7"
+ sources."safe-buffer-5.1.2"
+ ];
+ })
sources."jwa-1.4.1"
sources."jws-3.2.2"
sources."keyv-3.1.0"
- sources."kind-of-6.0.3"
sources."latest-version-5.1.0"
(sources."lazystream-1.0.0" // {
dependencies = [
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
- sources."string_decoder-1.1.1"
];
})
sources."lcid-3.1.1"
sources."levn-0.4.1"
+ sources."lie-3.3.0"
sources."lighthouse-logger-1.2.0"
sources."lines-and-columns-1.1.6"
- sources."locate-path-5.0.0"
sources."lodash-4.17.21"
sources."lodash.defaults-4.2.0"
sources."lodash.difference-4.5.0"
@@ -110024,55 +110142,28 @@ in
sources."lodash.isplainobject-4.0.6"
sources."lodash.isstring-4.0.1"
sources."lodash.once-4.1.1"
- sources."lodash.sortby-4.7.0"
sources."lodash.union-4.6.0"
sources."lowercase-keys-1.0.1"
+ sources."lru-cache-6.0.0"
(sources."make-dir-3.1.0" // {
dependencies = [
sources."semver-6.3.0"
];
})
sources."map-age-cleaner-0.1.3"
- sources."map-cache-0.2.2"
- sources."map-visit-1.0.0"
sources."marky-1.2.1"
sources."mem-5.1.1"
sources."merge-stream-2.0.0"
- (sources."micromatch-3.1.10" // {
- dependencies = [
- (sources."braces-2.3.2" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- (sources."fill-range-4.0.0" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."to-regex-range-2.1.1"
- ];
- })
sources."mime-db-1.46.0"
sources."mime-types-2.1.29"
sources."mimic-fn-2.1.0"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
- (sources."mixin-deep-1.3.2" // {
- dependencies = [
- sources."is-extendable-1.0.1"
- ];
- })
sources."mkdirp-1.0.4"
sources."moment-2.29.1"
sources."ms-2.0.0"
- sources."multimatch-4.0.0"
+ sources."multimatch-5.0.0"
(sources."mv-2.1.1" // {
dependencies = [
sources."glob-6.0.4"
@@ -110082,15 +110173,18 @@ in
})
sources."mz-2.7.0"
sources."nan-2.14.2"
- sources."nanoid-3.1.20"
- sources."nanomatch-1.2.13"
+ sources."nanoid-3.1.22"
sources."natural-compare-1.4.0"
sources."natural-compare-lite-1.4.0"
sources."ncp-2.0.0"
- sources."neo-async-2.6.2"
- sources."next-tick-1.1.0"
+ (sources."needle-2.6.0" // {
+ dependencies = [
+ sources."debug-3.2.7"
+ sources."ms-2.1.3"
+ ];
+ })
sources."node-forge-0.10.0"
- (sources."node-notifier-8.0.1" // {
+ (sources."node-notifier-9.0.0" // {
dependencies = [
sources."uuid-8.3.2"
];
@@ -110098,38 +110192,20 @@ in
sources."normalize-path-3.0.0"
sources."normalize-url-4.5.0"
sources."npm-run-path-4.0.1"
- sources."nth-check-1.0.2"
+ sources."nth-check-2.0.0"
sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
- (sources."object-copy-0.1.0" // {
- dependencies = [
- sources."define-property-0.2.5"
- sources."is-accessor-descriptor-0.1.6"
- sources."is-data-descriptor-0.1.4"
- (sources."is-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-5.1.0"
- ];
- })
- sources."kind-of-3.2.2"
- ];
- })
sources."object-is-1.1.5"
sources."object-keys-1.1.1"
- sources."object-visit-1.0.1"
- sources."object.pick-1.3.0"
sources."once-1.4.0"
sources."onetime-5.1.2"
- sources."open-7.3.0"
+ sources."open-7.4.2"
sources."optionator-0.9.1"
sources."os-locale-5.0.0"
sources."os-shim-0.1.3"
sources."p-cancelable-1.1.0"
sources."p-defer-1.0.0"
sources."p-is-promise-2.1.0"
- sources."p-limit-2.3.0"
- sources."p-locate-4.1.0"
- sources."p-try-2.2.0"
(sources."package-json-6.5.0" // {
dependencies = [
sources."semver-6.3.0"
@@ -110137,24 +110213,24 @@ in
})
sources."pako-1.0.11"
sources."parent-module-1.0.1"
- sources."parse-json-5.0.1"
- sources."parse5-3.0.3"
- sources."pascalcase-0.1.1"
- sources."path-dirname-1.0.2"
- sources."path-exists-4.0.0"
+ sources."parse-json-5.2.0"
+ sources."parse5-6.0.1"
+ sources."parse5-htmlparser2-tree-adapter-6.0.1"
sources."path-is-absolute-1.0.1"
sources."path-key-3.1.1"
sources."pend-1.2.0"
sources."performance-now-2.1.0"
- sources."picomatch-2.2.2"
- sources."pino-6.7.0"
+ (sources."pino-6.11.1" // {
+ dependencies = [
+ sources."pino-std-serializers-3.2.0"
+ ];
+ })
sources."pino-std-serializers-2.5.0"
- sources."posix-character-classes-0.1.1"
- sources."postcss-8.1.10"
+ sources."postcss-8.2.7"
sources."prelude-ls-1.2.1"
sources."prepend-http-2.0.0"
sources."printj-1.1.2"
- sources."probe-image-size-5.0.0"
+ sources."probe-image-size-6.0.0"
sources."process-nextick-args-2.0.1"
sources."progress-2.0.3"
sources."psl-1.8.0"
@@ -110162,17 +110238,16 @@ in
sources."punycode-2.1.1"
sources."pupa-2.1.1"
sources."qs-6.5.2"
- sources."quick-format-unescaped-4.0.1"
+ sources."quick-format-unescaped-4.0.3"
(sources."rc-1.2.8" // {
dependencies = [
+ sources."ini-1.3.8"
sources."strip-json-comments-2.0.1"
];
})
sources."readable-stream-3.6.0"
sources."readdir-glob-1.1.1"
- sources."readdirp-3.5.0"
- sources."regenerator-runtime-0.13.7"
- sources."regex-not-1.0.2"
+ sources."regenerator-runtime-0.13.8"
sources."regexp.prototype.flags-1.3.1"
sources."regexpp-3.1.0"
sources."registry-auth-token-4.2.1"
@@ -110187,109 +110262,38 @@ in
sources."supports-color-5.5.0"
];
})
- sources."remove-trailing-separator-1.1.0"
- sources."repeat-element-1.1.3"
- sources."repeat-string-1.6.1"
sources."request-2.88.2"
sources."require-directory-2.1.1"
- sources."require-main-filename-2.0.0"
+ sources."require-from-string-2.0.2"
sources."resolve-from-4.0.0"
- sources."resolve-url-0.2.1"
sources."responselike-1.0.2"
- sources."ret-0.1.15"
- sources."rimraf-2.6.3"
+ sources."rimraf-3.0.2"
sources."safe-buffer-5.2.1"
sources."safe-json-stringify-1.2.0"
- sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
- sources."semver-7.3.2"
+ sources."semver-7.3.4"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
];
})
- sources."set-blocking-2.0.0"
- (sources."set-value-2.0.1" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
+ sources."set-immediate-shim-1.0.1"
sources."sha.js-2.4.11"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."shell-quote-1.6.1"
sources."shellwords-0.1.1"
- (sources."sign-addon-3.1.0" // {
- dependencies = [
- sources."core-js-3.6.5"
- ];
- })
+ sources."sign-addon-3.3.0"
sources."signal-exit-3.0.3"
- (sources."slice-ansi-2.1.0" // {
- dependencies = [
- sources."ansi-styles-3.2.1"
- sources."color-convert-1.9.3"
- sources."color-name-1.1.3"
- sources."is-fullwidth-code-point-2.0.0"
- ];
- })
- (sources."snapdragon-0.8.2" // {
- dependencies = [
- sources."define-property-0.2.5"
- sources."extend-shallow-2.0.1"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- sources."source-map-0.5.7"
- ];
- })
- (sources."snapdragon-node-2.1.1" // {
- dependencies = [
- sources."define-property-1.0.0"
- ];
- })
- (sources."snapdragon-util-3.0.1" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."sonic-boom-1.3.2"
+ sources."slice-ansi-4.0.0"
+ sources."sonic-boom-1.4.0"
sources."source-map-0.6.1"
- sources."source-map-resolve-0.5.3"
sources."source-map-support-0.5.19"
- sources."source-map-url-0.4.1"
sources."spawn-sync-1.0.15"
sources."split-0.3.3"
- sources."split-string-3.1.0"
sources."sprintf-js-1.0.3"
sources."sshpk-1.16.1"
- (sources."static-extend-0.1.2" // {
- dependencies = [
- sources."define-property-0.2.5"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- ];
- })
sources."stream-parser-0.3.1"
sources."stream-to-array-2.3.0"
sources."stream-to-promise-3.0.0"
@@ -110299,7 +110303,11 @@ in
sources."strip-ansi-6.0.0"
];
})
- sources."string_decoder-1.3.0"
+ (sources."string_decoder-1.1.1" // {
+ dependencies = [
+ sources."safe-buffer-5.1.2"
+ ];
+ })
sources."strip-ansi-3.0.1"
sources."strip-bom-4.0.0"
sources."strip-bom-buf-2.0.0"
@@ -110307,38 +110315,21 @@ in
sources."strip-final-newline-2.0.0"
sources."strip-json-comments-3.1.1"
sources."supports-color-7.2.0"
- (sources."table-5.4.6" // {
+ (sources."table-6.0.7" // {
dependencies = [
- sources."ansi-regex-4.1.0"
- sources."emoji-regex-7.0.3"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
+ sources."ajv-7.2.3"
+ sources."json-schema-traverse-1.0.0"
];
})
sources."tar-stream-2.2.0"
- sources."term-size-2.2.1"
sources."text-table-0.2.0"
sources."thenify-3.3.1"
sources."thenify-all-1.6.0"
sources."through-2.3.8"
- (sources."tmp-0.2.1" // {
- dependencies = [
- sources."rimraf-3.0.2"
- ];
- })
- (sources."to-object-path-0.3.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
+ sources."tmp-0.2.1"
sources."to-readable-stream-1.0.0"
- sources."to-regex-3.0.2"
- sources."to-regex-range-5.0.1"
sources."tosource-1.0.0"
sources."tough-cookie-2.5.0"
- sources."tr46-2.0.2"
- sources."traverse-0.4.6"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-check-0.4.0"
@@ -110346,60 +110337,20 @@ in
sources."type-fest-0.8.1"
sources."typedarray-0.0.6"
sources."typedarray-to-buffer-3.1.5"
- sources."union-value-1.0.1"
sources."unique-string-2.0.0"
- sources."universalify-0.1.2"
- (sources."unset-value-1.0.0" // {
- dependencies = [
- (sources."has-value-0.3.1" // {
- dependencies = [
- sources."isobject-2.1.0"
- ];
- })
- sources."has-values-0.1.4"
- ];
- })
+ sources."universalify-1.0.0"
sources."upath-2.0.1"
- sources."update-notifier-5.0.0"
+ sources."update-notifier-5.1.0"
sources."uri-js-4.4.1"
- sources."urix-0.1.0"
sources."url-parse-lax-3.0.0"
- sources."use-3.1.1"
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
sources."v8-compile-cache-2.3.0"
sources."verror-1.10.0"
- sources."vfile-location-3.2.0"
- sources."watchpack-1.7.5"
- (sources."watchpack-chokidar2-2.0.1" // {
- dependencies = [
- sources."anymatch-2.0.0"
- sources."binary-extensions-1.13.1"
- sources."braces-2.3.2"
- sources."chokidar-2.1.8"
- sources."extend-shallow-2.0.1"
- sources."fill-range-4.0.0"
- sources."fsevents-1.2.13"
- sources."glob-parent-3.1.0"
- sources."is-binary-path-1.0.1"
- sources."is-glob-3.1.0"
- sources."is-number-3.0.0"
- sources."kind-of-3.2.2"
- sources."normalize-path-2.1.1"
- sources."readable-stream-2.3.7"
- sources."readdirp-2.2.1"
- sources."safe-buffer-5.1.2"
- sources."string_decoder-1.1.1"
- sources."to-regex-range-2.1.1"
- sources."upath-1.2.0"
- ];
- })
+ sources."watchpack-2.1.1"
sources."wcwidth-1.0.1"
- sources."webidl-conversions-6.1.0"
- sources."whatwg-url-8.4.0"
sources."when-3.7.7"
sources."which-2.0.2"
- sources."which-module-2.0.0"
sources."widest-line-3.1.0"
sources."winreg-0.0.12"
sources."word-wrap-1.2.3"
@@ -110410,34 +110361,19 @@ in
];
})
sources."wrappy-1.0.2"
- (sources."write-1.0.3" // {
- dependencies = [
- sources."mkdirp-0.5.5"
- ];
- })
sources."write-file-atomic-3.0.3"
- sources."ws-7.4.2"
+ sources."ws-7.4.3"
sources."xdg-basedir-4.0.0"
sources."xml2js-0.4.23"
sources."xmlbuilder-11.0.1"
sources."y18n-5.0.5"
- (sources."yargs-15.4.1" // {
- dependencies = [
- sources."ansi-regex-5.0.0"
- sources."camelcase-5.3.1"
- sources."cliui-6.0.0"
- sources."decamelize-1.2.0"
- sources."strip-ansi-6.0.0"
- sources."wrap-ansi-6.2.0"
- sources."y18n-4.0.1"
- sources."yargs-parser-18.1.3"
- ];
- })
- sources."yargs-parser-20.2.6"
+ sources."yallist-4.0.0"
+ sources."yargs-16.2.0"
+ sources."yargs-parser-20.2.7"
sources."yauzl-2.10.0"
- (sources."zip-dir-1.0.2" // {
+ (sources."zip-dir-2.0.0" // {
dependencies = [
- sources."async-1.5.2"
+ sources."async-3.2.0"
];
})
sources."zip-stream-4.1.0"
@@ -110455,17 +110391,17 @@ in
webpack = nodeEnv.buildNodePackage {
name = "webpack";
packageName = "webpack";
- version = "5.24.4";
+ version = "5.28.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack/-/webpack-5.24.4.tgz";
- sha512 = "RXOdxF9hFFFhg47BryCgyFrEyyu7Y/75/uiI2DoUiTMqysK+WczVSTppvkR47oZcmI/DPaXCiCiaXBP8QjkNpA==";
+ url = "https://registry.npmjs.org/webpack/-/webpack-5.28.0.tgz";
+ sha512 = "1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg==";
};
dependencies = [
sources."@types/eslint-7.2.7"
sources."@types/eslint-scope-3.7.0"
sources."@types/estree-0.0.46"
sources."@types/json-schema-7.0.7"
- sources."@types/node-14.14.32"
+ sources."@types/node-14.14.35"
sources."@webassemblyjs/ast-1.11.0"
sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
sources."@webassemblyjs/helper-api-error-1.11.0"
@@ -110483,16 +110419,16 @@ in
sources."@webassemblyjs/wast-printer-1.11.0"
sources."@xtuc/ieee754-1.2.0"
sources."@xtuc/long-4.2.2"
- sources."acorn-8.0.5"
+ sources."acorn-8.1.0"
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
sources."browserslist-4.16.3"
sources."buffer-from-1.1.1"
- sources."caniuse-lite-1.0.30001197"
+ sources."caniuse-lite-1.0.30001204"
sources."chrome-trace-event-1.0.2"
sources."colorette-1.2.2"
sources."commander-2.20.3"
- sources."electron-to-chromium-1.3.682"
+ sources."electron-to-chromium-1.3.699"
sources."enhanced-resolve-5.7.0"
sources."es-module-lexer-0.4.1"
sources."escalade-3.1.1"
@@ -110529,7 +110465,7 @@ in
sources."source-map-support-0.5.19"
sources."supports-color-7.2.0"
sources."tapable-2.2.0"
- (sources."terser-5.6.0" // {
+ (sources."terser-5.6.1" // {
dependencies = [
sources."source-map-0.7.3"
];
@@ -110567,7 +110503,7 @@ in
sources."ansi-colors-4.1.1"
sources."clone-deep-4.0.1"
sources."colorette-1.2.2"
- sources."commander-7.1.0"
+ sources."commander-7.2.0"
sources."cross-spawn-7.0.3"
sources."enquirer-2.3.6"
sources."envinfo-7.7.4"
@@ -110632,8 +110568,8 @@ in
};
dependencies = [
sources."@types/glob-7.1.3"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.32"
+ sources."@types/minimatch-3.0.4"
+ sources."@types/node-14.14.35"
sources."accepts-1.3.7"
sources."ajv-6.12.6"
sources."ajv-errors-1.0.1"
@@ -110753,7 +110689,7 @@ in
sources."del-4.1.1"
sources."depd-1.1.2"
sources."destroy-1.0.4"
- sources."detect-node-2.0.4"
+ sources."detect-node-2.0.5"
sources."dns-equal-1.0.0"
sources."dns-packet-1.3.1"
sources."dns-txt-2.0.2"
@@ -110765,7 +110701,7 @@ in
sources."escape-html-1.0.3"
sources."etag-1.8.1"
sources."eventemitter3-4.0.7"
- sources."eventsource-1.0.7"
+ sources."eventsource-1.1.0"
sources."execa-1.0.0"
(sources."expand-brackets-2.1.4" // {
dependencies = [
@@ -111206,10 +111142,10 @@ in
copy-webpack-plugin = nodeEnv.buildNodePackage {
name = "copy-webpack-plugin";
packageName = "copy-webpack-plugin";
- version = "8.0.0";
+ version = "8.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.0.0.tgz";
- sha512 = "sqGe2FsB67wV/De+sz5azQklADe4thN016od6m7iK9KbjrSc1SEgg5QZ0LN+jGx5aZR52CbuXbqOhoIbqzzXlA==";
+ url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.1.0.tgz";
+ sha512 = "Soiq8kXI2AZkpw3dSp18u6oU2JonC7UKv3UdXsKOmT1A5QT46ku9+6c0Qy29JDbSavQJNN1/eKGpd3QNw+cZWg==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.4"
@@ -111227,7 +111163,7 @@ in
sources."fastq-1.11.0"
sources."fill-range-7.0.1"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."ignore-5.1.8"
sources."is-extglob-2.1.1"
sources."is-glob-4.0.1"
@@ -111240,7 +111176,7 @@ in
sources."path-type-4.0.0"
sources."picomatch-2.2.2"
sources."punycode-2.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."randombytes-2.1.0"
sources."reusify-1.0.4"
sources."run-parallel-1.2.0"
@@ -111282,7 +111218,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.45"
+ sources."@types/node-13.13.47"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.3.0"
sources."balanced-match-1.0.0"
@@ -111347,7 +111283,7 @@ in
sources."mime-1.6.0"
];
})
- sources."chunk-store-stream-4.2.0"
+ sources."chunk-store-stream-4.3.0"
sources."clivas-0.2.0"
sources."common-tags-1.8.0"
sources."compact2string-1.4.1"
@@ -111360,6 +111296,7 @@ in
];
})
sources."core-util-is-1.0.2"
+ sources."cpus-1.0.3"
sources."create-torrent-4.5.0"
sources."debug-2.6.9"
sources."decompress-response-3.3.0"
@@ -111469,7 +111406,7 @@ in
sources."protobufjs-6.10.2"
sources."pump-3.0.0"
sources."qap-3.3.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-iterate-1.0.1"
@@ -111494,7 +111431,7 @@ in
sources."semver-5.1.1"
sources."simple-concat-1.0.1"
sources."simple-get-2.8.1"
- (sources."simple-peer-9.9.3" // {
+ (sources."simple-peer-9.10.0" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
@@ -111550,7 +111487,7 @@ in
sources."utp-native-2.3.0"
sources."videostream-3.2.2"
sources."vlc-command-1.2.0"
- (sources."webtorrent-0.115.2" // {
+ (sources."webtorrent-0.116.0" // {
dependencies = [
sources."debug-4.3.2"
sources."decompress-response-6.0.0"
@@ -111700,14 +111637,14 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.13.8"
- sources."@babel/runtime-7.13.9"
+ sources."@babel/highlight-7.13.10"
+ sources."@babel/runtime-7.13.10"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@sindresorhus/is-0.7.0"
sources."@types/glob-7.1.3"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.32"
+ sources."@types/minimatch-3.0.4"
+ sources."@types/node-14.14.35"
sources."@types/normalize-package-data-2.4.0"
sources."JSONStream-1.3.5"
sources."aggregate-error-3.1.0"
@@ -111800,7 +111737,7 @@ in
sources."cli-boxes-1.0.0"
sources."cli-cursor-2.1.0"
sources."cli-list-0.2.0"
- sources."cli-table-0.3.5"
+ sources."cli-table-0.3.6"
sources."cli-width-2.2.1"
sources."clone-2.1.2"
sources."clone-buffer-1.0.0"
@@ -111848,7 +111785,7 @@ in
sources."define-property-2.0.2"
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
- sources."detect-node-2.0.4"
+ sources."detect-node-2.0.5"
sources."diff-3.5.0"
(sources."dir-glob-2.0.0" // {
dependencies = [
@@ -111958,7 +111895,7 @@ in
sources."glob-to-regexp-0.3.0"
(sources."global-agent-2.1.12" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."global-dirs-0.1.1"
@@ -112208,7 +112145,7 @@ in
sources."os-shim-0.1.3"
sources."os-tmpdir-1.0.2"
sources."p-any-2.1.0"
- sources."p-cancelable-2.0.0"
+ sources."p-cancelable-2.1.0"
sources."p-defer-1.0.0"
sources."p-finally-1.0.0"
sources."p-is-promise-2.1.0"
@@ -112283,7 +112220,7 @@ in
sources."indent-string-2.1.0"
];
})
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regex-not-1.0.2"
sources."registry-auth-token-3.4.0"
sources."registry-url-3.1.0"
@@ -112546,7 +112483,7 @@ in
sources."yeoman-doctor-4.0.0"
(sources."yeoman-environment-2.10.3" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."cli-cursor-3.1.0"
@@ -112573,7 +112510,7 @@ in
sources."onetime-5.1.2"
sources."path-key-3.1.1"
sources."restore-cursor-3.1.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
(sources."string-width-4.2.2" // {
@@ -112587,7 +112524,7 @@ in
];
})
sources."supports-color-7.2.0"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."which-2.0.2"
];
})
@@ -112625,7 +112562,7 @@ in
sources."pify-4.0.1"
sources."read-pkg-5.2.0"
sources."read-pkg-up-5.0.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."slash-2.0.0"
sources."type-fest-0.6.0"
];
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index 583017d9ddec..12ed4ae787da 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "bitstring";
- version = "4.0.1";
+ version = "4.1.0";
useDune2 = true;
@@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "xguerin";
repo = pname;
rev = "v${version}";
- sha256 = "1z7jmgljvp52lvn3ml2cp6gssxqp4sikwyjf6ym97cycbcw0fjjm";
+ sha256 = "0mghsl8b2zd2676mh1r9142hymhvzy9cw8kgkjmirxkn56wbf56b";
};
propagatedBuildInputs = [ stdlib-shims ];
diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix
index ee0a8c51f732..4d391d3458dc 100644
--- a/pkgs/development/ocaml-modules/bitstring/ppx.nix
+++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix
@@ -3,6 +3,10 @@
, ounit
}:
+if !lib.versionAtLeast ppxlib.version "0.18.0"
+then throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}"
+else
+
buildDunePackage rec {
pname = "ppx_bitstring";
inherit (bitstring) version useDune2 src;
diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix
index 5bf7be4e7795..31b864e29d32 100644
--- a/pkgs/development/ocaml-modules/carton/default.nix
+++ b/pkgs/development/ocaml-modules/carton/default.nix
@@ -2,19 +2,19 @@
, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims
, bigarray-compat, checkseum, logs, psq, fmt
, result, rresult, fpath, base64, bos, digestif, mmap, alcotest
-, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner
+, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd
}:
buildDunePackage rec {
pname = "carton";
- version = "0.2.0";
+ version = "0.4.0";
useDune2 = true;
minimumOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
- sha256 = "0gfns4a9p9540kijccsg52yzyn3jfvi737mb0g71yazyc89dqwhn";
+ sha256 = "777f9692b83cd63570c17527a32c5045818ab9242d923cbbde72fc23d0da0140";
};
# remove changelogs for mimic and the git* packages
@@ -30,6 +30,7 @@ buildDunePackage rec {
rresult
fpath
bos
+ hxd
];
propagatedBuildInputs = [
ke
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index e664d17f215e..1cbc43bc2804 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,11 +1,12 @@
{ lib, fetchurl, buildDunePackage
, ppx_fields_conv, ppx_sexp_conv, stdlib-shims
, base64, fieldslib, jsonm, re, stringext, uri-sexp
+, ocaml, fmt, alcotest
}:
buildDunePackage rec {
pname = "cohttp";
- version = "2.5.4";
+ version = "2.5.5";
useDune2 = true;
@@ -13,13 +14,16 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
- sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a";
+ sha256 = "0ywmql4lp6ps2gd064ixbjzsdnnn5vk3pipm005sswl553qqwaim";
};
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
+ doCheck = lib.versionAtLeast ocaml.version "4.05";
+ checkInputs = [ fmt alcotest ];
+
meta = {
description = "HTTP(S) library for Lwt, Async and Mirage";
license = lib.licenses.isc;
diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix
index 26c064d6ff51..4bb83019dc5c 100644
--- a/pkgs/development/ocaml-modules/csexp/default.nix
+++ b/pkgs/development/ocaml-modules/csexp/default.nix
@@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "csexp";
- version = "1.3.2";
+ version = "1.4.0";
useDune2 = true;
@@ -10,7 +10,7 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz";
- sha256 = "0jhwrxfjb0x31xj4g4b89fzw34sq19j0rq2hs2zyh1vz4xxl47zj";
+ sha256 = "sha256-jj1vyofxAqEm3ui3KioNFG8QQ5xHIY38FJ1Rvz7fNk4=";
};
propagatedBuildInputs = [ result ];
diff --git a/pkgs/development/ocaml-modules/decompress/1.2.nix b/pkgs/development/ocaml-modules/decompress/1.2.nix
new file mode 100644
index 000000000000..e81202ea58fd
--- /dev/null
+++ b/pkgs/development/ocaml-modules/decompress/1.2.nix
@@ -0,0 +1,28 @@
+{ lib, fetchurl, buildDunePackage
+, checkseum, bigarray-compat, optint
+}:
+
+buildDunePackage rec {
+ version = "1.2.0";
+ pname = "decompress";
+
+ minimumOCamlVersion = "4.07";
+
+ useDune2 = true;
+
+ src = fetchurl {
+ url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
+ sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
+ };
+
+ propagatedBuildInputs = [ optint bigarray-compat checkseum ];
+ # required hxd version is not available in nixpkgs
+ doCheck = false;
+
+ meta = {
+ description = "Pure OCaml implementation of Zlib";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.vbgl ];
+ homepage = "https://github.com/mirage/decompress";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix
index f53e166c6628..d2cba68d732e 100644
--- a/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/pkgs/development/ocaml-modules/decompress/default.nix
@@ -1,10 +1,10 @@
{ lib, fetchurl, buildDunePackage
-, checkseum, bigarray-compat, optint
-, bigstringaf, alcotest, hxd, camlzip, base64
+, checkseum, bigarray-compat, optint, cmdliner
+, bigstringaf, alcotest, camlzip, base64, ctypes, fmt
}:
buildDunePackage rec {
- version = "1.2.0";
+ version = "1.3.0";
pname = "decompress";
minimumOCamlVersion = "4.07";
@@ -13,11 +13,12 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
- sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
+ sha256 = "de149896939be13fedec46a4581121d5ab74850a2241d08e6aa8ae4bb18c52c4";
};
+ buildInputs = [ cmdliner ];
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
- checkInputs = [ alcotest bigstringaf hxd camlzip base64 ];
+ checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];
doCheck = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/pkgs/development/ocaml-modules/duff/default.nix
index 64a32d179d5b..a57f8564d9e1 100644
--- a/pkgs/development/ocaml-modules/duff/default.nix
+++ b/pkgs/development/ocaml-modules/duff/default.nix
@@ -1,17 +1,17 @@
-{ lib, fetchurl, buildDunePackage
+{ lib, fetchurl, buildDunePackage, fetchpatch
, stdlib-shims, bigarray-compat, fmt
, alcotest, hxd, crowbar, bigstringaf
}:
buildDunePackage rec {
pname = "duff";
- version = "0.3";
+ version = "0.4";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz";
- sha256 = "1lb67yxk93ifj94p1i3swjbnj5xy8j6xzs72bwvq6cffx5xykznm";
+ sha256 = "4795e8344a2c2562e0ef6c44ab742334b5cd807637354715889741b20a461da4";
};
propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ];
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 4c845273d714..92d89afe398d 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml,
+{ stdenv, lib, fetchzip, fetchpatch, which, ocsigen_server, ocaml,
lwt_react,
opaline, ppx_deriving, findlib
+, ocaml-migrate-parsetree
, ppx_tools_versioned
, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
, js_of_ocaml-lwt
@@ -22,7 +23,17 @@ stdenv.mkDerivation rec
sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz";
};
- buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline
+ patches = [
+ # Compatibility with js_of_ocaml >= 3.9.0, remove at next release
+ (fetchpatch {
+ url = "https://github.com/ocsigen/eliom/commit/4106a4217956f7b74a8ef3f73a1e1f55e02ade45.patch";
+ sha256 = "1cgbvpljn9x6zxirxf3rdjrsdwy319ykz3qq03c36cc40hy2w13p";
+ })
+ ];
+
+ buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild
+ ocaml-migrate-parsetree
+ js_of_ocaml-ppx_deriving_json opaline
ppx_tools_versioned
];
diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix
index 95eb75ee7ca3..5924845c4f46 100644
--- a/pkgs/development/ocaml-modules/encore/default.nix
+++ b/pkgs/development/ocaml-modules/encore/default.nix
@@ -3,13 +3,13 @@
buildDunePackage rec {
pname = "encore";
- version = "0.7";
+ version = "0.8";
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz";
- sha256 = "0cwmhkj5jmk3z5y0agmkf5ygpgxynjkq2d7d50jgzmnqs7f6g7nh";
+ sha256 = "a406bc9863b04bb424692045939d6c170a2bb65a98521ae5608d25b0559344f6";
};
useDune2 = true;
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index a8b1810e51f1..5c7d36fcc08d 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,28 +1,29 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, cppo, minimal ? true }:
+{ stdenv, lib, fetchurl, ocaml, findlib, cppo
+# De facto, option minimal seems to be the default. See the README.
+, minimal ? true
+}:
-assert lib.versionAtLeast (lib.getVersion ocaml) "3.11";
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-extlib-1.7.7";
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-extlib";
+ version = "1.7.8";
src = fetchurl {
- url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.7.tar.gz";
- sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1";
+ url = "https://ygrek.org/p/release/ocaml-extlib/extlib-${version}.tar.gz";
+ sha256 = "0npq4hq3zym8nmlyji7l5cqk6drx2rkcx73d60rxqh5g8dla8p4k";
};
buildInputs = [ ocaml findlib cppo ];
createFindlibDestdir = true;
+ dontConfigure = true;
- dontConfigure = true; # Skip configure
- # De facto, option minimal=1 seems to be the default. See the README.
- buildPhase = "make ${if minimal then "minimal=1" else ""} build";
- installPhase = "make ${if minimal then "minimal=1" else ""} install";
+ makeFlags = lib.optional minimal "minimal=1";
meta = {
homepage = "https://github.com/ygrek/ocaml-extlib";
description = "Enhancements to the OCaml Standard Library modules";
- license = lib.licenses.lgpl21;
+ license = lib.licenses.lgpl21Only;
platforms = ocaml.meta.platforms or [];
+ maintainers = [ lib.maintainers.sternenseemann ];
};
}
diff --git a/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix
new file mode 100644
index 000000000000..666eb684925c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/faraday/async.nix
@@ -0,0 +1,14 @@
+{ buildDunePackage, faraday, core, async }:
+
+buildDunePackage rec {
+ pname = "faraday-async";
+ inherit (faraday) version src useDune2;
+
+ minimumOCamlVersion = "4.08";
+
+ propagatedBuildInputs = [ faraday core async ];
+
+ meta = faraday.meta // {
+ description = "Async support for Faraday";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/faraday/lwt-unix.nix b/pkgs/development/ocaml-modules/faraday/lwt-unix.nix
new file mode 100644
index 000000000000..23914de26575
--- /dev/null
+++ b/pkgs/development/ocaml-modules/faraday/lwt-unix.nix
@@ -0,0 +1,12 @@
+{ buildDunePackage, faraday, faraday-lwt, lwt }:
+
+buildDunePackage rec {
+ pname = "faraday-lwt-unix";
+ inherit (faraday) version src useDune2 minimumOCamlVersion;
+
+ propagatedBuildInputs = [ lwt faraday-lwt ];
+
+ meta = faraday.meta // {
+ description = "Lwt + Unix support for Faraday";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/faraday/lwt.nix b/pkgs/development/ocaml-modules/faraday/lwt.nix
new file mode 100644
index 000000000000..7fe7319575c5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/faraday/lwt.nix
@@ -0,0 +1,12 @@
+{ buildDunePackage, faraday, lwt }:
+
+buildDunePackage rec {
+ pname = "faraday-lwt";
+ inherit (faraday) version src useDune2 minimumOCamlVersion;
+
+ propagatedBuildInputs = [ faraday lwt ];
+
+ meta = faraday.meta // {
+ description = "Lwt support for Faraday";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index 8ef1c3627f05..b8d73178d09b 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -8,14 +8,14 @@
buildDunePackage rec {
pname = "git";
- version = "3.3.0";
+ version = "3.3.3";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
- sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0";
+ sha256 = "0j8pw9w74bfhrjsqr8zm8g7h1az94z9vg7qgc6z6649zm9yjiax3";
};
buildInputs = [
diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix
index 58ac0204b4b9..f4cea472886d 100644
--- a/pkgs/development/ocaml-modules/git/unix.nix
+++ b/pkgs/development/ocaml-modules/git/unix.nix
@@ -1,4 +1,4 @@
-{ buildDunePackage, fetchpatch, git
+{ buildDunePackage, git
, mmap, rresult, result, bigstringaf
, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
@@ -15,14 +15,6 @@ buildDunePackage {
useDune2 = true;
- patches = [
- # https://github.com/mirage/ocaml-git/pull/472
- (fetchpatch {
- url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch";
- sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my";
- })
- ];
-
buildInputs = [
awa awa-mirage cmdliner git-cohttp-unix
mirage-clock mirage-clock-unix tcpip
diff --git a/pkgs/development/ocaml-modules/graphics/default.nix b/pkgs/development/ocaml-modules/graphics/default.nix
index 6a3217431b43..10d0b4ea6fc7 100644
--- a/pkgs/development/ocaml-modules/graphics/default.nix
+++ b/pkgs/development/ocaml-modules/graphics/default.nix
@@ -3,13 +3,13 @@
buildDunePackage rec {
pname = "graphics";
- version = "5.1.0";
+ version = "5.1.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz";
- sha256 = "16z997mp0ccilaqqvmz3wp7vx0ghaf4ik9qklgd4piklcl1yv5n5";
+ sha256 = "sha256-KGyD497ZKHA2xeXHezmh3P1zoSlre1h5N9zjkAFmMo4=";
};
buildInputs = [ dune-configurator ];
diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix
index 1d677ac1a2ef..0775e21b1f8d 100644
--- a/pkgs/development/ocaml-modules/hxd/default.nix
+++ b/pkgs/development/ocaml-modules/hxd/default.nix
@@ -1,11 +1,11 @@
{ lib, buildDunePackage, fetchurl
-, dune-configurator, cmdliner, angstrom
-, rresult, stdlib-shims, fmt, fpath
+, ocaml, dune-configurator, cmdliner
+, lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07"
}:
buildDunePackage rec {
pname = "hxd";
- version = "0.2.0";
+ version = "0.3.1";
useDune2 = true;
@@ -13,24 +13,25 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
- sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l";
+ sha256 = "1c226c91e17cd329dec0c287bfd20f36302aa533069ff9c6ced32721f96b29bc";
};
+ # ignore yes stderr output due to trapped SIGPIPE
+ postPatch = ''
+ sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t
+ '';
+
nativeBuildInputs = [
dune-configurator
];
+ propagatedBuildInputs = lib.optional withLwt lwt;
+
buildInputs = [
cmdliner
- angstrom
- rresult
- fmt
- fpath
];
- propagatedBuildInputs = [
- stdlib-shims
- ];
+ doCheck = true;
meta = with lib; {
description = "Hexdump in OCaml";
diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix
index 1c9cdb1532f8..738828e83086 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix
@@ -182,7 +182,8 @@ rec {
base_quickcheck = janePackage {
pname = "base_quickcheck";
- hash = "1lmp1h68g0gqiw8m6gqcbrp0fn76nsrlsqrwxp20d7jhh0693f3j";
+ version = "0.14.1";
+ hash = "0apq3d9xb0zdaqsl4cjk5skyig57ff1plndb2mh0nn3czvfhifxs";
minimumOCamlVersion = "4.04.2";
meta.description = "Randomized testing framework, designed for compatibility with Base";
propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ];
@@ -222,7 +223,8 @@ rec {
core = janePackage {
pname = "core";
- hash = "1m9h73pk9590m8ngs1yf4xrw61maiqmi9glmlrl12qhi0wcja5f3";
+ version = "0.14.1";
+ hash = "1isrcl07nkmdm6akqsqs9z8s6zvva2lvg47kaagy7gsbyszrqb82";
meta.description = "System-independent part of Core";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ core_kernel spawn timezone ];
@@ -449,7 +451,8 @@ rec {
ppx_custom_printf = janePackage {
pname = "ppx_custom_printf";
- hash = "0p9hgx0krxqw8hlzfv2bg2m3zi5nxsnzhyp0fj5936rapad02hc5";
+ version = "0.14.1";
+ hash = "0c1m65kn27zvwmfwy7kk46ga76yw2a3ik9jygpy1b6nn6pi026w9";
minimumOCamlVersion = "4.04.2";
meta.description = "Printf-style format-strings for user-defined string conversion";
propagatedBuildInputs = [ ppx_sexp_conv ];
@@ -465,7 +468,8 @@ rec {
ppx_expect = janePackage {
pname = "ppx_expect";
- hash = "05v6jzn1nbmwk3vzxxnb3380wzg2nb28jpb3v5m5c4ikn0jrhcwn";
+ version = "0.14.1";
+ hash = "0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv";
minimumOCamlVersion = "4.04.2";
meta.description = "Cram like framework for OCaml";
propagatedBuildInputs = [ ppx_here ppx_inline_test re ];
@@ -558,7 +562,8 @@ rec {
ppx_optcomp = janePackage {
pname = "ppx_optcomp";
- hash = "1wav3zgh4244x1ll562g735cwwrzyk5jj72niq9jgz9qjlpsprlk";
+ version = "0.14.1";
+ hash = "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4";
minimumOCamlVersion = "4.04.2";
meta.description = "Optional compilation for OCaml";
propagatedBuildInputs = [ ppxlib ];
@@ -590,16 +595,17 @@ rec {
ppx_sexp_conv = janePackage {
pname = "ppx_sexp_conv";
- version = "0.14.1";
+ version = "0.14.3";
minimumOCamlVersion = "4.04.2";
- hash = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2";
+ hash = "0dbri9d00ydi0dw1cavswnqdmhjaaz80vap29ns2lr6mhhlvyjmj";
meta.description = "[@@deriving] plugin to generate S-expression conversion functions";
propagatedBuildInputs = [ ppxlib sexplib0 base ];
};
ppx_sexp_message = janePackage {
pname = "ppx_sexp_message";
- hash = "17xnq345xwfkl9ydn05ljsg37m2glh3alnspayl3fgbhmcjmav3i";
+ version = "0.14.1";
+ hash = "1lvsr0d68kakih1ll33hy6dxbjkly6lmky4q6z0h0hrcbd6z48k4";
minimumOCamlVersion = "4.04.2";
meta.description = "A ppx rewriter for easy construction of s-expressions";
propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
@@ -633,9 +639,9 @@ rec {
ppx_typerep_conv = janePackage {
pname = "ppx_typerep_conv";
- version = "0.14.1";
+ version = "0.14.2";
minimumOCamlVersion = "4.04.2";
- hash = "1r0z7qlcpaicas5hkymy2q0gi207814wlay4hys7pl5asd59wcdh";
+ hash = "0yk9vkpnwr8labgfncqdi4rfkj88d8mb3cr8m4gdqpi3f2r27hf0";
meta.description = "Generation of runtime types from type declarations";
propagatedBuildInputs = [ ppxlib typerep ];
};
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index 65ea4d4b82ec..3ee09b2d51c9 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -56,6 +56,10 @@ let param =
version = "8.06.9";
sha256 = "1k42k3bjkf22gk39lwwzqzfhgjyhxnclslldrzpg5qy1829pbnc0";
};
+ "4.12" = mkNewParam {
+ version = "8.06.10";
+ sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a";
+ };
}.${builtins.substring 0 4 ocaml.version};
in
diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix
index e5c7937b27a4..035d612cfe27 100644
--- a/pkgs/development/ocaml-modules/lru/default.nix
+++ b/pkgs/development/ocaml-modules/lru/default.nix
@@ -1,9 +1,11 @@
-{ lib, fetchurl, buildDunePackage, psq }:
+{ lib, fetchurl, buildDunePackage, ocaml, psq, qcheck-alcotest }:
buildDunePackage rec {
pname = "lru";
version = "0.3.0";
+ useDune2 = true;
+
src = fetchurl {
url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-v${version}.tbz";
sha256 = "1ab9rd7cq15ml8x0wjl44wy99h5z7x4g9vkkz4i2d7n84ghy7vw4";
@@ -11,6 +13,9 @@ buildDunePackage rec {
propagatedBuildInputs = [ psq ];
+ doCheck = lib.versionAtLeast ocaml.version "4.05";
+ checkInputs = [ qcheck-alcotest ];
+
meta = {
homepage = "https://github.com/pqwy/lru";
description = "Scalable LRU caches for OCaml";
diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix
new file mode 100644
index 000000000000..6ad5ce5d4879
--- /dev/null
+++ b/pkgs/development/ocaml-modules/luv/default.nix
@@ -0,0 +1,35 @@
+{ lib, buildDunePackage, fetchurl
+, ctypes, result
+, alcotest
+, file
+}:
+
+buildDunePackage rec {
+ pname = "luv";
+ version = "0.5.7";
+ useDune2 = true;
+
+ src = fetchurl {
+ url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
+ sha256 = "0wjnw5riydnzsk1xdzljlpzdnjwpa0j597y6x6ma4990mqj54260";
+ };
+
+ postConfigure = ''
+ for f in src/c/vendor/configure/{ltmain.sh,configure}; do
+ substituteInPlace "$f" --replace /usr/bin/file file
+ done
+ '';
+
+ nativeBuildInputs = [ file ];
+ propagatedBuildInputs = [ ctypes result ];
+ checkInputs = [ alcotest ];
+ doCheck = true;
+
+ meta = with lib; {
+ homepage = "https://github.com/aantron/luv";
+ description = "Binding to libuv: cross-platform asynchronous I/O";
+ # MIT-licensed, extra licenses apply partially to libuv vendor
+ license = with licenses; [ mit bsd2 bsd3 cc-by-sa-40 ];
+ maintainers = with maintainers; [ locallycompact sternenseemann ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix
index 87fd72b7567a..5ba6cb08cc66 100644
--- a/pkgs/development/ocaml-modules/npy/default.nix
+++ b/pkgs/development/ocaml-modules/npy/default.nix
@@ -2,15 +2,17 @@
buildDunePackage rec {
pname = "npy";
- version = "unstable-2019-04-02";
+ version = "0.0.9";
+
+ useDune2 = true;
minimumOCamlVersion = "4.06";
src = fetchFromGitHub {
owner = "LaurentMazare";
repo = "${pname}-ocaml";
- rev = "c051086bfea6bee58208098bcf1c2f725a80a1fb";
- sha256 = "06mgrnm7xiw2lhqvbdv2zmd65sqfdnjd7j4qmcswanmplm17yhvb";
+ rev = version;
+ sha256 = "1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1";
};
propagatedBuildInputs = [ camlzip ];
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 49c8fe5470b6..7d2960fc5a66 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
patches = [ ./META.patch ];
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ ocaml automake gnum4 autoconf unzip
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ ocaml automake gnum4 autoconf
findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch b/pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch
new file mode 100644
index 000000000000..25a7b92f01fc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch
@@ -0,0 +1,49 @@
+commit b273c9f7ab10475787db4d6e09bd4b71b374d0ec
+Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
+Date: Thu Mar 18 01:28:46 2021 +0100
+
+ Let user specify solo5-binding to use
+
+ This is a little feature for the configure script I wanted to have for
+ the NixOS package: It allows the user to set PKG_CONFIG_DEPS before
+ running configure.sh to disable the autodetection mechanism. This is
+ useful for NixOS as we have all bindings bundled in the solo5 package,
+ so the result would also be solo5-bindings-xen. Additionally, it allows
+ us to do the binding selection declaratively and minimize the risk of
+ accidentally switching backend.
+
+ PKG_CONFIG_DEPS seems like a bit of an unappropriate variable name for a
+ user “interface”, let me know if you want a dedicated environment
+ variable for this in case there will be more PKG_CONFIG_DEPS.
+
+diff --git a/configure.sh b/configure.sh
+index c254f7b..c675a02 100755
+--- a/configure.sh
++++ b/configure.sh
+@@ -11,13 +11,19 @@ if pkg_exists solo5-bindings-hvt solo5-bindings-spt solo5-bindings-virtio solo5-
+ echo "ERROR: Only one of solo5-bindings-hvt, solo5-bindings-spt, solo5-bindings-virtio, solo5-bindings-muen, solo5-bindings-genode, solo5-bindings-xen can be installed." 1>&2
+ exit 1
+ fi
+-PKG_CONFIG_DEPS=
+-pkg_exists solo5-bindings-hvt && PKG_CONFIG_DEPS=solo5-bindings-hvt
+-pkg_exists solo5-bindings-spt && PKG_CONFIG_DEPS=solo5-bindings-spt
+-pkg_exists solo5-bindings-muen && PKG_CONFIG_DEPS=solo5-bindings-muen
+-pkg_exists solo5-bindings-virtio && PKG_CONFIG_DEPS=solo5-bindings-virtio
+-pkg_exists solo5-bindings-genode && PKG_CONFIG_DEPS=solo5-bindings-genode
+-pkg_exists solo5-bindings-xen && PKG_CONFIG_DEPS=solo5-bindings-xen
++if [ -z "${PKG_CONFIG_DEPS}" ]; then
++ PKG_CONFIG_DEPS=
++ pkg_exists solo5-bindings-hvt && PKG_CONFIG_DEPS=solo5-bindings-hvt
++ pkg_exists solo5-bindings-spt && PKG_CONFIG_DEPS=solo5-bindings-spt
++ pkg_exists solo5-bindings-muen && PKG_CONFIG_DEPS=solo5-bindings-muen
++ pkg_exists solo5-bindings-virtio && PKG_CONFIG_DEPS=solo5-bindings-virtio
++ pkg_exists solo5-bindings-genode && PKG_CONFIG_DEPS=solo5-bindings-genode
++ pkg_exists solo5-bindings-xen && PKG_CONFIG_DEPS=solo5-bindings-xen
++else
++ pkg_exists "${PKG_CONFIG_DEPS}" \
++ || (echo "ERROR: ${PKG_CONFIG_DEPS} is not installed" 1>&2; exit 1) \
++ || exit 1
++fi
+ if [ -z "${PKG_CONFIG_DEPS}" ]; then
+ echo "ERROR: No supported Solo5 bindings package found." 1>&2
+ echo "ERROR: solo5-bindings-hvt, solo5-bindings-spt, solo5-bindings-virtio, solo5-bindings-muen, solo5-bindings-genode or solo5-bindings-xen must be installed." 1>&2
diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
new file mode 100644
index 000000000000..a777b7b22b93
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
@@ -0,0 +1,87 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, ocaml
+, pkg-config
+, solo5
+, target ? "xen"
+}:
+
+# note: this is not technically an ocaml-module,
+# but can be built with different compilers, so
+# the ocamlPackages set is very useful.
+
+let
+ pname = "ocaml-freestanding";
+in
+
+if lib.versionOlder ocaml.version "4.08"
+then builtins.throw "${pname} is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+ name = "ocaml${ocaml.version}-${pname}-${version}";
+ inherit pname;
+ version = "0.6.4";
+
+ src = fetchFromGitHub {
+ owner = "mirage";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0w3x2wfd04qr6mci4cp1gfqw33yysp8gamgkpgbgwslr0skryiq5";
+ };
+
+ postUnpack = ''
+ # get ocaml-src from the ocaml drv instead of via ocamlfind
+ mkdir -p "${src.name}/ocaml"
+ tar --strip-components=1 -xf ${ocaml.src} -C "${src.name}/ocaml"
+ '';
+
+ patches = [
+ ./no-opam.patch
+ ./configurable-binding.patch
+ ];
+
+ nativeBuildInputs = [
+ ocaml
+ pkg-config
+ ];
+
+ buildInputs = [ solo5 ];
+
+ configurePhase = ''
+ runHook preConfigure
+ env PKG_CONFIG_DEPS=solo5-bindings-${target} sh configure.sh
+ runHook postConfigure
+ '';
+
+ preBuild = ''
+ # perform substitutions, so opam isn't needed
+ for flags in flags/cflags.tmp flags/libs.tmp; do
+ substitute "$flags.in" "$flags" \
+ --replace "%{prefix}%" "$out" \
+ --replace "%{ocaml-freestanding:lib}%" "$out/lib"
+ done
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ ./install.sh "$out"
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Freestanding OCaml runtime";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ homepage = "https://github.com/mirage/ocaml-freestanding";
+ platforms = builtins.map ({ arch, os }: "${arch}-${os}")
+ (cartesianProductOfSets {
+ arch = [ "aarch64" "x86_64" ];
+ os = [ "linux" ];
+ } ++ [
+ { arch = "x86_64"; os = "freebsd"; }
+ { arch = "x86_64"; os = "openbsd"; }
+ ]);
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch b/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch
new file mode 100644
index 000000000000..43141b1472a9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch
@@ -0,0 +1,84 @@
+commit 637b7ce639d54e617170433aa9596176b167d085
+Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
+Date: Thu Mar 18 01:07:49 2021 +0100
+
+ Allow building without ocamlfind and opam
+
+ This change is the result of my first go at packaging ocaml-freestanding
+ for NixOS. Our build infrastructure for ocaml there is completely
+ independent of opam at the moment, so depending on opam for the build
+ time is not an option, especially in this case where the information it
+ would give us would be garbage.
+
+ Fortunately the build environment plays nicely with pkg-config which is
+ already heavily used by ocaml-freestanding. This patch leaves pkg-config
+ to its own devices if opam is not present (it can be assisted by a
+ manually set PKG_CONFIG_PATH environment variable).
+
+ Additionally, in configure.sh we check if the target ocaml source
+ directory already exists. This allows for building ocaml-freestanding
+ without the ocaml-src package (which would be unnecessarily cumbersome
+ to package for NixOS) and ocamlfind (one less dependency is always a
+ nice bonus). The Makefile needs no fix since the target ocaml/Makefile
+ won't be built if it's already present.
+
+diff --git a/Makefile b/Makefile
+index b07b8c6..a68b31d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,6 +2,12 @@
+
+ include Makeconf
+
++ifneq ($(shell command -v opam),)
++ # only set if opam is available and PKG_CONFIG_PATH isn't
++ # already set in the environment or on the command line
++ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig
++endif
++
+ FREESTANDING_LIBS=openlibm/libopenlibm.a \
+ ocaml/runtime/libasmrun.a \
+ nolibc/libnolibc.a
+@@ -73,8 +79,7 @@ flags/libs.tmp: flags/libs.tmp.in
+ opam config subst $@
+
+ flags/libs: flags/libs.tmp Makeconf
+- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \
+- pkg-config $(PKG_CONFIG_DEPS) --libs >> $<
++ pkg-config $(PKG_CONFIG_DEPS) --libs >> $<
+ awk -v RS= -- '{ \
+ sub("@@PKG_CONFIG_EXTRA_LIBS@@", "$(PKG_CONFIG_EXTRA_LIBS)", $$0); \
+ print "(", $$0, ")" \
+@@ -84,8 +89,7 @@ flags/cflags.tmp: flags/cflags.tmp.in
+ opam config subst $@
+
+ flags/cflags: flags/cflags.tmp Makeconf
+- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \
+- pkg-config $(PKG_CONFIG_DEPS) --cflags >> $<
++ pkg-config $(PKG_CONFIG_DEPS) --cflags >> $<
+ awk -v RS= -- '{ \
+ print "(", $$0, ")" \
+ }' $< >$@
+diff --git a/configure.sh b/configure.sh
+index 4d154ed..c254f7b 100755
+--- a/configure.sh
++++ b/configure.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+
+-export PKG_CONFIG_PATH=$(opam config var prefix)/lib/pkgconfig
++if command -v opam &> /dev/null; then
++ export PKG_CONFIG_PATH=$(opam config var prefix)/lib/pkgconfig
++fi
+ pkg_exists() {
+ pkg-config --exists "$@"
+ }
+@@ -21,7 +23,7 @@ if [ -z "${PKG_CONFIG_DEPS}" ]; then
+ echo "ERROR: solo5-bindings-hvt, solo5-bindings-spt, solo5-bindings-virtio, solo5-bindings-muen, solo5-bindings-genode or solo5-bindings-xen must be installed." 1>&2
+ exit 1
+ fi
+-ocamlfind query ocaml-src >/dev/null || exit 1
++[ -e "$(dirname "$0")/ocaml" ] || ocamlfind query ocaml-src >/dev/null || exit 1
+
+ FREESTANDING_CFLAGS="$(pkg-config --cflags ${PKG_CONFIG_DEPS})"
+ BUILD_ARCH="$(uname -m)"
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
index 0391498c37ae..a56621465f34 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
@@ -1,78 +1,21 @@
-{ buildDunePackage
-, stdlib-shims
-, ppx_yojson_conv_lib
-, ocaml-syntax-shims
-, yojson
-, result
-, omd
-, octavius
-, dune-build-info
-, uutf
-, csexp
-, cmdliner
-, fetchzip
-, lib
-}:
-let
- version = "1.4.0";
- src = fetchzip {
- url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz";
- sha256 = "16vvwq3d9xmr91r6yv5i2gyqcdliji7asyq4g6iygi617233fa33";
- };
+{ buildDunePackage, jsonrpc, lsp, makeWrapper, dot-merlin-reader }:
- # unvendor some (not all) dependencies.
- # They are vendored by upstream only because it is then easier to install
- # ocaml-lsp without messing with your opam switch, but nix should prevent
- # this type of problems without resorting to vendoring.
- preBuild = ''
- rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
- '';
-
- buildInputs = [
- stdlib-shims
- ppx_yojson_conv_lib
- ocaml-syntax-shims
- octavius
- uutf
- csexp
- dune-build-info
- omd
- cmdliner
- jsonrpc
- ];
-
- lsp = buildDunePackage {
- pname = "lsp";
- inherit version src;
- useDune2 = true;
- minimumOCamlVersion = "4.06";
-
- inherit buildInputs preBuild;
- };
-
- jsonrpc = buildDunePackage {
- pname = "jsonrpc";
- inherit version src;
- useDune2 = true;
- minimumOCamlVersion = "4.06";
-
- buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ];
- };
-
-in
buildDunePackage {
pname = "ocaml-lsp-server";
- inherit version src;
+ inherit (jsonrpc) version src;
useDune2 = true;
- inherit preBuild;
+ inherit (lsp) preBuild;
- buildInputs = buildInputs ++ [ lsp ];
+ buildInputs = lsp.buildInputs ++ [ lsp ];
- meta = with lib; {
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ wrapProgram $out/bin/ocamllsp --prefix PATH : ${dot-merlin-reader}/bin
+ '';
+
+ meta = jsonrpc.meta // {
description = "OCaml Language Server Protocol implementation";
- license = lib.licenses.isc;
- platforms = platforms.unix;
- maintainers = [ maintainers.symphorien ];
};
}
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
new file mode 100644
index 000000000000..701604c8710a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
@@ -0,0 +1,31 @@
+{ buildDunePackage
+, stdlib-shims
+, ppx_yojson_conv_lib
+, ocaml-syntax-shims
+, yojson
+, result
+, fetchzip
+, lib
+}:
+
+
+buildDunePackage rec {
+ pname = "jsonrpc";
+ version = "1.4.1";
+ src = fetchzip {
+ url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz";
+ sha256 = "0hzpw17qfhb0cxgwah1fv4k300r363dy1kv0977anl44dlanx1v5";
+ };
+
+ useDune2 = true;
+ minimumOCamlVersion = "4.06";
+
+ buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ];
+
+ meta = with lib; {
+ description = "Jsonrpc protocol implementation in OCaml";
+ license = licenses.isc;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ symphorien marsam ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
new file mode 100644
index 000000000000..b501282c1558
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
@@ -0,0 +1,44 @@
+{ buildDunePackage
+, stdlib-shims
+, ppx_yojson_conv_lib
+, ocaml-syntax-shims
+, jsonrpc
+, omd
+, octavius
+, dune-build-info
+, uutf
+, csexp
+, cmdliner
+}:
+
+buildDunePackage {
+ pname = "lsp";
+ inherit (jsonrpc) version src;
+ useDune2 = true;
+ minimumOCamlVersion = "4.06";
+
+ # unvendor some (not all) dependencies.
+ # They are vendored by upstream only because it is then easier to install
+ # ocaml-lsp without messing with your opam switch, but nix should prevent
+ # this type of problems without resorting to vendoring.
+ preBuild = ''
+ rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
+ '';
+
+ buildInputs = [
+ stdlib-shims
+ ppx_yojson_conv_lib
+ ocaml-syntax-shims
+ octavius
+ uutf
+ csexp
+ dune-build-info
+ omd
+ cmdliner
+ jsonrpc
+ ];
+
+ meta = jsonrpc.meta // {
+ description = "LSP protocol implementation in OCaml";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix
index b930ea88654b..b767b1db24c8 100644
--- a/pkgs/development/ocaml-modules/owl-base/default.nix
+++ b/pkgs/development/ocaml-modules/owl-base/default.nix
@@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "owl-base";
- version = "1.0.0";
+ version = "1.0.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
- sha256 = "1gny4351ws2r7dp53nampfyh39l0z6qqvxj5v3d05mpdi2aa06yr";
+ sha256 = "72ca9f6edd302fdfa16c7559cedac7ac2c885466a367e17ea1ea8807b2dd13ef";
};
minimumOCamlVersion = "4.10";
diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix
index f67d614af3ae..5c00f2c8991f 100644
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -4,12 +4,12 @@
buildDunePackage rec {
pname = "pgocaml";
- version = "4.2.2";
+ version = "4.2.2-dev-20210111";
src = fetchFromGitHub {
owner = "darioteixeira";
repo = "pgocaml";
- rev = version;
- sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n";
+ rev = "1bb0025deeb3d14029afdcc69aaa7847026e243e";
+ sha256 = "11inbjf87gclc2xmpq56ag4cm4467y9q9hjgbdn69fa1bman2zn2";
};
minimumOCamlVersion = "4.08";
diff --git a/pkgs/development/ocaml-modules/pgocaml/ppx.nix b/pkgs/development/ocaml-modules/pgocaml/ppx.nix
index 35c19622f88d..dce2e2b0c99d 100644
--- a/pkgs/development/ocaml-modules/pgocaml/ppx.nix
+++ b/pkgs/development/ocaml-modules/pgocaml/ppx.nix
@@ -1,8 +1,8 @@
-{ buildDunePackage, pgocaml, ppx_optcomp, ppx_tools, ppx_tools_versioned, rresult }:
+{ buildDunePackage, pgocaml, ppx_optcomp }:
buildDunePackage {
pname = "pgocaml_ppx";
inherit (pgocaml) src version useDune2 meta;
- propagatedBuildInputs = [ pgocaml ppx_optcomp ppx_tools ppx_tools_versioned rresult ];
+ propagatedBuildInputs = [ pgocaml ppx_optcomp ];
}
diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index b5651a8cec2a..4ad26ff0862b 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,27 +1,28 @@
-{ lib, fetchurl, buildDunePackage, ocaml
-, ounit, ppx_deriving, ppx_tools_versioned
-, ppxlib, ocaml-migrate-parsetree
+{ lib, fetchurl, buildDunePackage
+, ppx_tools_versioned
+, ocaml-migrate-parsetree
+, ounit, ppx_deriving, ppxlib
}:
buildDunePackage rec {
pname = "ppx_import";
- version = "1.7.1";
+ version = "1.8.0";
useDune2 = true;
minimumOCamlVersion = "4.04";
src = fetchurl {
- url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz";
- sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v";
+ url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-${version}.tbz";
+ sha256 = "0zqcj70yyp4ik4jc6jz3qs2xhb94vxc6yq9ij0d5cyak28klc3gv";
};
propagatedBuildInputs = [
- ppxlib ppx_tools_versioned ocaml-migrate-parsetree
+ ppx_tools_versioned ocaml-migrate-parsetree
];
doCheck = true;
- checkInputs = [ ounit ppx_deriving ];
+ checkInputs = [ ounit ppx_deriving ppxlib ];
meta = {
description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index 11b608e6ef5c..c92992197d22 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -1,5 +1,8 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml
-, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0"
+, version ?
+ if lib.versionAtLeast ocaml.version "4.07"
+ then if lib.versionAtLeast ocaml.version "4.08"
+ then "0.22.0" else "0.15.0" else "0.13.0"
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
, stdlib-shims, ocaml-migrate-parsetree-2-1
}:
@@ -19,11 +22,13 @@ let param = {
"0.15.0" = {
sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
min_version = "4.07";
+ max_version = "4.12";
useOMP2 = false;
};
"0.18.0" = {
sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm";
min_version = "4.07";
+ max_version = "4.12";
};
"0.22.0" = {
sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q";
diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix
index ff9c52c50a76..f7c2f3497a11 100644
--- a/pkgs/development/ocaml-modules/psq/default.nix
+++ b/pkgs/development/ocaml-modules/psq/default.nix
@@ -1,10 +1,12 @@
-{ lib, buildDunePackage, fetchurl, seq }:
+{ lib, buildDunePackage, ocaml, fetchurl, seq, qcheck-alcotest }:
buildDunePackage rec {
minimumOCamlVersion = "4.03";
pname = "psq";
version = "0.2.0";
+ useDune2 = true;
+
src = fetchurl {
url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-v${version}.tbz";
sha256 = "1j4lqkq17rskhgcrpgr4n1m1a2b1x35mlxj6f9g05rhpmgvgvknk";
@@ -12,6 +14,9 @@ buildDunePackage rec {
propagatedBuildInputs = [ seq ];
+ doCheck = lib.versionAtLeast ocaml.version "4.07";
+ checkInputs = [ qcheck-alcotest ];
+
meta = {
description = "Functional Priority Search Queues for OCaml";
homepage = "https://github.com/pqwy/psq";
diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix
index 80fa01066f1e..6e639f984cbc 100644
--- a/pkgs/development/ocaml-modules/tcpip/default.nix
+++ b/pkgs/development/ocaml-modules/tcpip/default.nix
@@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchurl
-, bisect_ppx, ppx_cstruct
+, bisect_ppx, ppx_cstruct, pkg-config
, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
, mirage-random, mirage-stack, mirage-protocols, mirage-time
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
@@ -11,18 +11,23 @@
buildDunePackage rec {
pname = "tcpip";
- version = "6.0.0";
+ version = "6.1.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
- sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s";
+ sha256 = "e81c98a6e80e05f9fa4e5fbee50e6c247f6011254c7b1d9a0e58bae318c1f0c8";
};
+ patches = [
+ ./no-opam-pkg-config-path.patch
+ ];
+
nativeBuildInputs = [
bisect_ppx
ppx_cstruct
+ pkg-config
];
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch b/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch
new file mode 100644
index 000000000000..a7e9155ce5a2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch
@@ -0,0 +1,21 @@
+diff --git a/freestanding/Makefile b/freestanding/Makefile
+index f22d220d..4bb3ac57 100644
+--- a/freestanding/Makefile
++++ b/freestanding/Makefile
+@@ -1,6 +1,4 @@
+-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
+-
+-EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)
++EXISTS := $(shell pkg-config --exists ocaml-freestanding; echo $$?)
+
+ .PHONY: all clean
+ all: libtcpip_freestanding_stubs.a
+@@ -10,7 +8,7 @@ libtcpip_freestanding_stubs.a:
+ touch $@
+ else
+ CC ?= cc
+-FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
++FREESTANDING_CFLAGS := $(shell pkg-config --cflags ocaml-freestanding)
+ CFLAGS := $(FREESTANDING_CFLAGS)
+
+ OBJS=checksum_stubs.o
diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix
index d90a80c5648c..5f59b4ae056e 100644
--- a/pkgs/development/ocaml-modules/torch/default.nix
+++ b/pkgs/development/ocaml-modules/torch/default.nix
@@ -17,7 +17,7 @@
buildDunePackage rec {
pname = "torch";
- version = "0.11";
+ version = "0.12";
useDune2 = true;
@@ -27,7 +27,7 @@ buildDunePackage rec {
owner = "LaurentMazare";
repo = "ocaml-${pname}";
rev = version;
- sha256 = "19zbl9zn6fslrcm6x9cis6nswhwz8mc57nrhkada658n7rcdmskr";
+ sha256 = "0nl6hd2rivhgkc3sdkdmrk3j0ij3xjx1clhqm8m5iznir4g77g91";
};
buildInputs = [ dune-configurator ];
diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix
index bda50bdb78ed..a47cd414fb1e 100644
--- a/pkgs/development/ocaml-modules/visitors/default.nix
+++ b/pkgs/development/ocaml-modules/visitors/default.nix
@@ -2,18 +2,18 @@
buildDunePackage rec {
pname = "visitors";
- version = "20210127";
+ version = "20210316";
useDune2 = true;
- minimumOCamlVersion = "4.07";
+ minimumOCamlVersion = "4.08";
src = fetchFromGitLab {
owner = "fpottier";
repo = pname;
rev = version;
domain = "gitlab.inria.fr";
- sha256 = "0b73h7d4yv04a0b5x2i222jknbcgf9vvxzfjxzy2jwanxz9d873z";
+ sha256 = "12d45ncy3g9mpcs6n58aq6yzs5qz662msgcr7ccms9jhiq44m8f7";
};
propagatedBuildInputs = [ ppxlib ppx_deriving result ];
diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 45531b551761..23afd44b67d9 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
# because upstream tarball has no top-level directory.
sourceRoot = ".";
- buildInputs = [ bash pharo unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ bash pharo ];
installPhase = ''
mkdir -p $prefix/share/pharo-launcher
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 5427e36746ca..c1f703f72515 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -53,10 +53,9 @@ stdenv.mkDerivation rec {
# http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
#
# (stack protection is disabled above for gcc 4.8 compatibility.)
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook unzip ];
buildInputs = [
bash
- unzip
glibc
openssl
gcc48
diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
index 720f2e39a7d3..a2a55f2eb437 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
sha256 = "0xbdi679ryb2zg412xy6zkh22l20pmbl92m3qhfgzjvgybna8z2a";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $prefix/lib
diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index 9f1ce65db0ae..c2e6a1292c7b 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "php-cs-fixer";
- version = "2.18.3";
+ version = "2.18.4";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
- sha256 = "sha256-Bdk1+X+SKcVS/zxEqlgnR3zjq/l0ht7icE4sQ1hjn8g=";
+ sha256 = "sha256-ZgnWv7Xd+0XgZ/IPdjVpAEraNNJq2KHB3aUUIG1SirU=";
};
phases = [ "installPhase" ];
diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index 0e536d571325..902529806a3b 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpstan";
- version = "0.12.81";
+ version = "0.12.82";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
- sha256 = "sha256-mdqVrTrxWE2AuLVqgumA7V+JjzGW9ukkFM7klJSLeDE=";
+ sha256 = "sha256-fX7YK4z6xUhSJ2jTCy7bRK13TxXSn/qo7E5DeZlv2Nw=";
};
phases = [ "installPhase" ];
diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index 507147dc8d6f..1a27c8c1f0fc 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -1,27 +1,29 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, setuptools-scm
, pytestCheckHook
+, pytest-asyncio
+, pytest-tornado
, pytestcov
, sqlalchemy
, tornado
, twisted
, mock
-, trollius
, gevent
, six
, pytz
, tzlocal
, funcsigs
-, futures
, setuptools
-, isPy3k
+, pythonOlder
}:
buildPythonPackage rec {
pname = "APScheduler";
version = "3.7.0";
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -33,13 +35,14 @@ buildPythonPackage rec {
];
checkInputs = [
+ pytest-asyncio
+ pytest-tornado
pytestCheckHook
pytestcov
sqlalchemy
tornado
twisted
mock
- trollius
gevent
];
@@ -49,7 +52,12 @@ buildPythonPackage rec {
tzlocal
funcsigs
setuptools
- ] ++ lib.optional (!isPy3k) futures;
+ ];
+
+ disabledTests = lib.optionals stdenv.isDarwin [
+ "test_submit_job"
+ "test_max_instances"
+ ];
pythonImportsCheck = [ "apscheduler" ];
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 64f5bb3ab656..c09f1586fd6f 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -26,11 +26,11 @@ let
in buildPythonPackage rec {
pname = "Cython";
- version = "0.29.21";
+ version = "0.29.22";
src = fetchPypi {
inherit pname version;
- sha256 = "1bcwpra7c6k30yvic3sw2v3rq2dr40ypc4zqif6kr52mpn4wnyp5";
+ sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY=";
};
nativeBuildInputs = [
@@ -49,6 +49,15 @@ in buildPythonPackage rec {
url = "https://github.com/cython/cython/commit/28251032f86c266065e4976080230481b1a1bb29.patch";
sha256 = "19rg7xs8gr90k3ya5c634bs8gww1sxyhdavv07cyd2k71afr83gy";
})
+
+ # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series.
+ # it does not affect Python code unless the code explicitly uses the feature.
+ # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267)
+ (fetchpatch {
+ name = "trashcan.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cython/patches/trashcan.patch?id=4569a839f070a1a38d5dbce2a4d19233d25aeed2";
+ sha256 = "sha256-+pOF1XNTEtNseLpqPzrc1Jfwt5hGx7doUoccIhNneYY=";
+ })
];
checkPhase = ''
diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix
index 50e90ded7622..118288acb59e 100644
--- a/pkgs/development/python-modules/WSME/default.nix
+++ b/pkgs/development/python-modules/WSME/default.nix
@@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "WSME";
- version = "0.10.0";
+ version = "0.10.1";
disabled = pythonAtLeast "3.9";
src = fetchPypi {
inherit pname version;
- sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304";
+ sha256 = "34209b623635a905bcdbc654f53ac814d038da65e4c2bc070ea1745021984079";
};
nativeBuildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 22d2bfda8115..3879aed84dee 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Adafruit-PlatformDetect";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-F5p3RO9847YQ7tDzb0r3+6dSCEAWoyxtMGBwhywR3/0=";
+ sha256 = "sha256-+rZUIZA2P7NZ4jbJsenGlD0OZi5fXFQ/Y5vJo4bmvMo=";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix
index b3cbfd212ba6..dfa576e657c9 100644
--- a/pkgs/development/python-modules/adguardhome/default.nix
+++ b/pkgs/development/python-modules/adguardhome/default.nix
@@ -1,24 +1,49 @@
-{ aiohttp, aresponses, buildPythonPackage, fetchFromGitHub, isPy3k, lib
-, pytest-asyncio, pytestCheckHook, yarl }:
+{ lib
+, aiohttp
+, aresponses
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, yarl
+}:
buildPythonPackage rec {
pname = "adguardhome";
- version = "0.4.2";
-
- disabled = !isPy3k;
+ version = "0.5.0";
+ format = "pyproject";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "frenck";
repo = "python-${pname}";
rev = "v${version}";
- sha256 = "0lcf3yg27amrnqvgn5nw4jn2j0vj4yfmyl5p5yncmn7dh6bdbsp8";
+ sha256 = "sha256-f8uZF4DXbfiL1nL82shjGNpo6lXSUomRgO1YnNT/GDw=";
};
- propagatedBuildInputs = [ aiohttp yarl ];
- checkInputs = [ aresponses pytest-asyncio pytestCheckHook ];
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ yarl
+ ];
+
+ checkInputs = [
+ aresponses
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml --replace "--cov" ""
+ '';
+
+ pythonImportsCheck = [ "adguardhome" ];
meta = with lib; {
- description = "Asynchronous Python client for the AdGuard Home API.";
+ description = "Python client for the AdGuard Home API";
homepage = "https://github.com/frenck/python-adguardhome";
license = licenses.mit;
maintainers = with maintainers; [ jamiemagee ];
diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix
index cd47d7f08793..5e504ab87a02 100644
--- a/pkgs/development/python-modules/aioambient/default.nix
+++ b/pkgs/development/python-modules/aioambient/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioambient";
- version = "1.2.3";
+ version = "1.2.4";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1jg93rjn1gxc66qmipw4z1c09l8hgfsydacjgkfjq7vg547lragp";
+ sha256 = "sha256-uqvM5F0rpw+xeCXYl4lGMt3r0ugPsUmSvujmTJ9HABk=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 503a5336ee23..425575442592 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "2.6.5";
+ version = "2.6.6";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-inktluPKefrFQCF2yadvHwT9Rw+pJLw8pjdUc35IJoc=";
+ sha256 = "sha256-LdBUtU5rNoixh7DPIFkHxLMvBeI6MZH57sO0IjuOQAw=";
};
propagatedBuildInputs = [ attrs protobuf zeroconf ];
diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix
index 60288178def5..8fe61282ab86 100644
--- a/pkgs/development/python-modules/aioflo/default.nix
+++ b/pkgs/development/python-modules/aioflo/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aioflo";
- version = "0.4.2";
+ version = "0.4.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1ppsinmjph6snj7s4hg28p3qa67kpkadc98ikjjg6w65vcm3dlaz";
+ sha256 = "sha256-Dap3yjFIS+k/LLNg+vmYmiFQCOEPNp27p0GCMpn/edA=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix
index 8d3de12cd993..47b820161886 100644
--- a/pkgs/development/python-modules/aioguardian/default.nix
+++ b/pkgs/development/python-modules/aioguardian/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "aioguardian";
- version = "1.0.4";
+ version = "1.0.7";
disabled = pythonAtLeast "3.9";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1cbxcsxh9c8r2zx3lsjdns26sm2qmlwnqgah2sfzbgp1lay23vvq";
+ sha256 = "sha256-KMhq86hcqoYloS/6VHsl+3KVEZBbN97ABrZlmEr32Z8=";
};
format = "pyproject";
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 514d1d308e12..c0722c8c9781 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -3,82 +3,77 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
+, async-timeout
, attrs
, chardet
-, multidict
-, async-timeout
-, yarl
, idna-ssl
+, multidict
, typing-extensions
-, pytestrunner
-, pytestCheckHook
-, gunicorn
+, yarl
, async_generator
-, pytest_xdist
-, pytestcov
-, pytest-mock
-, trustme
, brotlipy
, freezegun
-, isPy38
+, gunicorn
+, pytest-mock
+, pytest-xdist
+, pytestCheckHook
, re-assert
+, trustme
}:
buildPythonPackage rec {
pname = "aiohttp";
- version = "3.7.3";
- # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures
- disabled = pythonOlder "3.5";
+ version = "3.7.4.post0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4";
+ sha256 = "493d3299ebe5f5a7c66b9819eacdcfbbaaf1a8e84911ddffcdc48888497afecf";
};
- checkInputs = [
- pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist
- pytest-mock pytestcov trustme brotlipy freezegun
- re-assert
- ];
+ postPatch = ''
+ substituteInPlace setup.cfg --replace " --cov=aiohttp" ""
+ '';
propagatedBuildInputs = [
+ async-timeout
attrs
chardet
multidict
- async-timeout
typing-extensions
yarl
] ++ lib.optionals (pythonOlder "3.7") [
idna-ssl
];
+ checkInputs = [
+ async_generator
+ brotlipy
+ freezegun
+ gunicorn
+ pytest-mock
+ pytest-xdist
+ pytestCheckHook
+ re-assert
+ trustme
+ ];
+
+ pytestFlagsArray = [
+ "-n auto"
+ ];
+
disabledTests = [
- # disable tests which attempt to do loopback connections
- "get_valid_log_format_exc"
- "test_access_logger_atoms"
- "aiohttp_request_coroutine"
- "server_close_keepalive_connection"
- "connector"
- "client_disconnect"
- "handle_keepalive_on_closed_connection"
- "proxy_https_bad_response"
- "partially_applied_handler"
- "middleware"
+ # Disable tests that require network access
"test_mark_formdata_as_processed"
- # no longer compatible with pytest>=6
- "aiohttp_plugin_async_fixture"
] ++ lib.optionals stdenv.is32bit [
"test_cookiejar"
- ] ++ lib.optionals isPy38 [
- # Python 3.8 https://github.com/aio-libs/aiohttp/issues/4525
- "test_read_boundary_with_incomplete_chunk"
- "test_read_incomplete_chunk"
- "test_request_tracing_exception"
] ++ lib.optionals stdenv.isDarwin [
- "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572
+ "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0
"test_close"
];
+ __darwinAllowLocalNetworking = true;
+
# aiohttp in current folder shadows installed version
# Probably because we run `python -m pytest` instead of `pytest` in the hook.
preCheck = ''
diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix
index 0f1a297e6ac7..0dc576fca49a 100644
--- a/pkgs/development/python-modules/aiolyric/default.nix
+++ b/pkgs/development/python-modules/aiolyric/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiolyric";
- version = "1.0.5";
+ version = "1.0.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "timmo001";
repo = pname;
rev = "v${version}";
- sha256 = "00kq3dsjcfhjzn585phb3g168dbg53wrqq7g8a4gljs49c2mf5qx";
+ sha256 = "1lnzsdw6kvgk0762f3vyw4xfzn7qkvsff16q61gm0ryjqg9j8whx";
};
propagatedBuildInputs = [ aiohttp ];
diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix
new file mode 100644
index 000000000000..078184275eb5
--- /dev/null
+++ b/pkgs/development/python-modules/aionotion/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, aiohttp
+, aresponses
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-aiohttp
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "aionotion";
+ version = "3.0.1";
+ format = "pyproject";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "bachya";
+ repo = pname;
+ rev = version;
+ sha256 = "1ydrazg7gcwf53006n1fvxh9zm77by6zi36haq1bmy5skqccyiki";
+ };
+
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ checkInputs = [
+ aresponses
+ pytest-aiohttp
+ pytest-asyncio
+ pytest-cov
+ pytestCheckHook
+ ];
+
+ disabledTestPaths = [ "examples" ];
+
+ pythonImportsCheck = [ "aionotion" ];
+
+ meta = with lib; {
+ description = "Python library for Notion Home Monitoring";
+ homepage = "https://github.com/bachya/aionotion";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix
index c802633e5723..53daf1f22696 100644
--- a/pkgs/development/python-modules/aiorecollect/default.nix
+++ b/pkgs/development/python-modules/aiorecollect/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "aiorecollect";
- version = "1.0.2";
+ version = "1.0.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "0dlz8zmqcn6g6000lfgcy5krpfafzdzrznmk6iwra65wcs7l9392";
+ sha256 = "sha256-S4HL8vJS/dTKsR5egKRSHqZYPClcET5Le06euHPyIkU=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 6a0d69371a8e..2a3a2e60be79 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -1,22 +1,22 @@
{ lib
-, buildPythonPackage
-, fetchPypi
-, pythonOlder
-, pbr
, aiohttp
-, ddt
, asynctest
-, pytest
+, buildPythonPackage
+, ddt
+, fetchPypi
+, pbr
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "aioresponses";
- version = "0.7.1";
+ version = "0.7.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "f65bba2be1e9a4997ee166bc0161a50be0fef7350ad09e6afdb2adccf74dfefe";
+ sha256 = "sha256-guSV0Ri3SJaqW01H4X7/teLMeD5RCuOVzq3l6Hyr6Jo=";
};
nativeBuildInputs = [
@@ -30,13 +30,16 @@ buildPythonPackage rec {
checkInputs = [
asynctest
ddt
- pytest
+ pytestCheckHook
];
- # Skip a test which makes requests to httpbin.org
- checkPhase = ''
- pytest -k "not (test_address_as_instance_of_url_combined_with_pass_through or test_pass_through_with_origin_params)"
- '';
+ disabledTests = [
+ # Skip a test which makes requests to httpbin.org
+ "test_address_as_instance_of_url_combined_with_pass_through"
+ "test_pass_through_with_origin_params"
+ ];
+
+ pythonImportsCheck = [ "aioresponses" ];
meta = {
description = "A helper to mock/fake web requests in python aiohttp package";
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index 9c6776505554..414f8a6d9a64 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -1,25 +1,24 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, isPy27
+, pythonOlder
, pygments
, pytestCheckHook
-, pytestcov
+, pytest-cov
, uvloop
}:
buildPythonPackage rec {
pname = "aiorun";
- version = "2020.6.1";
+ version = "2020.12.1";
format = "flit";
-
- disabled = isPy27;
+ disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "cjrh";
repo = pname;
rev = "v${version}";
- sha256 = "00mq5ylhhdfdqrh7zdqabf3wy85jrkqvgfb1421ll46fsjim2d14";
+ sha256 = "sha256-ktc2cmoPNYcsVyKCWs+ivhV5onywFIrdDRBiBKrdiF4=";
};
propagatedBuildInputs = [
@@ -28,7 +27,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestcov
+ pytest-cov
uvloop
];
@@ -43,6 +42,6 @@ buildPythonPackage rec {
description = "Boilerplate for asyncio applications";
homepage = "https://github.com/cjrh/aiorun";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix
new file mode 100644
index 000000000000..49c67a0aa040
--- /dev/null
+++ b/pkgs/development/python-modules/aiosmb/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, asysocks
+, buildPythonPackage
+, fetchPypi
+, minikerberos
+, prompt_toolkit
+, pythonOlder
+, six
+, tqdm
+, winacl
+, winsspi
+}:
+
+buildPythonPackage rec {
+ pname = "aiosmb";
+ version = "0.2.37";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0daf1fk7406vpywc0yxv0wzf4nw986js9lc2agfyfxz0q7s29lf0";
+ };
+
+ propagatedBuildInputs = [
+ minikerberos
+ winsspi
+ six
+ asysocks
+ tqdm
+ prompt_toolkit
+ winacl
+ ];
+
+ # Project doesn't have tests
+ doCheck = false;
+ pythonImportsCheck = [ "aiosmb" ];
+
+ meta = with lib; {
+ description = "Python SMB library";
+ homepage = "https://github.com/skelsec/aiosmb";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/ajsonrpc/default.nix b/pkgs/development/python-modules/ajsonrpc/default.nix
new file mode 100644
index 000000000000..e5a81d9cfa6e
--- /dev/null
+++ b/pkgs/development/python-modules/ajsonrpc/default.nix
@@ -0,0 +1,24 @@
+{ lib, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "ajsonrpc";
+ version = "1.1.0";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1b5r8975wdnk3qnc1qjnn4lkxmqcir3brbwnxml9ii90dnsw408a";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "ajsonrpc" ];
+
+ meta = with lib; {
+ description = "Async JSON-RPC 2.0 protocol + asyncio server";
+ homepage = "https://github.com/pavlov99/ajsonrpc";
+ license = licenses.mit;
+ maintainers = with maintainers; [ oxzi ];
+ };
+}
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 37c1efd9c1b6..99ee559da6b9 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -33,18 +33,20 @@ buildPythonPackage rec {
pandas
six
toolz
+ jinja2
] ++ lib.optionals (pythonOlder "3.5") [ typing ];
checkInputs = [
glibcLocales
ipython
- jinja2
pytest
recommonmark
sphinx
vega_datasets
];
+ pythonImportsCheck = [ "altair" ];
+
checkPhase = ''
export LANG=en_US.UTF-8
# histogram_responsive.py attempt network access, and cannot be disabled through pytest flags
diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix
new file mode 100644
index 000000000000..319c9514183e
--- /dev/null
+++ b/pkgs/development/python-modules/android-backup/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pycrypto
+, pythonOlder
+, enum34
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "android-backup";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "bluec0re";
+ repo = "android-backup-tools";
+ rev = "v${version}";
+ sha256 = "0c436hv64ddqrjs77pa7z6spiv49pjflbmgg31p38haj5mzlrqvw";
+ };
+
+ propagatedBuildInputs = [
+ pycrypto
+ ] ++ lib.optional (pythonOlder "3.4") enum34;
+
+ checkPhase = ''
+ ${python.interpreter} -m android_backup.tests
+ '';
+
+ pythonImportsCheck = [ "android_backup" ];
+
+ meta = with lib; {
+ description = "Unpack and repack android backups";
+ homepage = https://github.com/bluec0re/android-backup-tools;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index ac6eb0957778..13fb71d7f2f2 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "apispec";
- version = "4.2.0";
+ version = "4.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fbbd069caa22c0270bc71a5330b46b5a4e1984d8345b9236ca02fbca23094647";
+ sha256 = "5ec0fe72f1422a1198973fcbb48d0eb5c7390f4b0fbe55474fce999ad6826a9b";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix
index 82c8fc93267f..79a44ad42cdd 100644
--- a/pkgs/development/python-modules/arrayqueues/default.nix
+++ b/pkgs/development/python-modules/arrayqueues/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "arrayqueues";
- version = "1.2.0b0";
+ version = "1.3.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1gvrxb2rw0dk469wq5azylar7hhanfp07gl5mc6ajdbgz9gsd6ln";
+ sha256 = "a955df768e39d459de28c7ea10ee02f67b1c70996cfa229846ab98df77a6fb69";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 19c1921f7c74..33513b2289c5 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -1,54 +1,55 @@
{ lib
+, astropy
, buildPythonPackage
, fetchPypi
-, pytest-astropy
-, semantic-version
-, pyyaml
, jsonschema
-, six
, numpy
-, isPy27
-, astropy
-, setuptools_scm
-, setuptools
+, packaging
+, pytest-astropy
+, pytestCheckHook
+, pythonOlder
+, pyyaml
+, semantic-version
+, setuptools-scm
}:
buildPythonPackage rec {
pname = "asdf";
- version = "2.7.1";
- disabled = isPy27;
+ version = "2.7.3";
+ disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "4ba2e31cb24b974a10dfae3edee23db2e6bea2d00608604d062366aa3af6e81a";
+ sha256 = "11dyr295wn5m2pcynlwj7kgw9xr66msfvwn1m6a5vv13vzj19spp";
};
+ nativeBuildInputs = [ setuptools-scm ];
+
+ propagatedBuildInputs = [
+ jsonschema
+ numpy
+ packaging
+ pyyaml
+ semantic-version
+ ];
+
checkInputs = [
pytest-astropy
astropy
+ pytestCheckHook
];
- propagatedBuildInputs = [
- semantic-version
- pyyaml
- jsonschema
- six
- numpy
- setuptools_scm
- setuptools
- ];
-
- checkPhase = ''
- PY_IGNORE_IMPORTMISMATCH=1 pytest
+ preCheck = ''
+ export PY_IGNORE_IMPORTMISMATCH=1
'';
+ pythonImportsCheck = [ "asdf" ];
+
meta = with lib; {
description = "Python tools to handle ASDF files";
homepage = "https://github.com/spacetelescope/asdf";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
- # many ValueError in tests
- broken = true;
};
}
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 49f04bcb9116..468488ec0cad 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -1,34 +1,39 @@
-{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy, pythonAtLeast
-, lazy-object-proxy, six, wrapt, typing, typed-ast
-, pytestrunner, pytest
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, isPyPy
+, lazy-object-proxy
+, wrapt
+, typed-ast
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "astroid";
- version = "2.4.2";
+ version = "2.5";
- disabled = pythonOlder "3.4" || pythonAtLeast "3.9";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703";
+ sha256 = "03dzhjrsc5d2whyjngfrwvxn42058k0cjjr85x2wqzai8psr475k";
};
- postPatch = ''
- substituteInPlace astroid/__pkginfo__.py --replace "lazy_object_proxy==1.4.*" "lazy_object_proxy"
- '';
-
# From astroid/__pkginfo__.py
- propagatedBuildInputs = [ lazy-object-proxy six wrapt ]
- ++ lib.optional (pythonOlder "3.5") typing
- ++ lib.optional (!isPyPy) typed-ast;
+ propagatedBuildInputs = [
+ lazy-object-proxy
+ wrapt
+ ] ++ lib.optional (!isPyPy && pythonOlder "3.8") typed-ast;
- checkInputs = [ pytestrunner pytest ];
+ checkInputs = [
+ pytestCheckHook
+ ];
meta = with lib; {
description = "An abstract syntax tree for Python with inference support";
homepage = "https://github.com/PyCQA/astroid";
- license = licenses.lgpl2;
+ license = licenses.lgpl21Plus;
platforms = platforms.all;
maintainers = with maintainers; [ nand0p ];
};
diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix
index 0f090d14abad..ecbbfa909112 100644
--- a/pkgs/development/python-modules/asttokens/default.nix
+++ b/pkgs/development/python-modules/asttokens/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage,
+{ lib, fetchPypi, fetchpatch, buildPythonPackage,
setuptools_scm, toml, six, astroid, pytest
}:
@@ -11,6 +11,16 @@ buildPythonPackage rec {
sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4";
};
+ patches = [
+ # Fixes compatibility with python 3.9, will be included in the next release
+ # after 2.0.4
+ (fetchpatch {
+ url = "https://github.com/gristlabs/asttokens/commit/d8ff80ee7d2e64c5e1daf50cc38eb99663f1b1ac.patch";
+ sha256 = "19y8n8vpzr2ijldbq5rh19sf0vz5azqqpkb9bx0ljjg98h6k7kjj";
+ excludes = [ "setup.cfg" ];
+ })
+ ];
+
propagatedBuildInputs = [ setuptools_scm toml six astroid ];
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index 6697cb5d13e8..5f6d68b9ca53 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml
-, pytest_6, pytest-asyncio }:
+, pytestCheckHook, pytest-asyncio }:
buildPythonPackage rec {
pname = "async-upnp-client";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest_6
+ pytestCheckHook
pytest-asyncio
];
diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index 7ce389f984d3..fe055d7f1972 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "asyncwhois";
- version = "0.3.0";
+ version = "0.3.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pogzyb";
repo = pname;
rev = "v${version}";
- sha256 = "1514fz942yix7fh4yg982mxjp8c0qb6a0i4fw5wsc3xx4g86zcdg";
+ sha256 = "1wp6pwnc1inzzn9nhkwq9m9ab1aylw0hzq94w6p2dsm2njfqma8h";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix
index e0294246fb2d..fb51b698ed82 100644
--- a/pkgs/development/python-modules/avro-python3/default.nix
+++ b/pkgs/development/python-modules/avro-python3/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "avro-python3";
- version = "1.10.1";
+ version = "1.10.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "9027abeab63dd9b66bd3c564fa0670c70f78027ecb1978d96c6af7ed415b626b";
+ sha256 = "3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab";
};
buildInputs = [ pycodestyle isort ];
diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix
index 5a38e86eee37..4c1fb77dc69b 100644
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/pkgs/development/python-modules/avro/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "avro";
- version = "1.10.1";
+ version = "1.10.2";
src = fetchPypi {
inherit pname version;
- sha256 = "b3a405df5aa8654b992d2aca7b80482b858a1919a44dc0b10a682162e8ee340a";
+ sha256 = "381b990cc4c4444743c3297348ffd46e0c3a5d7a17e15b2f4a9042f6e955c31a";
};
patchPhase = ''
diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix
index c248c81da751..3783f9776cd1 100644
--- a/pkgs/development/python-modules/awkward0/default.nix
+++ b/pkgs/development/python-modules/awkward0/default.nix
@@ -2,33 +2,31 @@
, buildPythonPackage
, fetchFromGitHub
, numpy
-, pandas
, pytestrunner
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "awkward0";
- version = "0.15.2";
+ version = "0.15.5";
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "awkward-0.x";
rev = version;
- sha256 = "sha256-C6/byIGcabGjws5QI9sh5BO2M4Lhqkooh4mSjUEKCKU=";
+ sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx";
};
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ numpy ];
- checkInputs = [ pandas pytestCheckHook ];
+ checkInputs = [ pytestCheckHook ];
- checkPhase = ''
- # Almost all tests in this file fail
- rm tests/test_persist.py
- py.test
- '';
+ # Can't find a fixture
+ disabledTests = [ "test_import_pandas" ];
+
+ pythonImportsCheck = [ "awkward0" ];
meta = with lib; {
description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy";
diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index e91a0fb07493..2bcb4d42646c 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -14,14 +14,14 @@
}:
buildPythonPackage rec {
- version = "1.10.0";
+ version = "1.12.0";
pname = "azure-core";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "b9cddf3eb239e32b14cf44750b21d7bc8d78b82aa53d57628523598dcd006803";
+ sha256 = "adf2b1c6ef150a92295b4b405f982a9d2c55c4846728cb14760ca592acbb09ec";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix
index 9781fcecaaf2..3d8e4df56540 100644
--- a/pkgs/development/python-modules/azure-eventgrid/default.nix
+++ b/pkgs/development/python-modules/azure-eventgrid/default.nix
@@ -3,23 +3,25 @@
, fetchPypi
, msrest
, azure-common
+, azure-core
, msrestazure
}:
buildPythonPackage rec {
pname = "azure-eventgrid";
- version = "1.3.0";
+ version = "4.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "c82c4bf6ea59aeec69ce8f95f1b6a4edc6d733874aeb056669c9d2806168c86e";
+ sha256 = "c4f29b2d9b717dad7919048f0a458dd84f83637c3d5c8f5a7e64634b22086719";
};
propagatedBuildInputs = [
+ azure-common
+ azure-core
msrest
msrestazure
- azure-common
];
# has no tests
diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
index 7330ef5fb3e1..2685d8803b89 100644
--- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
@@ -1,28 +1,29 @@
{ lib
, buildPythonPackage
-, python
, fetchPypi
, msrest
, msrestazure
, azure-common
+, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-applicationinsights";
- version = "0.3.0";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "3c788a54db4fbca1a8850151462ec1471ff59c86b3a10d6082952bbdaa7e6651";
+ sha256 = "c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b";
};
propagatedBuildInputs = [
+ azure-common
+ azure-mgmt-core
msrest
msrestazure
- azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index e8a45ebf5aa4..2bfa56dc81c5 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -1,20 +1,18 @@
{ lib
, buildPythonPackage
, fetchPypi
-, python
, azure-mgmt-common
, azure-mgmt-core
-, isPy3k
}:
buildPythonPackage rec {
- version = "18.1.0";
+ version = "19.0.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "02de691c5ce7237993e65b0ae6154b3bf8ec32bcb15f13ade72bc7f3cb3183d4";
+ sha256 = "65afe759c6ee87dd89d65d59c8da4b2c04d197c07c1fbfdc56ef1aea468e4525";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index 91f420f11ae8..8454d4463f4b 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "d4f3984eca74b1e3691467aadc09626e578ed1fc5ef410872d474f3e7653916a";
+ sha256 = "433ad8e83bd8df4abc5af47a0e3a7a4515f79931db4036f2bccd65b5a9e88bfb";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
index 93c78c401f0c..c5adc61ea203 100644
--- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
@@ -1,21 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, azure-common
+, azure-mgmt-core
, msrest
, msrestazure
}:
buildPythonPackage rec {
- version = "0.10.0";
+ version = "1.0.0";
pname = "azure-mgmt-kusto";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "09e8d4928e19d12feb374adb47651b474f3ee3bc6a12704e4b70c9b38e3bcd9e";
+ sha256 = "fa3ede0ebd6489bbf993f420bcb5fc63d9fad2a1e945c3c49b26fa012bb3534e";
extension = "zip";
};
- propagatedBuildInputs = [ azure-common msrest msrestazure ];
+ propagatedBuildInputs = [
+ azure-common
+ azure-mgmt-core
+ msrest
+ msrestazure
+ ];
# no tests included
doCheck = false;
diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
index 9538ed2a2345..628d0bbcac03 100644
--- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-marketplaceordering";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "85103080f9e59215036bdfb8f806d91ea182d72c46a13f55c3acc479849351e3";
+ sha256 = "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index ec1caa5c3e4a..35dc7ef05aba 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "1.0.0";
+ version = "2.0.0";
pname = "azure-mgmt-netapp";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "e2c0cecd634c0a106e389f39ad767bfd1d718d90692e4e3c9664b1fe9a792ade";
+ sha256 = "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index b15fd3afa097..f70c8420c829 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -10,14 +10,14 @@
}:
buildPythonPackage rec {
- version = "17.1.0";
+ version = "18.0.0";
pname = "azure-mgmt-network";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab";
+ sha256 = "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
index 18e4a12d3b36..be011a1ed002 100644
--- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
@@ -1,5 +1,4 @@
-{ lib, python, buildPythonPackage, fetchPypi, isPy27
-, fetchpatch
+{ lib, buildPythonPackage, fetchPypi, isPy27
, azure-common
, azure-core
, msrest
@@ -8,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "0.4.1";
+ version = "0.6.2";
pname = "azure-multiapi-storage";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3";
+ sha256 = "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc";
};
propagatedBuildInputs = [
@@ -25,14 +24,6 @@ buildPythonPackage rec {
requests
];
- # Fix to actually install the package
- patches = [
- (fetchpatch {
- url = "https://github.com/Azure/azure-multiapi-storage-python/pull/29/commits/1c8b08dfc9c5445498de3475dec8820eafbd0ca1.patch";
- sha256 = "1f80sdbw4pagrlp9dhcimhp23sdmy0whiba07aa84agkpv4df9ny";
- })
- ];
-
# fix namespace
pythonNamespaces = [ "azure.multiapi" ];
diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix
index cd42be98f9ff..7367e9604b9a 100644
--- a/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-storage-blob";
- version = "12.7.1";
+ version = "12.8.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "c6249f211684929ea6c9d34b5151b06d039775344f0d48fcf479736ed4c11b9e";
+ sha256 = "36b85a3423379d4a93f663022487cf53aa3043a355f8414321dde878c00cb577";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
index d6fecfbdfb91..a7403e16123a 100644
--- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
+++ b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, pythonAtLeast }:
buildPythonPackage rec {
pname = "backports.ssl_match_hostname";
version = "3.7.0.1";
+ disabled = pythonAtLeast "3.7";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix
index 5d0f098b8a31..95bb22ce2cb8 100644
--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/pkgs/development/python-modules/bayespy/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "bayespy";
- version = "0.5.21";
+ version = "0.5.22";
# Python 2 not supported and not some old Python 3 because MPL doesn't support
# them properly.
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0d86e9ae73e6472c26aeb4de7abd9bf99492fedcbb0485ed7fa23609d2673b42";
+ sha256 = "ed0057dc22bd392df4b3bba23536117e1b2866e3201b12c5a37428d23421a5ba";
};
checkInputs = [ pytest nose glibcLocales ];
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 2c4f495a7fff..88369f41872b 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -16,14 +16,14 @@
}:
buildPythonPackage rec {
- version = "2.3.3";
+ version = "2.3.4";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0767ap2n9vk9dz40njndfhaprajr75fvzx7igbd1szc6x8wri8nr";
+ sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA=";
};
# Tests require files not included in the PyPI archive.
diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index 53633b041f7e..64bfdb89efb8 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitarray";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e31b472ac92e04ea943723cf781ec168e15049d91a3052203defb81652d2b086";
+ sha256 = "fe4444d92b17073bf1f9f24e3015a0e5bb70a645c47df93ef8a9ce8be33fcbad";
};
pythonImportsCheck = [ "bitarray" ];
diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 38390e8377e9..f229beb2b049 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -1,14 +1,16 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi
+, bluez, dbus-next, pytestCheckHook, pytest-cov
+}:
buildPythonPackage rec {
pname = "bleak";
- version = "0.10.0";
+ version = "0.11.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "5c3a873965f2910865895e572e7a4f10533d6e150e6ba17936397426bf8d1eee";
+ sha256 = "1zs5lz3r17a2xn19i4na132iccyjsl9navj0d3v7gks7hlcad5kp";
};
postPatch = ''
@@ -19,10 +21,11 @@ buildPythonPackage rec {
--replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\"
'';
- propagatedBuildInputs = [ txdbus ];
- checkInputs = [ pytest pytestcov ];
+ propagatedBuildInputs = [ dbus-next ];
- checkPhase = "AGENT_OS=linux py.test";
+ checkInputs = [ pytestCheckHook pytest-cov ];
+
+ pythonImportsCheck = [ "bleak" ];
meta = with lib; {
description = "Bluetooth Low Energy platform Agnostic Klient for Python";
diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix
index f4842981c4a7..0986a5dc7c43 100644
--- a/pkgs/development/python-modules/boltons/default.nix
+++ b/pkgs/development/python-modules/boltons/default.nix
@@ -1,19 +1,35 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "boltons";
- version = "20.2.0";
+ version = "20.2.1";
# No tests in PyPi Tarball
src = fetchFromGitHub {
owner = "mahmoud";
repo = "boltons";
rev = version;
- sha256 = "08rd6av8dp5n1vz6nybmayl1mfsmj66cskiaybfshcgix29ca803";
+ sha256 = "0vw0h0z81gfxgjfijqiza92ic0siv9xy65mklgj5d0dzr1k9waw8";
};
- checkInputs = [ pytest ];
- checkPhase = "pytest tests";
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/mahmoud/boltons/commit/754afddf141ea26956c88c7e13fe5e7ca7942654.patch";
+ sha256 = "14kcq8pl4pmgcnlnmj1sh1yrksgym0kn0kgz2648g192svqkbpz8";
+ })
+ ];
+
+ checkInputs = [ pytestCheckHook ];
+ disabledTests = [
+ # This test is broken without this PR, which has not yet been merged
+ # https://github.com/mahmoud/boltons/pull/283
+ "test_frozendict_ior"
+ ];
meta = with lib; {
homepage = "https://github.com/mahmoud/boltons";
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index b8d184a05815..4f4aece6761c 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.17.25"; # N.B: if you change this, change botocore and awscli to a matching version
+ version = "1.17.34"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Jz6WriuVpgNqTDVH52onCxerdhzHYFOCPJ42HSaCE+8=";
+ sha256 = "sha256-jzPLPS/EKwVHpVYKbXOXqpMzb1CJk4Z2KyRQaCwOmSs=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index d6069e14a9be..e04c2e5aeff4 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.20.25"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.20.34"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-uAtO/l+vsp8ko2V9H3eqFwUlyHa1/ZOE1eWFnQQFIG4=";
+ sha256 = "sha256-dJvbFR40AynxslYAv+nSI+kw+LomvXS3FHjKV4Hy/q8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix
index 3e86aac02f1f..e4f9d63bd6b1 100644
--- a/pkgs/development/python-modules/brother/default.nix
+++ b/pkgs/development/python-modules/brother/default.nix
@@ -1,25 +1,33 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
, pysnmp
-, asynctest, pytestcov, pytestrunner, pytest-asyncio, pytest-trio, pytest-tornasync }:
+, pytest-asyncio
+, pytest-error-for-skips
+, pytest-runner
+, pytest-tornasync
+, pytest-trio
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "brother";
- version = "0.2.1";
+ version = "0.2.2";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
- sha256 = "sha256-yOloGkOVhXcTt0PAjf3yWUItN1okO94DndRFsImiuz4=";
+ sha256 = "sha256-vIefcL3K3ZbAUxMFM7gbbTFdrnmufWZHcq4OA19SYXE=";
};
- # pytest-error-for-skips is not packaged
postPatch = ''
substituteInPlace pytest.ini \
- --replace " --error-for-skips" ""
- substituteInPlace setup.py \
- --replace "\"pytest-error-for-skips\"" ""
+ --replace "--cov --cov-report term-missing " ""
+ substituteInPlace requirements-test.txt \
+ --replace "pytest-cov" ""
'';
propagatedBuildInputs = [
@@ -27,16 +35,18 @@ buildPythonPackage rec {
];
checkInputs = [
- asynctest
- pytestcov
- pytestrunner
pytest-asyncio
- pytest-trio
+ pytest-error-for-skips
+ pytest-runner
pytest-tornasync
+ pytest-trio
+ pytestCheckHook
];
+ pythonImportsCheck = [ "brother" ];
+
meta = with lib; {
- description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP.";
+ description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP";
homepage = "https://github.com/bieniu/brother";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index 46c3bea0b8c5..b5dce09d516f 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -1,25 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
+, filelock
, flit-core
-, toml
-, pep517
-, packaging
-, isPy3k
-, typing
-, pythonOlder
, importlib-metadata
+, isPy3k
+, packaging
+, pep517
+, pytest-mock
+, pytest-xdist
+, pytestCheckHook
+, pythonOlder
+, toml
+, typing
}:
buildPythonPackage rec {
pname = "build";
- version = "0.1.0";
+ version = "0.3.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8";
+ sha256 = "sha256-DrlbLI13DXxMm5LGjCJ8NQu/ZfPsg1UazpCXwYzBX90=";
};
nativeBuildInputs = [
@@ -36,8 +40,25 @@ buildPythonPackage rec {
importlib-metadata
];
- # No tests in archive
- doCheck = false;
+ checkInputs = [
+ filelock
+ pytestCheckHook
+ pytest-mock
+ pytest-xdist
+ ];
+
+ disabledTests = [
+ "test_isolation"
+ "test_isolated_environment_install"
+ "test_default_pip_is_never_too_old"
+ "test_build_isolated - StopIteration"
+ "test_build_raises_build_exception"
+ "test_build_raises_build_backend_exception"
+ "test_projectbuilder.py"
+ "test_projectbuilder.py"
+ ];
+
+ pythonImportsCheck = [ "build" ];
meta = with lib; {
description = "Simple, correct PEP517 package builder";
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index ea4910712ce2..3946170c78cd 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -3,7 +3,7 @@
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
- parameterized, git, openssh, glibcLocales, nixosTests }:
+ parameterized, git, openssh, glibcLocales, ldap3, nixosTests }:
let
withPlugins = plugins: buildPythonPackage {
@@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
- version = "3.0.0";
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0li47fpm398dk69q6g2zjaxx46w00g3n0jszz88kf57sakri553y";
+ sha256 = "0iywcvq1sx9z5f37pw7g9qqm19fr3bymzawb0i2afm737hxr2xfp";
};
propagatedBuildInputs = [
@@ -67,6 +67,9 @@ let
git
openssh
glibcLocales
+ # optional dependency that was accidentally made required for tests
+ # https://github.com/buildbot/buildbot/pull/5857
+ ldap3
];
patches = [
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index 71da12049e9d..98666faee434 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0ihcxdkbm1lq79fdjmcrj316zh6sjlc3162yynww8nggv2mlnz6v";
+ sha256 = "1vraxisvgnl9q2rgsmfdh1ywja125s97xqicrdx9mbmrwaka2a40";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
index a9a9538f5b92..b2d7cc38bedf 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0pk7h5wwvmdn74ngj5rspz7z9y80ryzgqd2z2qy7kf9chpz7qczk";
+ sha256 = "0lzlghgsb247w0aw0x7vqw4f980kfbbbvjw48fcq9951qcqkr1sf";
};
# Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1y9dpxi7r5r2ya5y0i28b4g5fvla6wrbjz9rffqaqldf4h316jx2";
+ sha256 = "1sqmmxxi0npjcha3xfyy4ldqaks8hmlhilnyvzsfi56n9s96z1cj";
};
buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0vhnqqxl693b2d14ayifpjz8zlg3dngl127svr08amzmbad7irh1";
+ sha256 = "1w4mf8gi71ycf0m93cv1qqly36xnnrmpangzv0pvx23czs96lcms";
};
buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1dgs33z3sjr3s8ymqyxjkx2g6iah3p91ng9hxllmyyp4xpxaxyhk";
+ sha256 = "1a9ssl0plzrs150n958h7aasm0h64whixckfl1y2y3750qy3vrd2";
};
buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "06j6f2k0r8nyh8swh689cy4zq50lmy5glx0pa3zdpnk02k4x3q72";
+ sha256 = "1wcli3vymsqc720jj23ir86lirshb3p8szp7m21lz13g9mpj0idl";
};
buildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
index 7feb409a26d4..d9dea034eab2 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0zrd9h9i7fnmh81zvscxzq3rspyvjvidzbgcziq2m0z522krs8qq";
+ sha256 = "1xvn0m8vijzfrm5sdls3n4ca8iyrnxsprl6dj15f7zy9rms4m47p";
};
propagatedBuildInputs = [ twisted future ];
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 7f7afd67e7e0..834dd42bc087 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zc.buildout";
- version = "2.13.3";
+ version = "2.13.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn";
+ sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63";
};
patches = [ ./nix.patch ];
diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index 395978396a59..aa1e3d1d8648 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "bx-python";
- version = "0.8.10";
+ version = "0.8.11";
disabled = isPy27;
src = fetchFromGitHub {
owner = "bxlab";
repo = "bx-python";
rev = "v${version}";
- sha256 = "09q5nrv0w9b1bclc7g80bih87ikffhvia22d6cpdc747wjrzz8il";
+ sha256 = "0cz5vgw19hmkcg689vr540q2gl2lb3xcf1lphm7zbfp8wmypcadm";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 6d86ccb95430..ea6e2ed079ab 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "0.18.3";
+ version = "0.19.1";
disabled = isPy27;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
- sha256 = "1wbwccwizndiww9a3x1jhixzpcg2qmqlxidk2rqnrzvp04lb8b0q";
+ sha256 = "0fkkz5k3h4pkxacrbacamnh4yfghxgajdzzmdlck7i4v5x06vz8f";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index 95bb9660d4cf..de833e18be8e 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -1,4 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }:
+{ lib
+, breezy
+, build
+, buildPythonPackage
+, fetchPypi
+, git
+, mock
+, pep517
+, pytestCheckHook
+, toml
+}:
buildPythonPackage rec {
pname = "check-manifest";
@@ -14,9 +24,20 @@ buildPythonPackage rec {
substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist"
'';
- propagatedBuildInputs = [ build pep517 toml ];
+ propagatedBuildInputs = [
+ build
+ pep517
+ toml
+ ];
- checkInputs = [ mock breezy git ];
+ checkInputs = [
+ breezy
+ git
+ mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "check_manifest" ];
meta = with lib; {
homepage = "https://github.com/mgedmin/check-manifest";
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 8a915d520e5c..9a01a030e685 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -18,6 +18,26 @@ buildPythonPackage rec {
sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n";
};
+ patches = [
+ # 1/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
+ (fetchpatch {
+ url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/59c0e19d7df8680e36afc96756dce72435121448.patch";
+ sha256 = "1jachbvp505gndccdhny0c3grzdrmvmbzq4kw55jx93ay94ni6p0";
+ })
+ # 2/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
+ (fetchpatch {
+ url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/4a6287b73539adcb7b0ae72d69644a1ced1f7eaa.patch";
+ sha256 = "0nz40qmgxknkbjsdzfzcqfxdsmsxx3v104fb0h04yvs76mqvw3i4";
+ })
+ # 3/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
+ (fetchpatch {
+ url = "https://github.com/cherrypy/cherrypy/commit/3bae7f06868553b006915f05ff14d86163f59a7d.patch";
+ sha256 = "1z0bv23ybyw87rf1i8alsdi3gc2bzmdj9d0kjsghdkvi3zdp4n8q";
+ })
+ ];
+
+ nativeBuildInputs = [ setuptools_scm ];
+
propagatedBuildInputs = [
# required
cheroot portend more-itertools zc_lockfile
@@ -26,8 +46,6 @@ buildPythonPackage rec {
routes
];
- nativeBuildInputs = [ setuptools_scm ];
-
checkInputs = [
objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
];
diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix
index 859fb091ec99..e15a062a8939 100644
--- a/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/pkgs/development/python-modules/ckcc-protocol/default.nix
@@ -4,19 +4,18 @@
, ecdsa
, hidapi
, fetchPypi
-, pytest
, pyaes
, pythonOlder
}:
buildPythonPackage rec {
pname = "ckcc-protocol";
- version = "1.0.3";
+ version = "1.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d83a77d94e9563c3fb0e982d847ec88ba6ac45e3e008e5e53729c0b9800097fc";
+ sha256 = "b660225ac06fc06ad17b33ece428126eef785388450e14313f72d25d4082c5ab";
};
propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix
index 5b94dc78cd6a..7379d6dc6c96 100644
--- a/pkgs/development/python-modules/cmarkgfm/default.nix
+++ b/pkgs/development/python-modules/cmarkgfm/default.nix
@@ -1,25 +1,29 @@
-{ lib, buildPythonPackage, fetchPypi, cffi, pytest }:
+{ lib
+, buildPythonPackage
+, cffi
+, fetchPypi
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "cmarkgfm";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchPypi {
inherit pname version;
- sha256 = "e7d65b90645faa55c28886d01f658235af08b4c4edbf9d959518a17007dd20b4";
+ sha256 = "sha256-tqVJq6Mnq9mG1nSM8hyGN9dBx2hQ5/773vjSi/4TjjI=";
};
propagatedBuildInputs = [ cffi ];
- checkInputs = [ pytest ];
+ checkInputs = [ pytestCheckHook ];
- checkPhase = ''
- py.test
- '';
+ pythonImportsCheck = [ "cmarkgfm" ];
meta = with lib; {
description = "Minimal bindings to GitHub's fork of cmark";
homepage = "https://github.com/jonparrott/cmarkgfm";
license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/cmigemo/default.nix b/pkgs/development/python-modules/cmigemo/default.nix
new file mode 100644
index 000000000000..907e144c86ea
--- /dev/null
+++ b/pkgs/development/python-modules/cmigemo/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchPypi, six, cmigemo, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "cmigemo";
+ version = "0.1.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "09j68kvcskav2cqb7pj12caksmj4wh2lhjp0csq00xpn0wqal4vk";
+ };
+
+ propagatedBuildInputs = [ six ];
+
+ preConfigure = ''
+ export LDFLAGS="-L${cmigemo}/lib"
+ export CPPFLAGS="-I${cmigemo}/include"
+ export LD_LIBRARY_PATH="${cmigemo}/lib"
+ '';
+
+ postPatch = ''
+ sed -i 's~dict_path_base = "/usr/share/cmigemo"~dict_path_base = "/${cmigemo}/share/migemo"~g' test/test_cmigemo.py
+ '';
+
+ checkInputs = [ pytestCheckHook ];
+
+ pytestFlagsArray = [ "test/" ];
+
+ pythonImportsCheck = [ "cmigemo" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mooz/python-cmigemo";
+ description = "A pure python binding for C/Migemo";
+ license = licenses.mit;
+ maintainers = with maintainers; [ illustris ];
+ };
+}
diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix
index 0740ee33b5f1..daff7bc76d38 100644
--- a/pkgs/development/python-modules/colorlog/default.nix
+++ b/pkgs/development/python-modules/colorlog/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "colorlog";
- version = "4.7.2";
+ version = "4.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0lc2r105hxbyh29dsgczdi379lh57gnbj56jsxi5g9rqcihmpl0q";
+ sha256 = "sha256-WbUxYMYJAsQFzewo04NW4J1AaGZZBIiT4CbsvViVFrE=";
};
checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix
index 5c232f66ace0..cc26142d362b 100644
--- a/pkgs/development/python-modules/convertdate/default.nix
+++ b/pkgs/development/python-modules/convertdate/default.nix
@@ -9,16 +9,15 @@
buildPythonPackage rec {
pname = "convertdate";
- version = "2.3.1";
-
+ version = "2.3.2";
disabled = isPy27;
# Tests are not available in the PyPI tarball so use GitHub instead.
src = fetchFromGitHub {
owner = "fitnr";
repo = pname;
- rev = version;
- sha256 = "1g8sgd3xc9viy0kb1i4xp6bdn1hzwhrnk8kmismla88scivrhq32";
+ rev = "v${version}";
+ sha256 = "0k7j59sbqwyi72vcjx5vsh3qb6hxfnkfjkd2i6f6lckdr1bkh7fz";
};
propagatedBuildInputs = [
@@ -30,6 +29,8 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pythonImportsCheck = [ "convertdate" ];
+
meta = with lib; {
homepage = "https://github.com/fitnr/convertdate";
description = "Utils for converting between date formats and calculating holidays";
diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index 308070355790..577fef8d79d9 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, python-dateutil
-, pytest
+, pytestCheckHook
, pytz
, natsort
, tzlocal
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "croniter";
- version = "0.3.37";
+ version = "1.0.9";
src = fetchPypi {
inherit pname version;
- sha256 = "12ced475dfc107bf7c6c1440af031f34be14cd97bbbfaf0f62221a9c11e86404";
+ sha256 = "708532f70584207e23ef2989ca40f367e6238bfe050133a1aff43e1e0e6f6092";
};
propagatedBuildInputs = [
@@ -23,15 +23,11 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest
+ pytestCheckHook
pytz
tzlocal
];
- checkPhase = ''
- pytest src/croniter
- '';
-
meta = with lib; {
description = "croniter provides iteration for datetime object with cron like format";
homepage = "https://github.com/kiorky/croniter";
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index 4ea08c8a7b0c..8bfe8ea2948d 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -1,29 +1,43 @@
{ lib
, buildPythonPackage
-, isPy27
+, pythonOlder
, fetchPypi
+, setuptools-scm
+, toml
+, importlib-metadata
, mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "cssutils";
- version = "2.0.0";
+ version = "2.2.0";
- disabled = isPy27;
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "984b5dbe3a2a0483d7cb131609a17f4cbaa34dda306c419924858a88588fed7c";
+ sha256 = "5bef59f6b59bdccbea8e36cb292d2be1b6be1b485fc4a9f5886616f19eb31aaf";
};
+ nativeBuildInputs = [
+ setuptools-scm
+ toml
+ ];
+
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
+ ];
+
checkInputs = [
mock
pytestCheckHook
];
disabledTests = [
- "test_parseUrl" # accesses network
+ # access network
+ "test_parseUrl"
+ "encutils"
];
pythonImportsCheck = [ "cssutils" ];
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 5c4978a388f2..f5d262f0b8fd 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -1,32 +1,35 @@
{ lib, buildPythonPackage
-, fetchPypi, isPy3k, linuxPackages
-, fastrlock, numpy, six, wheel, pytest, mock, setuptools
-, cudatoolkit, cudnn, nccl
+, fetchPypi, isPy3k, cython
+, fastrlock, numpy, six, wheel, pytestCheckHook, mock, setuptools
+, cudatoolkit, cudnn, cutensor, nccl
+, addOpenGLRunpath
}:
buildPythonPackage rec {
pname = "cupy";
- version = "8.4.0";
+ version = "8.5.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "58d19af6b2e83388d4f0f6ca4226bae4b947920d2ca4951c2eddc8bc78abf66b";
+ sha256 = "fb3f8d3b3454beb249b9880502a45fe493c5a44efacc4c72914cbe1a5dbdf803";
};
- checkInputs = [
- pytest
- mock
+ preConfigure = ''
+ export CUDA_PATH=${cudatoolkit}
+ '';
+
+ nativeBuildInputs = [
+ addOpenGLRunpath
+ cython
];
- preConfigure = ''
- export CUDA_PATH=${cudatoolkit}
- '';
+ LDFLAGS = "-L${cudatoolkit}/lib/stubs";
propagatedBuildInputs = [
cudatoolkit
cudnn
- linuxPackages.nvidia_x11
+ cutensor
nccl
fastrlock
numpy
@@ -35,8 +38,20 @@ buildPythonPackage rec {
wheel
];
- # In python3, test was failed...
- doCheck = !isPy3k;
+ checkInputs = [
+ pytestCheckHook
+ mock
+ ];
+
+ # Won't work with the GPU, whose drivers won't be accessible from the build
+ # sandbox
+ doCheck = false;
+
+ postFixup = ''
+ find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+ addOpenGLRunpath "$lib"
+ done
+ '';
enableParallelBuilding = true;
diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix
index 31875abd1e83..fb1eceda7f2b 100644
--- a/pkgs/development/python-modules/curio/default.nix
+++ b/pkgs/development/python-modules/curio/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, isPy3k
, pytestCheckHook
, sphinx
@@ -16,6 +17,20 @@ buildPythonPackage rec {
sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744";
};
+ patches = [
+ # Fix the flaky test due to slow moving time on Apple Silicon chips.
+ # Remove when https://github.com/dabeaz/curio/pull/339 is in the next release.
+ (fetchpatch {
+ url = "https://github.com/dabeaz/curio/commit/132376724bbfaa0a52d3d63d0791aa4ac1eb6f5f.patch";
+ sha256 = "sha256-AxO0xRcR9l9/NKEJFwyZIoYcyZxpqOhpdNaeaYokVb4=";
+ })
+ # Same as above
+ (fetchpatch {
+ url = "https://github.com/dabeaz/curio/commit/8ac2f12a2cdacbc750b01fc7459cee8879bc1ee3.patch";
+ sha256 = "sha256-2Si3fuDLrI09QuzJd1TrE0QY02G9e9m+1eHFTB/MrWU=";
+ })
+ ];
+
disabled = !isPy3k;
checkInputs = [ pytestCheckHook sphinx ];
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index a7115d1e940d..a553aeab65c0 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, python
+, fetchpatch
, fetchPypi
, pari
, gmp
@@ -11,13 +12,23 @@
buildPythonPackage rec {
pname = "cypari2";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
- version = "2.1.1";
+ version = "2.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db";
+ sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a";
};
+ patches = [
+ # patch to avoid some segfaults in sage's totallyreal.pyx test.
+ # (https://trac.sagemath.org/ticket/27267). depends on Cython patch.
+ (fetchpatch {
+ name = "use-trashcan-for-gen.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555";
+ sha256 = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8=";
+ })
+ ];
+
# This differs slightly from the default python installPhase in that it pip-installs
# "." instead of "*.whl".
# That is because while the default install phase succeeds to build the package,
@@ -48,7 +59,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Cython bindings for PARI";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = teams.sage.members;
homepage = "https://github.com/defeo/cypari2";
};
diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 201a8c42d689..d075360d1a44 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -1,5 +1,4 @@
{ lib
-, fetchpatch
, fetchPypi
, buildPythonPackage
, cython
@@ -10,23 +9,13 @@ assert pariSupport -> pari != null;
buildPythonPackage rec {
pname = "cysignals";
- version = "1.10.2";
+ version = "1.10.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1ckxzch3wk5cg80mppky5jib5z4fzslny3001r5zg4ar1ixbc1w1";
+ sha256 = "sha256-XEYGxDV3UCgxb3Jf23y4lOPK4Lb9L4YqDSlxdIRptDo=";
};
- patches = [
- # fixes intermittent crashes in Sage tests (including in interfaces/singular.py)
- # will be included in cysignals 1.10.3: https://github.com/sagemath/cysignals/pull/127
- (fetchpatch {
- name = "fix-verify_exc_value.patch";
- url = "https://github.com/sagemath/cysignals/commit/49a7eee4bba3ab8f340cf56c371fa4f5ed702dcc.patch";
- sha256 = "sha256-Pfc5tL9VDSP6ftDoHoIb+MDi5rjYqr0PRfIajFuuYVs=";
- })
- ];
-
# explicit check:
# build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE"
hardeningDisable = [
diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix
index 54cec0f98add..547b9a3af7a2 100644
--- a/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "databricks-cli";
- version = "0.14.2";
+ version = "0.14.3";
src = fetchPypi {
inherit pname version;
- sha256 = "9e956f0efb7aad100d9963f223db986392cf2dc3e9922f2f83e55d372e84ef16";
+ sha256 = "bdf89a3917a3f8f8b99163e38d40e66dc478c7408954747f145cd09816b05e2c";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix
index cb72bef323b5..17116eb130f9 100644
--- a/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/pkgs/development/python-modules/databricks-connect/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
- version = "7.3.9";
+ version = "8.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f789515f3be1bd1f88043110d62859b01a9661e384a81f1768fca4e4bb49a358";
+ sha256 = "3726c648cc60796294356e2617acc534d2503824ccfbdff26abbea595eb83135";
};
sourceRoot = ".";
diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index fc349cdc277b..cc06297c4ea0 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -3,6 +3,8 @@
, fetchFromGitHub
, dill
, filelock
+, fsspec
+, huggingface-hub
, multiprocess
, numpy
, pandas
@@ -14,18 +16,20 @@
buildPythonPackage rec {
pname = "datasets";
- version = "1.1.2";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = version;
- hash = "sha256-upXZ2rOfmjnJbDo6RMGeHv/fe10RQAf/zwDWWKdt6SA=";
+ hash = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE=";
};
propagatedBuildInputs = [
dill
filelock
+ fsspec
+ huggingface-hub
multiprocess
numpy
pandas
@@ -36,7 +40,9 @@ buildPythonPackage rec {
];
postPatch = ''
- substituteInPlace setup.py --replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"'
+ substituteInPlace setup.py \
+ --replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"' \
+ --replace "huggingface_hub==0.0.2" "huggingface_hub>=0.0.2"
'';
# Tests require pervasive internet access.
diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index ad5cc8bfb03f..d656a203b9e8 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "datashader";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-CnV6ne3cbMtoVUBDqXf4n3tlEMzuKp7H8Ju7Qrzn9es=";
+ sha256 = "a135612876dc3e4b16ccb9ddb70de50519825c8c1be251b49aefa550bcf8a39a";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index 18560734bd85..b5b6f277fd65 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dbf";
- version = "0.99.0";
+ version = "0.99.1";
src = fetchPypi {
inherit pname version;
- sha256 = "a4a7a8cdc113d840142d21a796c16c7d329ad35c48f17156446732c83ebc571a";
+ sha256 = "4ed598a3866dfe7761b8099cf53ab44cb6ed5e4a7dbffb0da8c67a4af8d62fc5";
};
propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34;
diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix
index 0374bebe4f95..c6e309335289 100644
--- a/pkgs/development/python-modules/deprecated/default.nix
+++ b/pkgs/development/python-modules/deprecated/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "Deprecated";
- version = "1.2.11";
+ version = "1.2.12";
src = fetchPypi {
inherit pname version;
- sha256 = "471ec32b2755172046e28102cd46c481f21c6036a0ec027521eba8521aa4ef35";
+ sha256 = "6d2de2de7931a968874481ef30208fd4e08da39177d61d3d4ebdf4366e7dbca1";
};
propagatedBuildInputs = [ wrapt ];
diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix
index 1e388fd3a117..db26b089e419 100644
--- a/pkgs/development/python-modules/devolo-home-control-api/default.nix
+++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix
@@ -2,28 +2,26 @@
, aiohttp
, buildPythonPackage
, fetchFromGitHub
-, pytestCheckHook
-, pytest-cov
, pytest-mock
+, pytestCheckHook
+, pythonOlder
, requests
-, zeroconf
, websocket_client
-, pytest-runner
+, zeroconf
}:
buildPythonPackage rec {
pname = "devolo-home-control-api";
- version = "0.16.0";
+ version = "0.17.0";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "2Fake";
repo = "devolo_home_control_api";
rev = "v${version}";
- sha256 = "19zzdbx0dxlm8pq0yk00nn9gqqblgpp16fgl7z6a98hsa6459zzb";
+ sha256 = "sha256-g82YmlxlBdyNn7KPU+k+J3/P7ABWMMdLXUpXWnCkdpM=";
};
- nativeBuildInputs = [ pytest-runner ];
-
propagatedBuildInputs = [
requests
zeroconf
@@ -32,12 +30,22 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytest-cov
pytest-mock
];
+ postPatch = ''
+ # setup.py is not able to detect the version with setuptools_scm
+ substituteInPlace setup.py \
+ --replace "setuptools_scm" "" \
+ --replace 'use_scm_version=True' 'use_scm_version="${version}"'
+ '';
+
# Disable test that requires network access
- disabledTests = [ "test__on_pong" ];
+ disabledTests = [
+ "test__on_pong"
+ "TestMprm"
+ ];
+
pythonImportsCheck = [ "devolo_home_control_api" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix
index d5f1445a6771..025939f2db28 100644
--- a/pkgs/development/python-modules/digi-xbee/default.nix
+++ b/pkgs/development/python-modules/digi-xbee/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "digi-xbee";
- version = "1.3.0";
+ version = "1.4.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "2ed798faee0853bf7ae9ca5aa4bdcbab496e3c2d56c9f0719a8e3e0d13270891";
+ sha256 = "664737d1aab453ea40b9745f1ee1e88920acff1cce2e07c42e7f5aa64a16e6aa";
};
propagatedBuildInputs = [ pyserial srp ];
@@ -15,6 +15,24 @@ buildPythonPackage rec {
# Upstream doesn't contain unit tests, only functional tests which require specific hardware
doCheck = false;
+ pythonImportsCheck = [
+ "digi.xbee.models"
+ "digi.xbee.packets"
+ "digi.xbee.util"
+ "digi.xbee.comm_interface"
+ "digi.xbee.devices"
+ "digi.xbee.exception"
+ "digi.xbee.filesystem"
+ "digi.xbee.firmware"
+ "digi.xbee.io"
+ "digi.xbee.profile"
+ "digi.xbee.reader"
+ "digi.xbee.recovery"
+ "digi.xbee.sender"
+ "digi.xbee.serial"
+ "digi.xbee.xsocket"
+ ];
+
meta = with lib; {
description = "Python library to interact with Digi International's XBee radio frequency modules";
homepage = "https://github.com/digidotcom/xbee-python";
diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix
index 2271be1d16f4..d89bc6023c69 100644
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/pkgs/development/python-modules/django-auth-ldap/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "django-auth-ldap";
- version = "2.2.0";
+ version = "2.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf";
+ sha256 = "5894317122a086c9955ed366562869a81459cf6b663636b152857bb5d3a0a3b7";
};
propagatedBuildInputs = [ ldap django ];
diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix
new file mode 100644
index 000000000000..c9344d3bd010
--- /dev/null
+++ b/pkgs/development/python-modules/django-cacheops/default.nix
@@ -0,0 +1,36 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, django
+, funcy
+, redis
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "django-cacheops";
+ version = "5.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-1YUc178whzhKH87PqN3bj1UDDu39b98SciW3W8oPmd0=";
+ };
+
+ propagatedBuildInputs = [
+ django
+ funcy
+ redis
+ six
+ ];
+
+ # tests need a redis server
+ # pythonImportsCheck not possible since DJANGO_SETTINGS_MODULE needs to be set
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A slick ORM cache with automatic granular event-driven invalidation for Django";
+ homepage = "https://github.com/Suor/django-cacheops";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ petabyteboy ];
+ };
+}
diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix
index 16b1e0bcc59f..3d9d885daf7a 100644
--- a/pkgs/development/python-modules/django-q/default.nix
+++ b/pkgs/development/python-modules/django-q/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "django-q";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "523d54dcf1b66152c1b658f914f00ed3b518a3432a9decd4898738ca8dbbe10f";
+ sha256 = "8871c602e2c7e892fbedc271d5b91c4a96803b689c3ee2f15464931f99f4e32b";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix
index 0724bf27b317..2a7f1e1da26d 100644
--- a/pkgs/development/python-modules/django-simple-captcha/default.nix
+++ b/pkgs/development/python-modules/django-simple-captcha/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "django-simple-captcha";
- version = "0.5.13";
+ version = "0.5.14";
src = fetchPypi {
inherit pname version;
- sha256 = "5e43ba3b61daf690ac0319157837bb57e31df8bddbdc9a59ef42ef1a99e21fa2";
+ sha256 = "84b5c188e6ae50e9ecec5e5d734c5bc4d2a50fbbca7f59d2c12da9a3bbee5051";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix
index a452db3cf281..3f717b0fb5ce 100644
--- a/pkgs/development/python-modules/django_contrib_comments/default.nix
+++ b/pkgs/development/python-modules/django_contrib_comments/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "django-contrib-comments";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "26350b2c353816570a74b7fb19c558ce00288625ac32886a5274f4f931c098f9";
+ sha256 = "d82f1d04690550df026553053903deec0c52dc54212e1b79241b08f0355cff2c";
};
propagatedBuildInputs = [ django ];
diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix
new file mode 100644
index 000000000000..6699050035d0
--- /dev/null
+++ b/pkgs/development/python-modules/dwdwfsapi/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, ciso8601
+}:
+
+buildPythonPackage rec {
+ pname = "dwdwfsapi";
+ version = "1.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-PX1b1msaZH8HKVBo3GU7TOr8Lo7INLjjJBkDHHs6mzk=";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ciso8601
+ ];
+
+ # All tests require network access
+ doCheck = false;
+
+ pythonImportsCheck = [ "dwdwfsapi" ];
+
+ meta = with lib; {
+ description = "Python client to retrieve data provided by DWD via their geoserver WFS API";
+ homepage = "https://github.com/stephan192/dwdwfsapi";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix
index 4a85e5b88366..108c5287eb6e 100644
--- a/pkgs/development/python-modules/easygui/default.nix
+++ b/pkgs/development/python-modules/easygui/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage, tkinter }:
buildPythonPackage rec {
pname = "easygui";
@@ -9,8 +9,18 @@ buildPythonPackage rec {
sha256 = "073f728ca88a77b74f404446fb8ec3004945427677c5618bd00f70c1b999fef2";
};
+ postPatch = ''
+ substituteInPlace setup.py --replace README.md README.txt
+ '';
+
+ propagatedBuildInputs = [
+ tkinter
+ ];
+
doCheck = false; # No tests available
+ pythonImportsCheck = [ "easygui" ];
+
meta = with lib; {
description = "Very simple, very easy GUI programming in Python";
homepage = "https://github.com/robertlugg/easygui";
diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix
index 9161525c2bc6..465e8f6c772a 100644
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage (rec {
pname = "elasticsearch";
- version = "7.10.1";
+ version = "7.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a725dd923d349ca0652cf95d6ce23d952e2153740cf4ab6daf4a2d804feeed48";
+ sha256 = "1e24b33a82bf381b42d3b0d390f76fdb9d6a9d47b310dea8eaeb0a5933c394c0";
};
# Check is disabled because running them destroy the content of the local cluster!
diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index 745b7a7b105f..c98937804a31 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
buildPythonPackage rec {
- version = "2.2.0";
+ version = "2.2.1";
pname = "elementpath";
disabled = isPy27; # uses incompatible class syntax
@@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "v${version}";
- sha256 = "1xfn5yasi849vs06ffxq6phapm6gc3p8yvdyvqmb47gbnji5mpb5";
+ sha256 = "15yjl18n81zddd27789mcy12gnja3cqycjdykybwgd9i0ysj96gl";
};
# avoid circular dependency with xmlschema which directly depends on this
diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix
new file mode 100644
index 000000000000..0f38faf57340
--- /dev/null
+++ b/pkgs/development/python-modules/evohome-async/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "evohome-async";
+ version = "0.3.8";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "zxdavb";
+ repo = pname;
+ rev = version;
+ sha256 = "04xy72k79cnb8pc19v5jzkc0djazfm6pbm10ysphx06ndwvxr9mn";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "evohomeasync2" ];
+
+ meta = with lib; {
+ description = "Python client for connecting to Honeywell's TCC RESTful API";
+ homepage = "https://github.com/zxdavb/evohome-async";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index 84026d7374c4..f0c67f3ae591 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -1,15 +1,27 @@
-{ lib, buildPythonPackage, fetchzip, pytest, asttokens }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, asttokens
+}:
buildPythonPackage rec {
pname = "executing";
- version = "0.4.3";
+ version = "0.5.4";
- src = fetchzip {
- url = "https://github.com/alexmojaki/executing/archive/v${version}.tar.gz";
- sha256 = "1fqfc26nl703nsx2flzf7x4mgr3rpbd8pnn9c195rca648zhi3nh";
+ src = fetchFromGitHub {
+ owner = "alexmojaki";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv";
};
- checkInputs = [ pytest asttokens ];
+ preBuild = ''
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
+ '';
+
+ # Tests appear to run fine (Ran 22 tests in 4.076s) with setuptoolsCheckPhase
+ # but crash with pytestCheckHook
+ checkInputs = [ asttokens ];
meta = with lib; {
description = "Get information about what a frame is currently doing, particularly the AST node being executed";
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 8513c168cfd6..b0cf3b546fd7 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "fakeredis";
- version = "1.4.5";
+ version = "1.5.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0slb23zxn47a4z8b7jq7gq40g4zsn52y9h29zdqs29b85394gjq1";
+ sha256 = "1ac0cef767c37f51718874a33afb5413e69d132988cb6a80c6e6dbeddf8c7623";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix
index c4dfc04046b7..7972a9374c78 100644
--- a/pkgs/development/python-modules/fints/default.nix
+++ b/pkgs/development/python-modules/fints/default.nix
@@ -1,13 +1,14 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
, bleach
, mt-940
-, pytest
, requests
, sepaxml
+, pytestCheckHook
+, pytest-mock
}:
buildPythonPackage rec {
- version = "3.0.0";
+ version = "3.0.1";
pname = "fints";
disabled = isPy27;
@@ -15,22 +16,17 @@ buildPythonPackage rec {
owner = "raphaelm";
repo = "python-fints";
rev = "v${version}";
- sha256 = "00fqgnmv7z6d792ga4cyzn9lrfjf79jplkssm2jbyb0akfggfj7h";
+ sha256 = "sha256-P9+3QuB5c7WMjic2fSp8pwXrOUHIrLThvfodtbBXLMY=";
};
propagatedBuildInputs = [ requests mt-940 sepaxml bleach ];
- checkInputs = [ pytest ];
-
- # ignore network calls and broken fixture
- checkPhase = ''
- pytest . --ignore=tests/test_client.py -k 'not robust_mode'
- '';
+ checkInputs = [ pytestCheckHook pytest-mock ];
meta = with lib; {
homepage = "https://github.com/raphaelm/python-fints/";
description = "Pure-python FinTS (formerly known as HBCI) implementation";
- license = licenses.lgpl3;
- maintainers = with maintainers; [ elohmeier ];
+ license = licenses.lgpl3Only;
+ maintainers = with maintainers; [ elohmeier dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix
index 6ad99a12581e..13c46ba1e8aa 100644
--- a/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, nose
}:
@@ -8,13 +8,20 @@ buildPythonPackage rec {
version = "0.1.4";
pname = "forbiddenfruit";
- src = fetchPypi {
- inherit pname version;
- sha256 = "e3f7e66561a29ae129aac139a85d610dbf3dd896128187ed5454b6421f624253";
+ src = fetchFromGitHub {
+ owner = "clarete";
+ repo = "forbiddenfruit";
+ rev = version;
+ sha256 = "16chhrxbbmg6lfbzm532fq0v00z8qihcsj0kg2b5jlgnb6qijwn8";
};
checkInputs = [ nose ];
+ preBuild = ''
+ export FFRUIT_EXTENSION="true";
+ '';
+
+ # https://github.com/clarete/forbiddenfruit/pull/47 required to switch to pytest
checkPhase = ''
find ./build -name '*.so' -exec mv {} tests/unit \;
nosetests
@@ -22,7 +29,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Patch python built-in objects";
- homepage = "https://pypi.python.org/pypi/forbiddenfruit";
+ homepage = "https://github.com/clarete/forbiddenfruit";
license = licenses.mit;
};
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index dbc363172288..403ca5247923 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -2,36 +2,31 @@
, buildPythonPackage
, isPy3k
, fetchPypi
-, html5lib
, wcwidth
-, setuptools
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "ftfy";
- version = "5.8";
+ version = "5.9";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "081p5z20dirrf1i3nshylc31qd5mbxibjc7gzj8x4isbiizpdisi";
+ sha256 = "8c4fb2863c0b82eae2ab3cf353d9ade268dfbde863d322f78d6a9fd5cefb31e9";
};
propagatedBuildInputs = [
- html5lib
wcwidth
- setuptools
];
checkInputs = [
- pytest
+ pytestCheckHook
];
- # We suffix PATH like this because the tests want the ftfy executable
- checkPhase = ''
- PATH=$out/bin:$PATH pytest
+ preCheck = ''
+ export PATH=$out/bin:$PATH
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix
index 883ff69c6d68..6d84aa9ae607 100644
--- a/pkgs/development/python-modules/ftputil/default.nix
+++ b/pkgs/development/python-modules/ftputil/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }:
buildPythonPackage rec {
- version = "4.0.0";
+ version = "5.0.1";
pname = "ftputil";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d494c47f24fd3f8fbe92d40d90e0902c0e04288f200688af2b16d6b46fe441e1";
+ sha256 = "394997ccb3cd4825c6e22b5e349c62cf5016c35db4d60940f3513db66d205561";
};
checkInputs = [ pytest freezegun ];
diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix
index c6ccf881156d..5563ff94baf5 100644
--- a/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -6,6 +6,7 @@
, certifi
, six
, backports_ssl_match_hostname
+, pythonOlder
}:
buildPythonPackage rec {
@@ -18,7 +19,8 @@ buildPythonPackage rec {
};
buildInputs = [ pytest ];
- propagatedBuildInputs = [ gevent certifi six backports_ssl_match_hostname ];
+ propagatedBuildInputs = [ gevent certifi six ]
+ ++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ];
# Several tests fail that require network
doCheck = false;
diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix
index 2f5a1416e41c..1ec6ce334200 100644
--- a/pkgs/development/python-modules/glances-api/default.nix
+++ b/pkgs/development/python-modules/glances-api/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "glances-api";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "home-assistant-ecosystem";
repo = "python-glances-api";
rev = version;
- sha256 = "0rgv77n0lvr7d3vk4qc8svipxafmm6s4lfxrl976hsygrhaqidch";
+ sha256 = "sha256-mbkZZg2fmus4kOXFxHE/UV/nxemFAsoEZu8IUa7SPsg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index 83fe052a5422..94516e25a38d 100644
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696";
+ sha256 = "874defad583e90e55a3e83aff27eb5fe108d9197d839cd45f3eacf2395881806";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 8f67fed79d7a..ccc8aa83975f 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0hmsqvs2srmqcwmli48vd5vw829zax3pwj63fsxig6sdhjlf6j7j";
+ sha256 = "c5669410018eb41cecf6f9c90136d24d0ca9ed141bda8fbb3d52cd3de7162960";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 228f3b68b61b..6f2e6c473a34 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.10.0";
+ version = "2.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fac9adb1394d948e259fba1df4e86a6c34cfccaf19af7bdbdf9640cf6e313a71";
+ sha256 = "484bb733e5dd14bb82d28480a5d7f540b8ee59f081fcf32782546b717180d1b8";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 095e01fbbd76..4308408bc59d 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-dataproc";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "07rv2kgbaqkbd71k5i2zn9kcxasfzkkyai8jnbszhkf92k0lmi41";
+ sha256 = "09e53889a60d84a71c505fe77174d242f00f28f989977aea91f6005cadfa466b";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index ab31a8ee4ed4..c266d3e7921d 100644
--- a/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "google-cloud-logging";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8932ac382eee6af85cd08400a77586dd3139fbf40b61db757c4c492490899741";
+ sha256 = "b5675ce159db4e9c1d755003b76190460766f426a7c3c1519014cdd5ce66e890";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 94d8d4738f5c..dcb820640a6b 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "07zvagy9hwaccwvg1xad5nkalgkria0maa5yxiwqf1yk9f7gbyq1";
+ sha256 = "c993129ecb1db6ab9b49cacfa11f368f30c7d897640c56f52558edf542c08ade";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix
index 86fbc360d73c..8787eb6779a1 100644
--- a/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1f67mr473vzv0qgjm4hycfnrjgiqrsv47vqrynwjy9yrca2130y7";
+ sha256 = "957f436986275dcc82483906b424dcabe8d1f8c08ae5c9677bf7547a314b0a59";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
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 a143a418c222..2a50fd5fb606 100644
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "97a46d2318f00c1c6ae1a4ab587e338677c5cc1651d7c6304982d74fa364dd9d";
+ sha256 = "4df4b7e3f83bc12d6bd29e69608172586b6ddfc7586dd2a2fd70cc4f18ed05c7";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index 65ad31af2eb2..be9359350411 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4a77a79e990004af96e789565b174f9b971f00afa23142f6673722dae0910b0c";
+ sha256 = "013279a411644545ee0d67a5c077d0f19db58b846d758f36a8cc759f9c9e0a19";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix
index 007d4eb2cea7..938a472eddf1 100644
--- a/pkgs/development/python-modules/googlemaps/default.nix
+++ b/pkgs/development/python-modules/googlemaps/default.nix
@@ -1,28 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, pytest-cov
+, pytestCheckHook
+, pythonOlder
, requests
, responses
-, pytestCheckHook
-, pytestcov
-, isPy27
}:
buildPythonPackage rec {
pname = "googlemaps";
- version = "4.4.2";
- disabled = isPy27;
+ version = "4.4.5";
+ disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "googlemaps";
repo = "google-maps-services-python";
rev = "v${version}";
- sha256 = "DYhW1OGce/0gY7Jmwq6iM45PxLyXIYo4Cfg2u6Xuyg4=";
+ sha256 = "sha256-Rdfp98UqTMbqcOpkzh0Dz8fNSSbuvCnCztCkxiBgaAA=";
};
propagatedBuildInputs = [ requests ];
- checkInputs = [ pytestCheckHook responses pytestcov ];
+ checkInputs = [
+ pytest-cov
+ pytestCheckHook
+ responses
+ ];
disabledTests = [
# touches network
@@ -30,6 +34,8 @@ buildPythonPackage rec {
"test_transit_without_time"
];
+ pythonImportsCheck = [ "googlemaps" ];
+
meta = with lib; {
homepage = "https://github.com/googlemaps/google-maps-services-python";
description = "Python client library for Google Maps API Web Services";
diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix
index cf0ffb6bb417..ee8d1bde6222 100644
--- a/pkgs/development/python-modules/gradient-utils/default.nix
+++ b/pkgs/development/python-modules/gradient-utils/default.nix
@@ -1,12 +1,13 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchFromGitHub
, hyperopt
-, lib
, mock
, numpy
-, poetry
+, poetry-core
, prometheus_client
, pytestCheckHook
+, requests
}:
buildPythonPackage rec {
@@ -24,23 +25,39 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
- --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"'
+ --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
+ --replace 'wheel = "^0.35.1"' 'wheel = "*"'
'';
- nativeBuildInputs = [ poetry ];
- checkInputs = [ mock pytestCheckHook ];
- propagatedBuildInputs = [ hyperopt prometheus_client numpy ];
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ hyperopt
+ prometheus_client
+ numpy
+ ];
+
+ checkInputs = [
+ mock
+ requests
+ pytestCheckHook
+ ];
+
+ preCheck = ''
+ export HOSTNAME=myhost-experimentId
+ '';
- preCheck = "export HOSTNAME=myhost-experimentId";
disabledTests = [
"test_add_metrics_pushes_metrics" # requires a working prometheus push gateway
];
+ pythonImportsCheck = [ "gradient_utils" ];
+
meta = with lib; {
- description = "Gradient ML SDK";
- homepage = "https://github.com/Paperspace/gradient-utils";
- license = licenses.mit;
- platforms = platforms.unix;
+ description = "Python utils and helpers library for Gradient";
+ homepage = "https://github.com/Paperspace/gradient-utils";
+ license = licenses.mit;
+ platforms = platforms.unix;
maintainers = with maintainers; [ freezeboy ];
};
}
diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix
index c4c6e3b356c6..c74501c621e7 100644
--- a/pkgs/development/python-modules/gradient/default.nix
+++ b/pkgs/development/python-modules/gradient/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "gradient";
- version = "1.4.2";
+ version = "1.4.3";
src = fetchPypi {
inherit pname version;
- sha256 = "2ed10db306d4c8632b7d04d71d44a04331a6e80e5ebab7296a98e67e8a50fb71";
+ sha256 = "a8fa91669c97440049132119019e90d0a9cf09e96352cf43c7c6ca244894bd4e";
};
postPatch = ''
@@ -19,8 +19,9 @@ buildPythonPackage rec {
--replace 'attrs<=' 'attrs>=' \
--replace 'colorama==' 'colorama>=' \
--replace 'PyYAML==' 'PyYAML>=' \
- --replace 'marshmallow<' 'marshmallow>='
- '';
+ --replace 'marshmallow<' 'marshmallow>=' \
+ --replace 'websocket-client==' 'websocket-client>='
+ '';
propagatedBuildInputs = [ attrs boto3 requests gradient_statsd terminaltables
click-completion click-didyoumean click-help-colors requests_toolbelt
diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix
index 97d169283b23..59da8f173d97 100644
--- a/pkgs/development/python-modules/gremlinpython/default.nix
+++ b/pkgs/development/python-modules/gremlinpython/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder
-, pytestCheckHook, pyhamcrest, pytestrunner, pytest
+{ lib, buildPythonPackage, fetchFromGitHub
+, pytestCheckHook, pyhamcrest, pytestrunner
, six, isodate, tornado, aenum, radish-bdd, mock
}:
buildPythonPackage rec {
pname = "gremlinpython";
- version = "3.4.8";
+ version = "3.4.10";
# pypi tarball doesn't include tests
src = fetchFromGitHub {
owner = "apache";
repo = "tinkerpop";
rev = version;
- sha256 = "0kcyhfxz7z4f8i64gig8q1q9dhy24cprbh63vwsdiwryg74q4chl";
+ sha256 = "0i9lkrwbsmpx1h9480vf97pibm2v37sgw2qm2r1c0i8gg5bcmhj3";
};
sourceRoot = "source/gremlin-python/src/main/jython";
postPatch = ''
substituteInPlace setup.py \
+ --replace 'aenum>=1.4.5,<3.0.0' 'aenum' \
--replace 'tornado>=4.4.1,<6.0' 'tornado' \
--replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \
--replace 'radish-bdd==0.8.6' 'radish-bdd' \
diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix
index e66a3f5e9fcb..3552b6922fcd 100644
--- a/pkgs/development/python-modules/h3/default.nix
+++ b/pkgs/development/python-modules/h3/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "h3";
- version = "3.7.1";
+ version = "3.7.2";
# pypi version does not include tests
src = fetchFromGitHub {
owner = "uber";
repo = "h3-py";
rev = "v${version}";
- sha256 = "sha256-MIVV3kZGsIsaJ/ccJOK3+j1VwkUsZGHS5d1sGOBa1Ec=";
+ sha256 = "00yi5ncfhi2wpakwm9visi1jlnnaaha66y90fjcsfyvi4hkm8xv2";
};
dontConfigure = true;
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 102ab3a2540c..0397a2d7629e 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
- version = "0.41.0";
+ version = "0.42.0";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
- sha256 = "sha256-ewWw3PyJGRHP23J6WBBWs9YGl4vTb9/j/soZ6n5wbLM=";
+ sha256 = "sha256-vDgjuNgwNp9cDgiCNxhACOcuaxcrR+0DW/U5OaSW0n4=";
};
postPatch = ''
@@ -49,7 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/NabuCasa/hass-nabucasa";
description = "Home Assistant cloud integration by Nabu Casa, inc.";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ Scriptkiddi ];
};
}
diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix
index 6e381794cff5..d2590d14955c 100644
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -1,8 +1,9 @@
{ lib
, buildPythonPackage
+, fetchpatch
, cython
, numpy
-, nose
+, pytestCheckHook
, scipy
, scikitlearn
, fetchPypi
@@ -18,11 +19,22 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "e3a418d0d36874f7b6a1bf0b7461f3857fc13a525fd48ba34caed2fe8973aa26";
};
-
- checkInputs = [ nose ];
+ patches = [
+ # This patch fixes compatibility with numpy 1.20. It will be in the next release
+ # after 0.8.27
+ (fetchpatch {
+ url = "https://github.com/scikit-learn-contrib/hdbscan/commit/5b67a4fba39c5aebe8187a6a418da677f89a63e0.patch";
+ sha256 = "07d7jdwk0b8kgaqkifd529sarji01j1jiih7cfccc5kxmlb5py9h";
+ })
+ ];
nativeBuildInputs = [ cython ];
propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ];
+ preCheck = ''
+ cd hdbscan/tests
+ rm __init__.py
+ '';
+ checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API";
diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix
index 38a770e879fa..4c74621b483b 100644
--- a/pkgs/development/python-modules/hg-evolve/default.nix
+++ b/pkgs/development/python-modules/hg-evolve/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "hg-evolve";
- version = "10.1.0";
+ version = "10.2.0.post1";
src = fetchPypi {
inherit pname version;
- sha256 = "a386e6ee2d9a0e332a49f1cb210c4c11ba9844bcd52808270f48e688314783d8";
+ sha256 = "391aa877a61ed04c58b8d82d465b3771f632bb9b19f22cbf18f0e5a1f42f8d4e";
};
doCheck = false;
diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix
index 68b1090c3529..f75a84c01b87 100644
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ b/pkgs/development/python-modules/howdoi/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "howdoi";
- version = "2.0.12";
+ version = "2.0.14";
src = fetchPypi {
inherit pname version;
- sha256 = "bab3eab349ec0b534cf1b05a563d45e4d301b914c53a7f2c3446fdcc60497c93";
+ sha256 = "9416be3c8a319fc0764a743a2ad05fa374876dab71dbe15ce86c3a05ece44a0a";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index 9fe636c3591b..2aba203ea01f 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "httpx";
- version = "0.17.0";
+ version = "0.17.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-pRdhPAxKZOVbRhOm4881Dn+IRtpX5T3oFuYdtWp3cgY=";
+ sha256 = "sha256-P4Uki+vlAgVECBUz9UGvv1ip49jmf0kYbyU2/mkWE3U=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
new file mode 100644
index 000000000000..0fce65f2b8bd
--- /dev/null
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, filelock
+, importlib-metadata
+, requests
+, tqdm
+}:
+
+buildPythonPackage rec {
+ pname = "huggingface-hub";
+ version = "0.0.6";
+
+ src = fetchFromGitHub {
+ owner = "huggingface";
+ repo = "huggingface_hub";
+ rev = "v${version}";
+ hash = "sha256-0DSgWmodeRmvGq2v3n86BzRx5Xdb8fIQh+G/2O2d+yo=";
+ };
+
+ propagatedBuildInputs = [
+ filelock
+ requests
+ tqdm
+ ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+
+ # Tests require network access.
+ doCheck = false;
+ pythonImportsCheck = [ "huggingface_hub" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/huggingface/huggingface_hub";
+ description = "Download and publish models and other files on the huggingface.co hub";
+ changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/${version}";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ danieldk ];
+ };
+}
diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix
index 94cef6d07f1f..ef66870ddfd7 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/pkgs/development/python-modules/humanize/default.nix
@@ -9,13 +9,13 @@
}:
buildPythonPackage rec {
- version = "3.1.0";
+ version = "3.2.0";
pname = "humanize";
disabled = isPy27; # setup.py no longer compatible
src = fetchPypi {
inherit pname version;
- sha256 = "fd3eb915310335c63a54d4507289ecc7b3a7454cd2c22ac5086d061a3cbfd592";
+ sha256 = "09ph6fd1362xdn2hgwdgh30z0zqjp3bgvr1akyvm36b8jm400sdb";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix
index 7c34235a190b..0b52402ed441 100644
--- a/pkgs/development/python-modules/hwi/default.nix
+++ b/pkgs/development/python-modules/hwi/default.nix
@@ -7,28 +7,20 @@
, libusb1
, mnemonic
, pyaes
-, pythonAtLeast
+, typing-extensions
}:
buildPythonPackage rec {
pname = "hwi";
- version = "1.2.1";
- disabled = pythonAtLeast "3.9";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "HWI";
rev = version;
- sha256 = "0fs3152lw7y5l9ssr5as8gd739m9lb7wxpv1vc5m77k5nw7l8ax5";
+ sha256 = "0m8maxhjpfxnkry2l0x8143m1gmds8mbwyd9flnkfipxz0r0xwbr";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace "'ecdsa>=0.13.0,<0.14.0'" "'ecdsa'" \
- --replace "'hidapi>=0.7.99,<0.8.0'" "'hidapi'" \
- --replace "'mnemonic>=0.18.0,<0.19.0'" "'mnemonic'"
- '';
-
propagatedBuildInputs = [
bitbox02
ecdsa
@@ -36,6 +28,7 @@ buildPythonPackage rec {
libusb1
mnemonic
pyaes
+ typing-extensions
];
# tests require to clone quite a few firmwares
diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix
new file mode 100644
index 000000000000..223f3893e18d
--- /dev/null
+++ b/pkgs/development/python-modules/iaqualink/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-runner
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "iaqualink";
+ version = "0.4.0";
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "flz";
+ repo = "iaqualink-py";
+ rev = "v${version}";
+ sha256 = "13iwngjjqzr1pkmskbc2wakccvcjkf4bk65f4jp4ywpciilr4zjw";
+ };
+
+ nativeBuildInputs = [ pytest-runner ];
+
+ propagatedBuildInputs = [ aiohttp ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "iaqualink" ];
+
+ meta = with lib; {
+ description = "Python library for Jandy iAqualink";
+ homepage = "https://github.com/flz/iaqualink-py";
+ license = with licenses; [ bsd3 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix
index 89f49d9cf624..2718b6340540 100644
--- a/pkgs/development/python-modules/icmplib/default.nix
+++ b/pkgs/development/python-modules/icmplib/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "icmplib";
- version = "2.0.2";
+ version = "2.1.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ValentinBELYN";
repo = pname;
rev = "v${version}";
- sha256 = "0djsbksgml2h18w6509w59s88730w1xaxdxzws12alq4m5v4hirr";
+ sha256 = "06xx9854yzxa7x1mjfzbhhw5rfzgjnw269j5k0rshyqh3qvw1nwv";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix
index 8ccc7eb4e0c0..3f65b9291ae6 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/pkgs/development/python-modules/ijson/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "ijson";
- version = "3.1.3";
+ version = "3.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "d29977f7235b5bf83c372825c6abd8640ba0e3a8e031d3ffc3b63deaf6ae1487";
+ sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea";
};
doCheck = false; # something about yajl
diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix
index 2f87f24639a6..136415eb54e5 100644
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
- version = "0.38.1";
+ version = "0.39.0";
disabled = isPy27;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
- sha256 = "0b2gnym7p6cwgviwdq8pg2dy28pm5535f8kkc8rzc50knqdifl7g";
+ sha256 = "sha256-PyksCYVe7Ij/+bZpntHgY51I/ZVnC6L20TcKfTLr2CY=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix
index 3805b55bcf19..cf3fca9aa03c 100644
--- a/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -1,5 +1,7 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
-, fetchpatch
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
, pandas
, pytestCheckHook
, scikitlearn
@@ -7,24 +9,14 @@
buildPythonPackage rec {
pname = "imbalanced-learn";
- version = "0.7.0";
+ version = "0.8.0";
disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2
src = fetchPypi {
inherit pname version;
- sha256 = "da59de0d1c0fa66f62054dd9a0a295a182563aa1abbb3bf9224a3678fcfe8fa4";
+ sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w";
};
- patches = [
- # Fix compatibility with scikit-learn 0.24. This patch will be included in releases of
- # imbalanced-learn after 0.7.0
- (fetchpatch {
- url = "https://github.com/scikit-learn-contrib/imbalanced-learn/commit/dc4051fe0011c68d900be05971b71016d4ad9e90.patch";
- sha256 = "1rv61k9wv4q37a0v943clr8fflcg9ly530smgndgkjlxkyzw6swh";
- excludes = ["doc/conf.py" "build_tools/*" "azure-pipelines.yml"];
- })
- ];
-
propagatedBuildInputs = [ scikitlearn ];
checkInputs = [ pytestCheckHook pandas ];
preCheck = ''
@@ -37,6 +29,9 @@ buildPythonPackage rec {
"show_versions"
"test_make_imbalanced_iris"
"test_rusboost[SAMME.R]"
+
+ # https://github.com/scikit-learn-contrib/imbalanced-learn/issues/824
+ "ValueDifferenceMetric"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix
new file mode 100644
index 000000000000..5bfb66fe4c6c
--- /dev/null
+++ b/pkgs/development/python-modules/iminuit/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, isPy3k, fetchPypi, cmake, numpy, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "iminuit";
+ version = "2.4.0";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "350c13d33f3ec5884335aea1cc11a17ae49dd8e6b2181c3f1b3c9c27e2e0b228";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ propagatedBuildInputs = [ numpy ];
+
+ dontUseCmakeConfigure = true;
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ homepage = "https://github.com/scikit-hep/iminuit";
+ description = "Python interface for the Minuit2 C++ library";
+ license = with licenses; [ mit lgpl2Only ];
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix
new file mode 100644
index 000000000000..d281ece24635
--- /dev/null
+++ b/pkgs/development/python-modules/incomfort-client/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "incomfort-client";
+ version = "0.4.5";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "zxdavb";
+ repo = pname;
+ rev = version;
+ sha256 = "0r9f15fcjwhrq6ldji1dzbb76wsvinpkmyyaj7n55rl6ibnsyrwp";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "incomfortclient" ];
+
+ meta = with lib; {
+ description = "Python module to poll Intergas boilers via a Lan2RF gateway";
+ homepage = "https://github.com/zxdavb/incomfort-client";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index 130b6a49bda3..b8ebce462dce 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "inflect";
- version = "5.2.0";
+ version = "5.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "30e9d9d372e693739beaae1345dc53c48871ca70c5c7060edd3e7e77802bf945";
+ sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73";
};
nativeBuildInputs = [ setuptools_scm toml ];
diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index 56436cdd0eb9..82153f4b3d9b 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "influxdb-client";
- version = "1.14.0";
+ version = "1.15.0";
disabled = pythonOlder "3.6"; # requires python version >=3.6
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
- sha256 = "1qq727gwz5migr3xlqxj57qxv1y52g7xpkdgggz2wz739w5czffd";
+ sha256 = "1b2xh78v965rgafyj7cdbjm2p96d74f7ifsqllc7242n9wv3k53q";
};
# makes test not reproducible
diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix
index 69fe83b8779b..6b3a46ea3915 100644
--- a/pkgs/development/python-modules/influxdb/default.nix
+++ b/pkgs/development/python-modules/influxdb/default.nix
@@ -1,38 +1,70 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, requests
, dateutil
-, pytz
-, six
-, msgpack
+, fetchFromGitHub
, fetchpatch
+, mock
+, msgpack
+, nose
+, pandas
+, pytestCheckHook
+, pytz
+, requests
+, requests-mock
+, six
}:
buildPythonPackage rec {
pname = "influxdb";
version = "5.3.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6";
+ src = fetchFromGitHub {
+ owner = "influxdata";
+ repo = "influxdb-python";
+ rev = "v${version}";
+ sha256 = "1jfkf53jcf8lcq98qc0bw5d1d0yp3558mh8l2dqc9jlsm0smigjs";
};
+ propagatedBuildInputs = [
+ requests
+ dateutil
+ pytz
+ six
+ msgpack
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ requests-mock
+ mock
+ nose
+ pandas
+ ];
+
patches = [
(fetchpatch {
+ # Relaxes msgpack pinning
url = "https://github.com/influxdata/influxdb-python/commit/cc41e290f690c4eb67f75c98fa9f027bdb6eb16b.patch";
sha256 = "1fb9qrq1kp24pixjwvzhdy67z3h0wnj92aj0jw0a25fd0rdxdvg4";
})
];
- # ImportError: No module named tests
- doCheck = false;
- propagatedBuildInputs = [ requests dateutil pytz six msgpack ];
+ disabledTests = [
+ # Tests cause FutureWarning due to use of 'record' instead of 'records' in pandas.
+ # https://github.com/influxdata/influxdb-python/pull/845
+ # Also type mismatches in assertEqual on DataFrame:
+ # b'foo[30 chars]_one=1.0,column_two=1.0 0\nfoo,tag_one=red,tag[47 chars]00\n' !=
+ # b'foo[30 chars]_one="1",column_two=1i 0\nfoo,tag_one=red,tag_[46 chars]00\n'
+ "test_write_points_from_dataframe_with_nan_json"
+ "test_write_points_from_dataframe_with_tags_and_nan_json"
+ ];
+
+ pythonImportsCheck = [ "influxdb" ];
meta = with lib; {
description = "Python client for InfluxDB";
homepage = "https://github.com/influxdb/influxdb-python";
license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
};
-
}
diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
index 33c14dbaeb2d..b06db621b730 100644
--- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
+++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
@@ -1,24 +1,23 @@
-{ lib, buildPythonPackage, fetchFromGitHub, requests
+{ lib, buildPythonPackage, fetchPypi, requests
, websocket_client, pythonOlder }:
buildPythonPackage rec {
pname = "jellyfin-apiclient-python";
- version = "1.6.1";
+ version = "1.7.2";
disabled = pythonOlder "3.6";
- src = fetchFromGitHub {
- owner = "iwalton3";
- repo = "jellyfin-apiclient-python";
- rev = "v${version}";
- sha256 = "0f7czq83ic22fz1vnf0cavb7l3grcxxd5yyw9wcjz3g1j2d76735";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A=";
};
propagatedBuildInputs = [ requests websocket_client ];
+ doCheck = false; # no tests
pythonImportsCheck = [ "jellyfin_apiclient_python" ];
meta = with lib; {
- homepage = "https://github.com/iwalton3/jellyfin-apiclient-python";
+ homepage = "https://github.com/jellyfin/jellyfin-apiclient-python";
description = "Python API client for Jellyfin";
license = licenses.gpl3;
maintainers = with maintainers; [ jojosch ];
diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 7d4f6dd93639..3ae6bf84ae4f 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "jenkins-job-builder";
- version = "3.8.0";
+ version = "3.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-uRyeRP1y3GS7tXb0kHLBi7+trJRme/Ke3xgOY+LqZ6k=";
+ sha256 = "4a53e146843d567c375c2e61e70a840d75a412402fd78c1dd3da5642a6aaa375";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix
new file mode 100644
index 000000000000..fdc28f08ef4b
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-packaging/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, packaging
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "jupyter-packaging";
+ version = "0.7.12";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-sUAyV3GIGn33t/LRSZe2GQY/51rnVrkCWFLkNGAAu7g=";
+ };
+
+ propagatedBuildInputs = [ packaging ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ # disable tests depending on network connection
+ disabledTests = [ "test_develop" "test_install" ];
+
+ pythonImportsCheck = [ "jupyter_packaging" ];
+
+ meta = with lib; {
+ description = "Jupyter Packaging Utilities";
+ homepage = "https://github.com/jupyter/jupyter-packaging";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix
index 372698744cf7..712117d50113 100644
--- a/pkgs/development/python-modules/jupyter_console/default.nix
+++ b/pkgs/development/python-modules/jupyter_console/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "jupyter_console";
- version = "6.2.0";
+ version = "6.3.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "7f6194f4f4692d292da3f501c7f343ccd5e36c6a1becf7b7515e23e66d6bf1e9";
+ sha256 = "947f66bbdeee2221b4fb3a6b78225d337b8f10832f14cecf7932183635abe1d9";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix
new file mode 100644
index 000000000000..a9f98781b4fb
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter_server/default.nix
@@ -0,0 +1,75 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytestCheckHook
+, pytest-tornasync
+, jinja2
+, tornado
+, pyzmq
+, ipython_genutils
+, traitlets
+, jupyter_core
+, jupyter_client
+, nbformat
+, nbconvert
+, send2trash
+, terminado
+, prometheus_client
+, anyio
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "jupyter_server";
+ version = "1.4.1";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-sBJvI39nlTPuxGJEz8ZtYeOh+OwPrS1HNS+hnT51Tkc=";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "anyio>=2.0.2" "anyio"
+ '';
+
+ propagatedBuildInputs = [
+ jinja2
+ tornado
+ pyzmq
+ ipython_genutils
+ traitlets
+ jupyter_core
+ jupyter_client
+ nbformat
+ nbconvert
+ send2trash
+ terminado
+ prometheus_client
+ anyio
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-tornasync
+ requests
+ ];
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ pytestFlagsArray = [ "jupyter_server/tests/" ];
+
+ # disabled failing tests
+ disabledTests = [ "test_server_extension_list" "test_list_formats" "test_base_url" ];
+
+ meta = with lib; {
+ description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications.";
+ homepage = "https://github.com/jupyter-server/jupyter_server";
+ license = licenses.bsdOriginal;
+ maintainers = [ maintainers.elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index ff725ce18297..f22b52b25b6a 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -4,19 +4,21 @@
, jupyterlab_server
, notebook
, pythonOlder
+, jupyter-packaging
+, nbclassic
}:
buildPythonPackage rec {
pname = "jupyterlab";
- version = "2.2.9";
+ version = "3.0.12";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "3be8f8edea173753dd838c1b6d3bbcb6f5c801121f824a477025c1b6a1d33dc6";
+ sha256 = "929c60d7fb4aa704084c02d8ededc209b8b378e0b3adab46158b7fa6acc24230";
};
- propagatedBuildInputs = [ jupyterlab_server notebook ];
+ propagatedBuildInputs = [ jupyterlab_server notebook jupyter-packaging nbclassic ];
makeWrapperArgs = [
"--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab"
diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix
index 3d9b5b9f831b..c110cc0590fe 100644
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -1,34 +1,45 @@
{ lib
, buildPythonPackage
, fetchPypi
-, notebook
, jsonschema
, pythonOlder
, requests
-, pytest
+, pytestCheckHook
, pyjson5
+, Babel
+, jupyter_server
+, pytest-tornasync
+, pytestcov
+, strict-rfc3339
}:
buildPythonPackage rec {
pname = "jupyterlab_server";
- version = "1.2.0";
+ version = "2.3.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "5431d9dde96659364b7cc877693d5d21e7b80cea7ae3959ecc2b87518e5f5d8c";
+ sha256 = "sha256-56AkWqPeI6GAPeLv9AHkykWUU42fWYBhNPMEGabYtqM=";
};
- checkInputs = [ requests pytest ];
- propagatedBuildInputs = [ notebook jsonschema pyjson5 ];
+ propagatedBuildInputs = [ requests jsonschema pyjson5 Babel jupyter_server ];
- # test_listing test fails
- # this is a new package and not all tests pass
- doCheck = false;
+ checkInputs = [
+ pytestCheckHook
+ pytest-tornasync
+ pytestcov
+ strict-rfc3339
+ ];
- checkPhase = ''
- pytest
- '';
+ disabledTests = [
+ "test_get_locale"
+ "test_get_installed_language_pack_locales_passes"
+ "test_get_installed_package_locales"
+ "test_get_installed_packages_locale"
+ "test_get_language_packs"
+ "test_get_language_pack"
+ ];
meta = with lib; {
description = "JupyterLab Server";
diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix
index 8ff129637375..6b67818decfc 100644
--- a/pkgs/development/python-modules/kaggle/default.nix
+++ b/pkgs/development/python-modules/kaggle/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "kaggle";
- version = "1.5.10";
+ version = "1.5.12";
src = fetchPypi {
inherit pname version;
- sha256 = "05a2a3d4adeebc8a465d037999ba8db2cb471a24b41d623d4bcb80aac02ddbc9";
+ sha256 = "b4d87d107bff743aaa805c2b382c3661c4c175cdb159656d4972be2a9cef42cb";
};
# The version bounds in the setup.py file are unnecessarily restrictive.
diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix
index 9d42d97e0d84..e9f0eda56cc7 100644
--- a/pkgs/development/python-modules/labgrid/default.nix
+++ b/pkgs/development/python-modules/labgrid/default.nix
@@ -22,16 +22,18 @@
buildPythonPackage rec {
pname = "labgrid";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "labgrid-project";
repo = "labgrid";
rev = "v${version}";
- sha256 = "15298prs2f4wiyn8lf475qicp3y22lcjdcpwp2fmrya642vnr6w5";
+ sha256 = "sha256-wMYsgZXNP8kTt/x8c4e96BXrbjIZZ6RsH04BfD0zGwo=";
};
patches = [
+ # Pyserial within Nixpkgs already includes the necessary fix, remove the
+ # pyserial version check from labgrid.
./0001-serialdriver-remove-pyserial-version-check.patch
];
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index 47be977755cd..5334513e23c8 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Using hardware wallets as SSH/GPG agent";
homepage = "https://github.com/romanz/trezor-agent";
- license = licenses.gpl3;
+ license = licenses.lgpl3Only;
maintainers = with maintainers; [ np ];
};
}
diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index 86a505d4448c..6f0532a390a9 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "limnoria";
- version = "2021.01.15";
+ version = "2021.03.13";
disabled = isPy27; # abandoned upstream
src = fetchPypi {
inherit pname version;
- sha256 = "5d7109fc779c44070e3c57186eae59b133014835d5fe15b262fa9438d7599c81";
+ sha256 = "c13dd7a84eddfcf9c3068d57f3c9da90ea7c0d11688dc3f78f9265f3f093c6ea";
};
patchPhase = ''
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index e615582a282d..e74263cdb77e 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which
-, contextlib2, osxfuse
+, contextlib2
}:
buildPythonPackage rec {
@@ -21,9 +21,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkg-config ];
- buildInputs =
- lib.optionals stdenv.isLinux [ fuse ]
- ++ lib.optionals stdenv.isDarwin [ osxfuse ];
+ buildInputs = [ fuse ];
checkInputs = [ pytest which ] ++
lib.optionals stdenv.isLinux [ attr ];
diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index 458d2ca50329..8146f8b183e1 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -1,19 +1,36 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, isPy27
+, colorama
+, pytestCheckHook
+, pythonAtLeast
+}:
buildPythonPackage rec {
pname = "loguru";
version = "0.5.3";
- disabled = isPy27;
+ # python3.9 compatibility should be in the next release after 0.5.3
+ disabled = isPy27 || pythonAtLeast "3.9";
src = fetchPypi {
inherit pname version;
sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319";
};
+ patches = [
+ # Fixes tests with pytest>=6.2.2. Will be part of the next release after 0.5.3
+ (fetchpatch {
+ url = "https://github.com/Delgan/loguru/commit/31cf758ee9d22dbfa125f38153782fe20ac9dce5.patch";
+ sha256 = "1lzbs8akg1s7s6xjl3samf4c4bpssqvwg5fn3mwlm4ysr7jd5y67";
+ })
+ ];
+
checkInputs = [ pytestCheckHook colorama ];
- pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ];
-
+ disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ];
disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ]
++ lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ];
@@ -21,6 +38,6 @@ buildPythonPackage rec {
homepage = "https://github.com/Delgan/loguru";
description = "Python logging made (stupidly) simple";
license = licenses.mit;
- maintainers = with maintainers; [ jakewaksbaum ];
+ maintainers = with maintainers; [ jakewaksbaum rmcgibbo ];
};
}
diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index dbbe3d252125..71daa4bdbfa4 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "luftdaten";
- version = "0.6.4";
+ version = "0.6.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1w1f0kmiwslg1dxn7gq0ak8f5wajlwl03r5zklshjc11j34b4d5i";
+ sha256 = "sha256-5SFb+psULyg9UKVY3oJPNLF3TGS/W+Bxoj79iTzReL4=";
};
propagatedBuildInputs = [ aiohttp async-timeout ];
@@ -16,9 +16,11 @@ buildPythonPackage rec {
# No tests implemented
doCheck = false;
+ pythonImportsCheck = [ "luftdaten" ];
+
meta = with lib; {
description = "Python API for interacting with luftdaten.info";
- homepage = "https://github.com/fabaff/python-luftdaten";
+ homepage = "https://github.com/home-assistant-ecosystem/python-luftdaten";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index b58376031039..36b1539834d6 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub
, cython
, libxml2
, libxslt
, zlib
+, xcodebuild
}:
buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
};
# setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs
- nativeBuildInputs = [ libxml2.dev libxslt.dev cython ];
+ nativeBuildInputs = [ libxml2.dev libxslt.dev cython ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];
buildInputs = [ libxml2 libxslt zlib ];
# tests are meant to be ran "in-place" in the same directory as src
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index cc9c35bcb920..63425b6c853a 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -3,25 +3,23 @@
, fetchFromGitHub
, pythonOlder
, python
-, alembic, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog
+, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, survey, watchdog
, importlib-metadata
-, importlib-resources
}:
buildPythonPackage rec {
pname = "maestral";
- version = "1.4.2";
+ version = "1.4.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "v${version}";
- sha256 = "sha256-ibAYuaPSty275/aQ0DibyWe2LjPoEpdWgElTnR+MEs8=";
+ sha256 = "sha256-3GleQNkJrGIkFqOL2Dq0jTpgw7ts9ecpovKbyh3OrEI=";
};
propagatedBuildInputs = [
- alembic
click
desktop-notifier
dropbox
@@ -34,13 +32,10 @@ buildPythonPackage rec {
requests
setuptools
sdnotify
- sqlalchemy
survey
watchdog
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
- ] ++ lib.optionals (pythonOlder "3.9") [
- importlib-resources
];
makeWrapperArgs = [
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
new file mode 100644
index 000000000000..0b097024a55f
--- /dev/null
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -0,0 +1,98 @@
+{ lib
+, buildPythonPackage
+, python
+, pythonOlder
+, fetchFromGitLab
+, substituteAll
+, bubblewrap
+, exiftool
+, ffmpeg
+, mime-types
+, wrapGAppsHook
+, gdk-pixbuf
+, gobject-introspection
+, librsvg
+, poppler_gi
+, mutagen
+, pygobject3
+, pycairo
+, dolphinIntegration ? false, plasma5Packages
+}:
+
+buildPythonPackage rec {
+ pname = "mat2";
+ version = "0.12.1";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitLab {
+ domain = "0xacab.org";
+ owner = "jvoisin";
+ repo = "mat2";
+ rev = version;
+ sha256 = "sha256-TxHelOr7ygp4R+dW+oJ034l2w9zrB4gn0QLs5Pa4EFE=";
+ };
+
+ patches = [
+ # hardcode paths to some binaries
+ (substituteAll ({
+ src = ./paths.patch;
+ bwrap = "${bubblewrap}/bin/bwrap";
+ exiftool = "${exiftool}/bin/exiftool";
+ ffmpeg = "${ffmpeg}/bin/ffmpeg";
+ # remove once faf0f8a8a4134edbeec0a73de7f938453444186d is in master
+ mimetypes = "${mime-types}/etc/mime.types";
+ } // lib.optionalAttrs dolphinIntegration {
+ kdialog = "${plasma5Packages.kdialog}/bin/kdialog";
+ }))
+ # the executable shouldn't be called .mat2-wrapped
+ ./executable-name.patch
+ # hardcode path to mat2 executable
+ ./tests.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace dolphin/mat2.desktop \
+ --replace "@mat2@" "$out/bin/mat2" \
+ --replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg"
+ '';
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gdk-pixbuf
+ gobject-introspection
+ librsvg
+ poppler_gi
+ ];
+
+ propagatedBuildInputs = [
+ mutagen
+ pygobject3
+ pycairo
+ ];
+
+ postInstall = ''
+ install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps"
+ install -Dm 444 doc/mat2.1 -t "$out/share/man/man1"
+ install -Dm 444 nautilus/mat2.py -t "$out/share/nautilus-python/extensions"
+ buildPythonPath "$out $pythonPath"
+ patchPythonScript "$out/share/nautilus-python/extensions/mat2.py"
+ '' + lib.optionalString dolphinIntegration ''
+ install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus"
+ '';
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover -v
+ '';
+
+ meta = with lib; {
+ description = "A handy tool to trash your metadata";
+ homepage = "https://0xacab.org/jvoisin/mat2";
+ changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/mat2/executable-name.patch b/pkgs/development/python-modules/mat2/executable-name.patch
new file mode 100644
index 000000000000..6eee0a949400
--- /dev/null
+++ b/pkgs/development/python-modules/mat2/executable-name.patch
@@ -0,0 +1,13 @@
+diff --git a/mat2 b/mat2
+index 3b77e1e..b99a633 100755
+--- a/mat2
++++ b/mat2
+@@ -46,7 +46,7 @@ def __check_file(filename: str, mode: int = os.R_OK) -> bool:
+
+
+ def create_arg_parser() -> argparse.ArgumentParser:
+- parser = argparse.ArgumentParser(description='Metadata anonymisation toolkit 2')
++ parser = argparse.ArgumentParser(description='Metadata anonymisation toolkit 2', prog='mat2')
+
+ parser.add_argument('-V', '--verbose', action='store_true',
+ help='show more verbose status information')
diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch
new file mode 100644
index 000000000000..e0144be9fef6
--- /dev/null
+++ b/pkgs/development/python-modules/mat2/paths.patch
@@ -0,0 +1,111 @@
+diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop
+index e623962..5d69ae2 100644
+--- a/dolphin/mat2.desktop
++++ b/dolphin/mat2.desktop
+@@ -7,5 +7,5 @@ Type=Service
+ [Desktop Action cleanMetadata]
+ Name=Clean metadata
+ Name[es]=Limpiar metadatos
+-Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg
+-Exec=kdialog --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U
++Icon=@mat2svg@
++Exec=@kdialog@ --yesno "$( @mat2@ -s %U )" --title "Clean Metadata?" && @mat2@ %U
+diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py
+index 970d5dd..5d3c0b7 100644
+--- a/libmat2/bubblewrap.py
++++ b/libmat2/bubblewrap.py
+@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError
+
+
+ def _get_bwrap_path() -> str:
+- which_path = shutil.which('bwrap')
+- if which_path:
+- return which_path
+-
+- raise RuntimeError("Unable to find bwrap") # pragma: no cover
++ return '@bwrap@'
+
+
+ def _get_bwrap_args(tempdir: str,
+@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str,
+
+ # XXX: use --ro-bind-try once all supported platforms
+ # have a bubblewrap recent enough to support it.
+- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd]
++ ro_bind_dirs = ['/nix/store', cwd]
+ for bind_dir in ro_bind_dirs:
+ if os.path.isdir(bind_dir): # pragma: no cover
+ ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir])
+
+- ro_bind_files = ['/etc/ld.so.cache']
+- for bind_file in ro_bind_files:
+- if os.path.isfile(bind_file): # pragma: no cover
+- ro_bind_args.extend(['--ro-bind', bind_file, bind_file])
+-
+ args = ro_bind_args + \
+ ['--dev', '/dev',
+ '--proc', '/proc',
+diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py
+index eb65b2a..51a0fa1 100644
+--- a/libmat2/exiftool.py
++++ b/libmat2/exiftool.py
+@@ -1,8 +1,6 @@
+-import functools
+ import json
+ import logging
+ import os
+-import shutil
+ import subprocess
+ from typing import Dict, Union, Set
+
+@@ -70,14 +68,5 @@ class ExiftoolParser(abstract.AbstractParser):
+ return False
+ return True
+
+-@functools.lru_cache()
+ def _get_exiftool_path() -> str: # pragma: no cover
+- which_path = shutil.which('exiftool')
+- if which_path:
+- return which_path
+-
+- # Exiftool on Arch Linux has a weird path
+- if os.access('/usr/bin/vendor_perl/exiftool', os.X_OK):
+- return '/usr/bin/vendor_perl/exiftool'
+-
+- raise RuntimeError("Unable to find exiftool")
++ return '@exiftool@'
+diff --git a/libmat2/parser_factory.py b/libmat2/parser_factory.py
+index 9965432..bd45179 100644
+--- a/libmat2/parser_factory.py
++++ b/libmat2/parser_factory.py
+@@ -8,6 +8,7 @@ from . import abstract, UNSUPPORTED_EXTENSIONS
+
+ T = TypeVar('T', bound='abstract.AbstractParser')
+
++mimetypes.init(['@mimetypes@'])
+ mimetypes.add_type('application/epub+zip', '.epub')
+ mimetypes.add_type('application/x-dtbncx+xml', '.ncx') # EPUB Navigation Control XML File
+
+diff --git a/libmat2/video.py b/libmat2/video.py
+index b4a3232..3dd7ee5 100644
+--- a/libmat2/video.py
++++ b/libmat2/video.py
+@@ -1,6 +1,4 @@
+ import subprocess
+-import functools
+-import shutil
+ import logging
+
+ from typing import Dict, Union
+@@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser):
+ }
+
+
+-@functools.lru_cache()
+ def _get_ffmpeg_path() -> str: # pragma: no cover
+- which_path = shutil.which('ffmpeg')
+- if which_path:
+- return which_path
+-
+- raise RuntimeError("Unable to find ffmpeg")
++ return '@ffmpeg@'
diff --git a/pkgs/development/python-modules/mat2/tests.patch b/pkgs/development/python-modules/mat2/tests.patch
new file mode 100644
index 000000000000..8958d937dd43
--- /dev/null
+++ b/pkgs/development/python-modules/mat2/tests.patch
@@ -0,0 +1,18 @@
+diff --git a/tests/test_climat2.py b/tests/test_climat2.py
+index cede642..2d5ad77 100644
+--- a/tests/test_climat2.py
++++ b/tests/test_climat2.py
+@@ -10,12 +10,7 @@ import glob
+ from libmat2 import images, parser_factory
+
+
+-mat2_binary = ['./mat2']
+-
+-if 'MAT2_GLOBAL_PATH_TESTSUITE' in os.environ:
+- # Debian runs tests after installing the package
+- # https://0xacab.org/jvoisin/mat2/issues/16#note_153878
+- mat2_binary = ['/usr/bin/env', 'mat2']
++mat2_binary = [os.environ['out'] + '/bin/mat2']
+
+
+ class TestHelp(unittest.TestCase):
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 6632b88b7234..6a6e35367331 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -1,14 +1,14 @@
{ lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder
-, sqlalchemy, ruamel_yaml, CommonMark, lxml, fetchpatch
+, sqlalchemy, ruamel_yaml, CommonMark, lxml
}:
buildPythonPackage rec {
pname = "mautrix";
- version = "0.8.16";
+ version = "0.8.17";
src = fetchPypi {
inherit pname version;
- sha256 = "ccaa1691affa5f257e13d61f7c46088ff0affdd782331b01bfdcbd0b3eb5e10e";
+ sha256 = "9a15a8e39f9d0b36c91dfe0f5dd1efc8752cc1d317057840a3dbffd6ee90e068";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix
index cdd19beb68d9..46de34050239 100644
--- a/pkgs/development/python-modules/mergedeep/default.nix
+++ b/pkgs/development/python-modules/mergedeep/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "mergedeep";
- version = "1.3.1";
+ version = "1.3.4";
disabled = isPy27;
# PyPI tarball doesn't include tests directory
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "clarketm";
repo = "mergedeep";
rev = "v${version}";
- sha256 = "1ryccb64hg438y1wsjlfp4ciq05q4c6khwhllwdnndm8cbkbrgph";
+ sha256 = "1msvvdzk33sxzgyvs4fs8dlsrsi7fjj038z83s0yw5h8m8d78469";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix
index 346430d23926..60440ff4b488 100644
--- a/pkgs/development/python-modules/minidump/default.nix
+++ b/pkgs/development/python-modules/minidump/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "minidump";
- version = "0.0.13";
+ version = "0.0.15";
src = fetchPypi {
inherit pname version;
- sha256 = "1w93yh2dz7llxjgv0jn7gf9praz7d5952is7idgh0lsyj67ri2ms";
+ sha256 = "sha256-IVlzAsnl1KhErxWPi96hUFlIX4IN3Y9t8OicckdYUv0=";
};
# Upstream doesn't have tests
diff --git a/pkgs/development/python-modules/mplfinance/default.nix b/pkgs/development/python-modules/mplfinance/default.nix
new file mode 100644
index 000000000000..b1d0bf2b9aa9
--- /dev/null
+++ b/pkgs/development/python-modules/mplfinance/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, matplotlib, pandas }:
+
+buildPythonPackage rec {
+ pname = "mplfinance";
+ version = "0.12.7a7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-pATiprTELt8GrEkeKjILPfpdNDVoex5t+Mc+6Gg7cPY=";
+ };
+
+ propagatedBuildInputs = [ matplotlib pandas ];
+
+ # tests are only included on GitHub where this version misses a tag
+ # and half of them fail
+ doCheck = false;
+
+ pythonImportsCheck = [ "mplfinance" ];
+
+ meta = with lib; {
+ description = "Matplotlib utilities for the visualization, and visual analysis, of financial data";
+ homepage = "https://github.com/matplotlib/mplfinance";
+ license = [ licenses.bsd3 ];
+ maintainers = [ maintainers.ehmry ];
+ };
+}
diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix
index 0ff66fa8132e..11d0bed476af 100644
--- a/pkgs/development/python-modules/mpv/default.nix
+++ b/pkgs/development/python-modules/mpv/default.nix
@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "mpv";
- version = "0.4.7";
+ version = "0.5.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "jaseg";
repo = "python-mpv";
rev = "v${version}";
- sha256 = "1gq2ynzbpmc7bv066ddv2f4rnmvfsi7034vhf9ffp7yzbixf6ys8";
+ sha256 = "0ffskpynhl1252h6a05087lvpjgn1cn2z3caiv3i666dn1n79fjd";
};
buildInputs = [ mpv ];
@@ -28,6 +28,6 @@ buildPythonPackage rec {
meta = with lib; {
description = "A python interface to the mpv media player";
homepage = "https://github.com/jaseg/python-mpv";
- license = licenses.agpl3;
+ license = licenses.agpl3Plus;
};
}
diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index 37266df5f216..3df0527589a1 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msal";
- version = "1.8.0";
+ version = "1.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1dcc737ca517df53438bc9a3fae97f17d93d7a93fa1389e6bc44e82eee81ab83";
+ sha256 = "582e92e3b9fa68084dca6ecfd8db866ddc75cd9043de267c79d6b6277dd27f55";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix
index 826a4fddae08..e9790db9f5eb 100644
--- a/pkgs/development/python-modules/msldap/default.nix
+++ b/pkgs/development/python-modules/msldap/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "msldap";
- version = "0.3.27";
+ version = "0.3.28";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-tAMl1Xkb04Vfh18uS30eKX/IfeXhwER3J1lHXHxHlXY=";
+ sha256 = "sha256-0sMi5PpwMWf/W+Hu0akQVF/1ZkbanfOzYDC3R6lZrSE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix
index 21b93bf5bfe3..acdcf69e301d 100644
--- a/pkgs/development/python-modules/msrest/default.nix
+++ b/pkgs/development/python-modules/msrest/default.nix
@@ -18,7 +18,7 @@
}:
buildPythonPackage rec {
- version = "0.6.19";
+ version = "0.6.21";
pname = "msrest";
# no tests in PyPI tarball
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Azure";
repo = "msrest-for-python";
rev = "v${version}";
- sha256 = "sha256-hcUJrWw5EU0aO5Gyhn5+LmuRQN9Bom59cTz3maQ0jvw=";
+ sha256 = "sha256-IlBwlVQ/v+vJmCWNbFZKGL6a9K09z4AYrPm3kwaA/nI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
new file mode 100644
index 000000000000..3644b4e48dd7
--- /dev/null
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, notebook
+, pythonOlder
+, jupyter_server
+, pytestCheckHook
+, pytest-tornasync
+}:
+
+buildPythonPackage rec {
+ pname = "nbclassic";
+ version = "0.2.6";
+ disabled = pythonOlder "3.5";
+
+ # tests only on github
+ src = fetchFromGitHub {
+ owner = "jupyterlab";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-stp0LZJAOCrnObvJIPEVt8mMb8yL29nlHECypbTg3ec=";
+ };
+
+ propagatedBuildInputs = [ jupyter_server notebook ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-tornasync
+ ];
+
+ meta = with lib; {
+ description = "Jupyter lab environment notebook server extension.";
+ license = with licenses; [ bsd3 ];
+ homepage = "https://github.com/jupyterlab/nbclassic";
+ maintainers = [ maintainers.elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 582a6132c259..02eda2beb195 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -30,6 +30,16 @@ buildPythonPackage rec {
sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002";
};
+ # Add $out/share/jupyter to the list of paths that are used to search for
+ # various exporter templates
+ patches = [
+ ./templates.patch
+ ];
+
+ postPatch = ''
+ substituteAllInPlace ./nbconvert/exporters/templateexporter.py
+ '';
+
checkInputs = [ pytestCheckHook glibcLocales ];
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nbconvert/templates.patch b/pkgs/development/python-modules/nbconvert/templates.patch
new file mode 100644
index 000000000000..cadaf69a7b84
--- /dev/null
+++ b/pkgs/development/python-modules/nbconvert/templates.patch
@@ -0,0 +1,12 @@
+diff --git a/nbconvert/exporters/templateexporter.py b/nbconvert/exporters/templateexporter.py
+index 0d540eb1..440f6382 100644
+--- a/nbconvert/exporters/templateexporter.py
++++ b/nbconvert/exporters/templateexporter.py
+@@ -616,6 +616,7 @@ class TemplateExporter(Exporter):
+ if DEV_MODE:
+ root_dirs.append(os.path.abspath(os.path.join(ROOT, '..', '..', 'share', 'jupyter')))
+ root_dirs.extend(jupyter_path())
++ root_dirs.append(os.path.join("@out@", "share", "jupyter"))
+ return root_dirs
+
+ def _init_resources(self, resources):
diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix
index 715a1989b455..b69e8401eb51 100644
--- a/pkgs/development/python-modules/ndjson/default.nix
+++ b/pkgs/development/python-modules/ndjson/default.nix
@@ -16,6 +16,7 @@ buildPythonPackage rec {
homepage = "https://github.com/rhgrant10/ndjson";
description = "JsonDecoder";
platforms = platforms.unix;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ freezeboy ];
};
}
diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix
index f4e625b12b4e..3b1ccbb73f70 100644
--- a/pkgs/development/python-modules/netdata/default.nix
+++ b/pkgs/development/python-modules/netdata/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "netdata";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "14kyjp1q3clizs1bqx4rp31d2awjmi5v65z8sarr2ycgwqqmkrzw";
+ sha256 = "sha256-oGOT4RvftI/2Ri2icM/AtglNZXt10jkFh/rlr6A46YE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix
index 1a60cf70d2d2..8aa70b43e665 100644
--- a/pkgs/development/python-modules/notify/default.nix
+++ b/pkgs/development/python-modules/notify/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
configure
'';
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ python pygobject2 pygtk pkgs.libnotify pkgs.glib pkgs.gtk2 pkgs.dbus-glib ];
postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix
deleted file mode 100644
index 624f32fd337b..000000000000
--- a/pkgs/development/python-modules/numtraits/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-, six
-, numpy
-, traitlets
-}:
-
-buildPythonPackage rec {
- pname = "numtraits";
- version = "0.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e";
- };
-
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ six numpy traitlets];
-
- checkPhase = ''
- py.test
- '';
-
- meta = {
- description = "Numerical traits for Python objects";
- license = lib.licenses.bsd2;
- maintainers = with lib.maintainers; [ fridh ];
- homepage = "https://github.com/astrofrog/numtraits";
- };
-}
diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index 17537be82b49..b3fd0384ef48 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -1,9 +1,11 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, fetchpatch
, pythonOlder
, pytestCheckHook
, setuptools
+, packaging
, toml
, structlog
, appdirs
@@ -19,18 +21,26 @@
buildPythonPackage rec {
pname = "nvchecker";
- version = "2.2";
+ version = "2.3";
# Tests not included in PyPI tarball
src = fetchFromGitHub {
owner = "lilydjwg";
repo = pname;
rev = "v${version}";
- sha256 = "0b17pikqyxcsid69lwnjl44n8z46ydjmxxdnbzasfdl7r83l7ijr";
+ sha256 = "0ikqjlw6v7va69i8qskj1lf07ik84q4n3qgsb7khk520gv2ks3sx";
};
+ patches = [
+ # Fix test that fail in sandbox build. See https://github.com/lilydjwg/nvchecker/pull/179
+ (fetchpatch {
+ url = "https://github.com/lilydjwg/nvchecker/commit/7366d82bfc3dcf231f7908e259bf2437cf7dafd5.patch";
+ sha256 = "0pwrwa2wyy4i668lk2mqzzy6y3xi08mq3w520b4954kfm07g75a9";
+ })
+ ];
+
nativeBuildInputs = [ installShellFiles docutils ];
- propagatedBuildInputs = [ setuptools toml structlog appdirs tornado pycurl aiohttp ];
+ propagatedBuildInputs = [ setuptools packaging toml structlog appdirs tornado pycurl aiohttp ];
checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ];
disabled = pythonOlder "3.7";
diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix
index 807b6cf5f5e1..90683a84f46a 100644
--- a/pkgs/development/python-modules/onnx/default.nix
+++ b/pkgs/development/python-modules/onnx/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
];
postPatch = ''
- patchShebangs tools/protoc-gen-mypy.py
+ chmod +x tools/protoc-gen-mypy.sh.in
+ patchShebangs tools/protoc-gen-mypy.sh.in tools/protoc-gen-mypy.py
'';
preBuild = ''
diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix
index d9f4cb6b1add..8311cb6c57e1 100644
--- a/pkgs/development/python-modules/opensensemap-api/default.nix
+++ b/pkgs/development/python-modules/opensensemap-api/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "opensensemap-api";
- version = "0.1.5";
+ version = "0.1.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1f3iqwl8ynvrkdd961v2hjsbldwbr217pv5pay2m5f0m974bhblx";
+ sha256 = "sha256-e60aVIoKFqo++WJHUYGutugkjB8YgyNQgJbILgAyOOY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
index 2e7666d3ab0b..7b806ecebe23 100644
--- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
+++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
@@ -1,33 +1,39 @@
-{ buildPythonPackage
-, fetchPypi
-, lib
+{ lib
+, buildPythonPackage
, click
-, requests
+, fetchPypi
, packaging
+, pytestCheckHook
+, requests
}:
-with lib;
-
buildPythonPackage rec {
pname = "openwrt-luci-rpc";
- version = "1.1.7";
+ version = "1.1.11";
src = fetchPypi {
inherit pname version;
- sha256 = "8074c1ed24cdd1fadc5a99bd63d9313a0a44703714473ed781ed11e7fb45c96f";
+ sha256 = "sha256-DkitN+mwCZ14QEn2fTOqUrQTtoncR1ifP3WDSQ6qkkk=";
};
- postPatch = ''
- substituteInPlace setup.py --replace "requests==2.21.0" "requests"
- substituteInPlace setup.py --replace "packaging==19.1" "packaging"
- '';
+ propagatedBuildInputs = [
+ click
+ requests
+ packaging
+ ];
- propagatedBuildInputs = [ click requests packaging ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- meta = {
- description = ''
- Python3 module for interacting with the OpenWrt Luci RPC interface.
- Supports 15.X & 17.X & 18.X or newer releases of OpenWrt.
+ pythonImportsCheck = [ "openwrt_luci_rpc" ];
+
+ meta = with lib; {
+ description = "Python module for interacting with the OpenWrt Luci RPC interface";
+ longDescription = ''
+ This module allows you to use the Luci RPC interface to fetch connected devices
+ on your OpenWrt based router. Supports 15.X & 17.X & 18.X or newer releases of
+ OpenWrt.
'';
homepage = "https://github.com/fbradyirl/openwrt-luci-rpc";
license = licenses.asl20;
diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix
new file mode 100644
index 000000000000..afca46ec8a80
--- /dev/null
+++ b/pkgs/development/python-modules/packageurl-python/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonPackage, fetchPypi, lib, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "packageurl-python";
+ version = "0.9.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0mpvj8imsaqhrgfq1cxx16flc5201y78kqa7bh2i5zxsc29843mx";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "packageurl" ];
+
+ meta = with lib; {
+ description = "Python parser and builder for package URLs";
+ homepage = "https://github.com/package-url/packageurl-python";
+ license = licenses.mit;
+ maintainers = with maintainers; [ armijnhemel ];
+ };
+}
diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix
index 6eebad4467f0..a68f535d29db 100644
--- a/pkgs/development/python-modules/parso/default.nix
+++ b/pkgs/development/python-modules/parso/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, pythonOlder
, pytestCheckHook
}:
@@ -15,6 +16,15 @@ buildPythonPackage rec {
sha256 = "8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e";
};
+ patches = [
+ # Fix the flaky test due to slow moving time on Apple Silicon chips.
+ # Remove when https://github.com/davidhalter/parso/pull/177 is in the next release.
+ (fetchpatch {
+ url = "https://github.com/davidhalter/parso/pull/177/commits/2799a7a3c2cf87fdc2d0c19a0890acea425091ce.patch";
+ sha256 = "sha256-A5EQly1wR/7lo+L8Pp0UPSUIhC0WcblXEWQNvRMlZYA=";
+ })
+ ];
+
checkInputs = [ pytestCheckHook ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix
index eddf58e559dc..58e7aff5601d 100644
--- a/pkgs/development/python-modules/percol/default.nix
+++ b/pkgs/development/python-modules/percol/default.nix
@@ -1,25 +1,26 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
-, six
-}:
+{ lib, buildPythonPackage, fetchFromGitHub, cmigemo }:
buildPythonPackage rec {
pname = "percol";
- version = "0.2.1";
- disabled = isPy3k;
+ version = "unstable-2019-07-24";
- src = fetchPypi {
- inherit pname version;
- sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8";
+ src = fetchFromGitHub {
+ owner = "mooz";
+ repo = "percol";
+ rev = "4b28037e328da3d0fe8165c11b800cbaddcb525e";
+ sha256 = "07sq3517wzn04j2dzlmczmcvx3w6r7xnzz3634zgf1zi6dbr2a3g";
};
- propagatedBuildInputs = [ six ];
+ propagatedBuildInputs = [ cmigemo ];
+
+ # package has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "percol" ];
meta = with lib; {
homepage = "https://github.com/mooz/percol";
description = "Adds flavor of interactive filtering to the traditional pipe concept of shell";
license = licenses.mit;
maintainers = with maintainers; [ koral ];
- broken = true; # missing cmigemo package which is missing libmigemo.so
- # also doesn't support python3
};
}
diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix
index aacd9e314cb3..c99f408db62f 100644
--- a/pkgs/development/python-modules/piep/default.nix
+++ b/pkgs/development/python-modules/piep/default.nix
@@ -3,11 +3,13 @@
, fetchPypi
, nose
, pygments
+, isPy3k
}:
buildPythonPackage rec {
version = "0.9.2";
pname = "piep";
+ disabled = isPy3k;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix
index dbf27febeb9d..64ae91895593 100644
--- a/pkgs/development/python-modules/pillow/generic.nix
+++ b/pkgs/development/python-modules/pillow/generic.nix
@@ -26,6 +26,9 @@ buildPythonPackage rec {
# pillow-simd
"test_roundtrip"
"test_basic"
+ ] ++ lib.optionals (lib.versions.major version == "6") [
+ # RuntimeError: Error setting from dictionary
+ "test_custom_metadata"
];
propagatedBuildInputs = [ olefile ];
diff --git a/pkgs/development/python-modules/pkutils/default.nix b/pkgs/development/python-modules/pkutils/default.nix
index d674e876b147..c383f5ff86c4 100644
--- a/pkgs/development/python-modules/pkutils/default.nix
+++ b/pkgs/development/python-modules/pkutils/default.nix
@@ -1,5 +1,4 @@
{ lib
-, pythonOlder
, buildPythonPackage
, isPy3k
, fetchFromGitHub
diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix
index 1686887a1518..1fbdd6773e67 100644
--- a/pkgs/development/python-modules/plexapi/default.nix
+++ b/pkgs/development/python-modules/plexapi/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "PlexAPI";
- version = "4.4.1";
+ version = "4.5.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
- sha256 = "11zarqnrpis6xpsjdvfl3pczv1l9rzbgkawkv2lhfvzlnc00d7df";
+ sha256 = "sha256-MjV1JUHrIHTu3UHy4HnMtTEjSCx3U9kMgUkbCJOAZr0=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index f4be0e5140b5..289f1871f338 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -19,13 +19,13 @@
buildPythonPackage rec {
pname = "plugwise";
- version = "0.8.5";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = version;
- sha256 = "1gviyy31l1j8z0if2id3m13r43kw4mcgd8921813yfhmf174piq4";
+ sha256 = "sha256-MZ4R55vGUyWmR0Md83eNerzsgtYMch1vfQ3sqbm12bM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index d5d4e36d3a37..80c4b5acfe8c 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "poetry-core";
- version = "1.0.0";
+ version = "1.0.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "python-poetry";
repo = pname;
rev = version;
- sha256 = "02pqkwzbg43xz2zsw8q7m0sfkj8wbw07in83gy0bk0znhljhp0vw";
+ sha256 = "sha256-OE6oc/3HYrMmgPnINxvSZ27m8YeZk5Gnn9ok8GlSIZ0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix
index 3c9bc5c7c5ba..f9d5b6f80b1f 100644
--- a/pkgs/development/python-modules/prance/default.nix
+++ b/pkgs/development/python-modules/prance/default.nix
@@ -6,10 +6,9 @@
, requests
, six
, semver
-, pytest
+, pytestCheckHook
, pytestcov
, pytestrunner
-, sphinx
, openapi-spec-validator
}:
@@ -35,18 +34,28 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest
+ pytestCheckHook
pytestcov
openapi-spec-validator
];
postPatch = ''
substituteInPlace setup.py \
- --replace "tests_require = dev_require," "tests_require = None,"
+ --replace "tests_require = dev_require," "tests_require = None," \
+ --replace "chardet~=4.0" "" \
+ --replace "semver~=2.13" ""
+ substituteInPlace setup.cfg \
+ --replace "--cov-fail-under=90" ""
'';
- # many tests require network connection
- doCheck = false;
+ # Disable tests that require network
+ disabledTestPaths = [
+ "tests/test_convert.py"
+ ];
+ disabledTests = [
+ "test_fetch_url_http"
+ ];
+ pythonImportsCheck = [ "prance" ];
meta = with lib; {
description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser";
diff --git a/pkgs/development/python-modules/privacyidea/default.nix b/pkgs/development/python-modules/privacyidea/default.nix
index 84cc4530b34e..37f0a135993f 100644
--- a/pkgs/development/python-modules/privacyidea/default.nix
+++ b/pkgs/development/python-modules/privacyidea/default.nix
@@ -1,22 +1,24 @@
-{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python
+{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests
, cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script
, defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow
, python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel
, ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2
+, pydash
-, mock, pytest, responses, testfixtures
+, mock, pytestCheckHook, responses, testfixtures
}:
buildPythonPackage rec {
pname = "privacyIDEA";
- version = "3.3";
+ version = "3.5.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "188ki924dig899wlih45xfsm0s7mjkya56vii26bg02h91izrb4b";
+ sha256 = "sha256-XJnrrpU0x2Axu7W4G3oDTjSJuqEyh3C/0Aga5D0gw9k=";
+ fetchSubmodules = true;
};
propagatedBuildInputs = [
@@ -24,11 +26,24 @@ buildPythonPackage rec {
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
+ pydash
];
- checkInputs = [ openssl mock pytest responses testfixtures ];
- # issues with hardware token tests
- doCheck = false;
+ passthru.tests = { inherit (nixosTests) privacyidea; };
+
+ checkInputs = [ openssl mock pytestCheckHook responses testfixtures ];
+ disabledTests = [
+ "AESHardwareSecurityModuleTestCase"
+ "test_01_cert_request"
+ "test_01_loading_scripts"
+ "test_02_cert_enrolled"
+ "test_02_enroll_rights"
+ "test_02_get_resolvers"
+ "test_02_success"
+ "test_03_get_identifiers"
+ "test_04_remote_user_auth"
+ "test_14_convert_timestamp_to_utc"
+ ];
pythonImportsCheck = [ "privacyidea" ];
@@ -46,6 +61,6 @@ buildPythonPackage rec {
description = "Multi factor authentication system (2FA, MFA, OTP Server)";
license = licenses.agpl3Plus;
homepage = "http://www.privacyidea.org";
- maintainers = [ maintainers.globin ];
+ maintainers = with maintainers; [ globin ma27 ];
};
}
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 6760ff168e56..a53005c7426a 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python
, darwin
-, pytest
+, pytestCheckHook
, mock
, ipaddress
, unittest2
@@ -18,15 +18,20 @@ buildPythonPackage rec {
# arch doesn't report frequency is the same way
# tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715
doCheck = !stdenv.isDarwin && stdenv.isx86_64;
- checkInputs = [ pytest ]
+ checkInputs = [ pytestCheckHook ]
++ lib.optionals isPy27 [ mock ipaddress unittest2 ];
- # out must be referenced as test import paths are relative
+ pytestFlagsArray = [
+ "$out/${python.sitePackages}/psutil/tests/test_system.py"
+ ];
# disable tests which don't work in sandbox
# cpu_times is flakey on darwin
- checkPhase = ''
- pytest $out/${python.sitePackages}/psutil/tests/test_system.py \
- -k 'not user and not disk_io_counters and not sensors_battery and not cpu_times'
- '';
+ disabledTests = [
+ "user"
+ "disk_io_counters"
+ "sensors_battery"
+ "cpu_times"
+ "cpu_freq"
+ ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ];
diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix
index 0afc75bf87c7..f9e276b3bb5f 100644
--- a/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, buildPythonPackage
, pytestCheckHook
, sysctl
@@ -17,6 +18,23 @@ buildPythonPackage rec {
sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi";
};
+ patches = [
+ # Make it detect Apple Silicon, remove after https://github.com/workhorsy/py-cpuinfo/pull/161 is merged.
+ (fetchpatch {
+ url = "https://github.com/workhorsy/py-cpuinfo/commit/54c32da6678f9d75ec5acf4534056cdc85c2a04d.patch";
+ sha256 = "sha256-3R46KrpACAQ1V0CQtz48V5mQXxvplUQrXnACtiE8WqY=";
+ })
+ # Continuation of the patch above
+ (fetchpatch {
+ url = "https://github.com/workhorsy/py-cpuinfo/commit/0d00f4b99750f292c85ff23e1039ea9489cb7ec8.patch";
+ sha256 = "sha256-mHoXoCAEG2v3xpQppRFWzSvhYCp5i9CZkbEgtiLVzMs=";
+ })
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
# On Darwin sysctl is used to read CPU information.
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace cpuinfo/cpuinfo.py \
@@ -24,10 +42,6 @@ buildPythonPackage rec {
--replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'"
'';
- checkInputs = [
- pytestCheckHook
- ];
-
meta = {
description = "Get CPU info with pure Python 2 & 3";
longDescription = ''
diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix
index 882182a3a1ef..bcbb672f5c80 100644
--- a/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/pkgs/development/python-modules/pyairvisual/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyairvisual";
- version = "5.0.6";
+ version = "5.0.7";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-7u8AwIr1Ah/7zCfXFwj/C/CaD/B3uLRkZ8Gf6d18Xp0=";
+ sha256 = "sha256-r/AJl36dv6+C92tc3kpX4/VzG69qdh4ERCyQxDOHdVU=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 2fca74b33aa9..ddf2c9695a46 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -1,55 +1,58 @@
-{ lib, buildPythonPackage
+{ lib
+, buildPythonPackage
, aiohttp
, aiozeroconf
-, asynctest
, cryptography
, deepdiff
+, fetchFromGitHub
, netifaces
, protobuf
-, pytest
, pytest-aiohttp
, pytest-asyncio
-, pytestrunner
+, pytest-runner
+, pytest-timeout
+, pytestCheckHook
, srptools
, zeroconf
-, fetchFromGitHub
-, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyatv";
- version = "0.7.6";
+ version = "0.7.7";
+
src = fetchFromGitHub {
owner = "postlund";
repo = pname;
rev = "v${version}";
- sha256 = "1lahv6f97fizgh5b2w5yz9455l8ygn99rslhiygkgjywi2flx3p3";
+ sha256 = "sha256-dPnh8XZN7ZVR2rYNnj7GSYXW5I2GNQwD/KRDTgs2AtI=";
};
- nativeBuildInputs = [ pytestrunner];
+ nativeBuildInputs = [ pytest-runner];
propagatedBuildInputs = [
- aiozeroconf
- srptools
aiohttp
- protobuf
+ aiozeroconf
cryptography
netifaces
+ protobuf
+ srptools
zeroconf
];
checkInputs = [
deepdiff
- pytest
pytest-aiohttp
pytest-asyncio
+ pytest-timeout
pytestCheckHook
];
__darwinAllowLocalNetworking = true;
+ pythonImportsCheck = [ "pyatv" ];
+
meta = with lib; {
- description = "A python client library for the Apple TV";
+ description = "Python client library for the Apple TV";
homepage = "https://github.com/postlund/pyatv";
license = licenses.mit;
maintainers = with maintainers; [ elseym ];
diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix
index 712029b692ce..7e06b18e32b2 100644
--- a/pkgs/development/python-modules/pycdio/default.nix
+++ b/pkgs/development/python-modules/pycdio/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
patchShebangs .
'';
- nativeBuildInputs = [ nose pkgs.pkgconfig pkgs.swig ];
+ nativeBuildInputs = [ nose pkgs.pkg-config pkgs.swig ];
buildInputs = [ setuptools pkgs.libcdio ]
++ lib.optional stdenv.isDarwin pkgs.libiconv;
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index 742ea3d08c68..cbf96f11a173 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "PyChromecast";
- version = "8.1.0";
+ version = "9.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-3wKV9lPO51LeOM+O8J8TrZeCxTkk37qhkcpivV4dzhQ=";
+ sha256 = "sha256-q52h0u9CSx/HVfZDb1RaVgVuxt4kB16T82nqyOuCGDc=";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch b/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch
new file mode 100644
index 000000000000..56a5ff391194
--- /dev/null
+++ b/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch
@@ -0,0 +1,30 @@
+From 2fe7a445bafedee2c43050e40697d8b0fd7f7b30 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch
+Date: Fri, 19 Mar 2021 19:37:34 +0100
+Subject: [PATCH] Only build unit-tests
+
+---
+ setup.cfg | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 2c2f49f..a5ec152 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -83,13 +83,6 @@ force_sort_within_sections = true
+ junit_family = xunit2
+ addopts =
+ --verbose
+- --doctest-modules
+- --no-cov-on-fail
+- --cov-fail-under=100
+- --cov-report=term-missing
+- --cov-report=xml:build/coverage/coverage.xml
+- --cov-report=html:build/coverage
+- --junitxml=build/testresults/junit.xml
+
+ [coverage:run]
+ omit =
+--
+2.29.3
+
diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix
new file mode 100644
index 000000000000..7d75896397f3
--- /dev/null
+++ b/pkgs/development/python-modules/pydash/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, mock, pytestCheckHook, invoke }:
+
+buildPythonPackage rec {
+ pname = "pydash";
+ version = "4.9.3";
+
+ src = fetchFromGitHub {
+ owner = "dgilland";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ=";
+ };
+
+ patches = [ ./0001-Only-build-unit-tests.patch ];
+
+ checkInputs = [ mock pytestCheckHook invoke ];
+
+ meta = with lib; {
+ homepage = "https://github.com/dgilland/pydash";
+ description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix
new file mode 100644
index 000000000000..b2cf038f7980
--- /dev/null
+++ b/pkgs/development/python-modules/pydeconz/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, aiohttp
+, aioresponses
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pydeconz";
+ version = "77";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "Kane610";
+ repo = "deconz";
+ rev = "v${version}";
+ sha256 = "0qpipw3si3a23c3nafagfx3zl3v481ha8yakcz1d42mbwsc6hkk4";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ checkInputs = [
+ aioresponses
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "pydeconz" ];
+
+ meta = with lib; {
+ description = "Python library wrapping the Deconz REST API";
+ homepage = "https://github.com/Kane610/deconz";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix
index 9b77cc61de69..c8706760343e 100644
--- a/pkgs/development/python-modules/pyflunearyou/default.nix
+++ b/pkgs/development/python-modules/pyflunearyou/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyflunearyou";
- version = "2.0.0";
+ version = "2.0.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "18vxwfyvicbx8idpa0h0alp4ygnwfph6g4kq93hfm0fc94gi6h94";
+ sha256 = "sha256-2a4OKPmy9tFLJqRg9bEXqrbr3RKVHmKPSYDrtAEqvdo=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 65d3f60da047..9bfa814894de 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -1,19 +1,26 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi }:
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, python
+}:
buildPythonPackage rec {
pname = "pyhomematic";
- version = "0.1.71";
+ version = "0.1.72";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0z09bw2mlhg7n9jyqmcyir306wpxr5nw1qsp5ps2iaw1qnyz5s9n";
+ sha256 = "a1d44103b90418d9c8cde4699a1c671d57d12469be23a45e93bfc00df28ef11b";
};
- # PyPI tarball does not include tests/ directory
- # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126
- doCheck = false;
+ checkPhase = ''
+ ${python.interpreter} -m unittest
+ '';
+
+ pythonImportsCheck = [ "pyhomematic" ];
meta = with lib; {
description = "Python 3 Interface to interact with Homematic devices";
diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix
index e152002cdd15..75bbcde09cd2 100644
--- a/pkgs/development/python-modules/pyicu/default.nix
+++ b/pkgs/development/python-modules/pyicu/default.nix
@@ -1,36 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytest
+, pytestCheckHook
, six
-, fetchpatch
, icu
}:
buildPythonPackage rec {
pname = "PyICU";
- version = "2.3.1";
+ version = "2.6";
src = fetchPypi {
inherit pname version;
- sha256 = "ddb2b453853b4c25db382bc5e8c4cde09b3f4696ef1e1494f8294e174f459cf4";
+ sha256 = "0wb3v421i2fnnxdywam4ay8hqvnxlz0r2nrpx5lqy3rn6dlbz9d9";
};
- patches = [
- (fetchpatch {
- url = "https://salsa.debian.org/python-team/modules/pyicu/raw/debian/2.2-2/"
- + "debian/patches/icu_test.patch";
- sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9";
- })
- ];
-
nativeBuildInputs = [ icu ]; # for icu-config
buildInputs = [ icu ];
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ six ];
+ checkInputs = [ pytestCheckHook six ];
meta = with lib; {
- homepage = "https://pypi.python.org/pypi/PyICU/";
+ homepage = "https://github.com/ovalhub/pyicu/";
description = "Python extension wrapping the ICU C++ API";
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix
index cd8c566c4654..cfe5112ab221 100644
--- a/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/pkgs/development/python-modules/pyinsteon/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyinsteon";
- version = "1.0.9";
+ version = "1.0.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-+3tA+YdpTKDt7uOSl6Z1G8jTjpBJ8S9gjiQTacQSFTc=";
+ sha256 = "sha256-8b/PvMFHvYGVWw6ycLnL8n972cn+1QW/VTMiblMPam4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix
index f231f98df85d..d2775d6e3b9e 100644
--- a/pkgs/development/python-modules/pyiqvia/default.nix
+++ b/pkgs/development/python-modules/pyiqvia/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyiqvia";
- version = "0.3.2";
+ version = "0.3.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "089lah23939m523jmjkaw2li0fikp2nswxznfvzwnr6wjpp3m9as";
+ sha256 = "sha256-XYWoHKa/yq7MtGVM6eVgLtR2E3VmqsjX3TNcQcd7dEQ=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pykodi/default.nix b/pkgs/development/python-modules/pykodi/default.nix
new file mode 100644
index 000000000000..24450270a836
--- /dev/null
+++ b/pkgs/development/python-modules/pykodi/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, aiohttp, jsonrpc-async, jsonrpc-websocket }:
+
+buildPythonPackage rec {
+ pname = "pykodi";
+ version = "0.2.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "099xyn5aql5mdim6kh4hwx0fg1a3bx73qdvwr48nz23cljmmk1m8";
+ };
+
+ propagatedBuildInputs = [ aiohttp jsonrpc-async jsonrpc-websocket ];
+
+ pythonImportsCheck = [ "pykodi" ];
+
+ meta = with lib; {
+ description = "An async python interface for Kodi over JSON-RPC";
+ homepage = "https://github.com/OnFreund/PyKodi";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sephalon ];
+ };
+}
diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
index 26812ff9151a..b16ea62717a5 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -1,27 +1,41 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, certifi, six
-, setuptools_scm
+{ lib
+, buildPythonPackage
+, certifi
+, fetchPypi
+, flaky
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+, six
}:
buildPythonPackage rec {
pname = "pylast";
- version = "4.1.0";
-
- disabled = !isPy3k;
+ version = "4.2.0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932";
+ sha256 = "sha256-w/mkAUUgj7L7Xv+nz1pI1TYKfihH3S3MbxaNQ4VtoH0=";
};
- nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ certifi six ];
+ nativeBuildInputs = [ setuptools-scm ];
- # tests require last.fm credentials
- doCheck = false;
+ propagatedBuildInputs = [
+ certifi
+ six
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ flaky
+ ];
+
+ pythonImportsCheck = [ "pylast" ];
meta = with lib; {
+ description = "Python interface to last.fm (and compatibles)";
homepage = "https://github.com/pylast/pylast";
- description = "A python interface to last.fm (and compatibles)";
license = licenses.asl20;
maintainers = with maintainers; [ rvolosatovs ];
};
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 19ffb6419d9a..43183482eceb 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -1,50 +1,67 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, installShellFiles,
- isort, mccabe, pytestCheckHook, pytest-benchmark, pytestrunner, toml }:
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, installShellFiles
+, astroid
+, isort
+, mccabe
+, toml
+, pytest-benchmark
+, pytest-xdist
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "pylint";
- version = "2.6.2";
+ version = "2.7.1";
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-cYt0eG6n7QeqDFi/VyFU1Geflg0m6WQcwd4gSjC4f8k=";
+ sha256 = "10nrvzk1naf5ryawmi59wp99k31053sz37q3x9li2hj2cf7i1kl1";
};
- nativeBuildInputs = [ pytestrunner installShellFiles ];
+ nativeBuildInputs = [
+ installShellFiles
+ ];
- checkInputs = [ pytestCheckHook pytest-benchmark ];
+ propagatedBuildInputs = [
+ astroid
+ isort
+ mccabe
+ toml
+ ];
- propagatedBuildInputs = [ astroid isort mccabe toml ];
-
- postPatch = lib.optionalString stdenv.isDarwin ''
- # Remove broken darwin test
- rm -vf pylint/test/test_functional.py
+ postInstall = ''
+ mkdir -p $out/share/emacs/site-lisp
+ cp -v "elisp/"*.el $out/share/emacs/site-lisp/
+ installManPage man/*.1
'';
- disabledTests = [
- # https://github.com/PyCQA/pylint/issues/3198
- "test_by_module_statement_value"
- # has issues with local directories
- "test_version"
- ] ++ lib.optionals stdenv.isDarwin [
- "test_parallel_execution"
- "test_py3k_jobs_option"
- ];
+ checkInputs = [
+ pytest-benchmark
+ pytest-xdist
+ pytestCheckHook
+ ];
+
+ dontUseSetuptoolsCheck = true;
# calls executable in one of the tests
preCheck = ''
export PATH=$PATH:$out/bin
'';
- dontUseSetuptoolsCheck = true;
+ pytestFlagsArray = [
+ "-n auto"
+ ];
- postInstall = ''
- mkdir -p $out/share/emacs/site-lisp
- cp "elisp/"*.el $out/share/emacs/site-lisp/
- installManPage man/*.1
- '';
+ disabledTests = lib.optionals stdenv.isDarwin [
+ "test_parallel_execution"
+ "test_py3k_jobs_option"
+ ];
meta = with lib; {
homepage = "https://pylint.pycqa.org/";
diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix
index 145b405922d8..8b390ac12faf 100644
--- a/pkgs/development/python-modules/pymazda/default.nix
+++ b/pkgs/development/python-modules/pymazda/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pymazda";
- version = "0.0.9";
+ version = "0.0.10";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "15kygabjlxmy3g5kj48ixqdwaz8qrfzxj8ii27cidsp2fq8ph165";
+ sha256 = "sha256-sJj4RkVaELNitcz1H8YitNgIx4f35WeQf7M5miYD5yI=";
};
propagatedBuildInputs = [ aiohttp pycryptodome ];
diff --git a/pkgs/development/python-modules/pymitv/default.nix b/pkgs/development/python-modules/pymitv/default.nix
index ffaabb04a291..32f90d07dcb4 100644
--- a/pkgs/development/python-modules/pymitv/default.nix
+++ b/pkgs/development/python-modules/pymitv/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pymitv";
- version = "1.4.3";
+ version = "1.5.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0jbs1zhqpnsyad3pd8cqy1byv8m5bq17ydc6crmrfkjbp6xvvg3x";
+ sha256 = "sha256-0n4IS5W3nvYwKdl6FVf4upRrFDGdYHohsaXadFy8d8w=";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix
index 6e72309a58d3..45c193899fe0 100644
--- a/pkgs/development/python-modules/pymumble/default.nix
+++ b/pkgs/development/python-modules/pymumble/default.nix
@@ -1,31 +1,50 @@
-{ buildPythonPackage,
- fetchFromGitHub,
- isPy27,
- lib,
- opuslib,
- protobuf,
+{ buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, isPy27
+, lib
+, opuslib
+, protobuf
+, pytestCheckHook
+, pycrypto
}:
buildPythonPackage rec {
pname = "pymumble";
- version = "0.3.1";
+ version = "1.6";
disabled = isPy27;
src = fetchFromGitHub {
owner = "azlux";
repo = "pymumble";
- rev = "1dd6d6d4df2fdef33202f17e2acf3ba9678a5737";
- sha256 = "1r1sch8xrpbzffsb72lhp5xjr3ac3xb599n44vsfmaam3xklz6vz";
+ rev = version;
+ sha256 = "04nc66d554a98mbmdgzgsg6ncaz0jsn4zdr3mr14w6wnhrxpjkrs";
};
+ patches = [
+ # Compatibility with pycryptodome (which is what our pycrypto really is)
+ # See https://github.com/azlux/pymumble/pull/99
+ (fetchpatch {
+ url = "https://github.com/azlux/pymumble/pull/99/commits/b85548a0e1deaac820954b1c0b308af214311a14.patch";
+ sha256 = "0w9dpc87rny6vmhi634pih1p97b67jm26qajscpa9wp6nphdlxlj";
+ })
+ ];
+
+ postPatch = ''
+ # Changes all `library==x.y.z` statements to just `library`
+ # So that we aren't constrained to a specific version
+ sed -i 's/\(.*\)==.*/\1/' requirements.txt
+ '';
propagatedBuildInputs = [ opuslib protobuf ];
+ checkInputs = [ pytestCheckHook pycrypto ];
+
pythonImportsCheck = [ "pymumble_py3" ];
meta = with lib; {
description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot.";
homepage = "https://github.com/azlux/pymumble";
- license = licenses.gpl3;
- maintainers = with maintainers; [ thelegy ];
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ thelegy infinisil ];
};
}
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 86a4c8476839..6bc8c04ec30c 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -64,11 +64,12 @@ let
in
buildPythonPackage rec {
- pname = "pyOpenSSL";
+ pname = "pyopenssl";
version = "20.0.1";
src = fetchPypi {
- inherit pname version;
+ pname = "pyOpenSSL";
+ inherit version;
sha256 = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51";
};
diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix
index 17976137f561..130b44c09694 100644
--- a/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/pkgs/development/python-modules/pyopenuv/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyopenuv";
- version = "2.0.1";
+ version = "2.0.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1pzdcy65gndrlyhrwyc1rwsh8n4w79wla8n9fr13m00vac3cqkl0";
+ sha256 = "sha256-QVgNwu/NXSV9nbRN0POBCdKCv6xdp4uSEzFAiHkhVaQ=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index f46a5d2db827..16a894546e49 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
PATH="${pkgs.parted}/sbin:$PATH"
'';
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
checkInputs = [ six ];
propagatedBuildInputs = [ pkgs.parted ];
diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix
index 348f91715022..d325c170dc64 100644
--- a/pkgs/development/python-modules/pypoppler/default.nix
+++ b/pkgs/development/python-modules/pypoppler/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
};
NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.poppler.dev ];
propagatedBuildInputs = [ pycairo pygobject2 ];
diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix
index 4b52d3b290c4..e98e2bc3dbc4 100644
--- a/pkgs/development/python-modules/pypykatz/default.nix
+++ b/pkgs/development/python-modules/pypykatz/default.nix
@@ -1,7 +1,8 @@
{ lib
+, aiosmb
, aiowinreg
, buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
, minidump
, minikerberos
, msldap
@@ -10,16 +11,15 @@
buildPythonPackage rec {
pname = "pypykatz";
- version = "0.4.3";
+ version = "0.4.7";
- src = fetchFromGitHub {
- owner = "skelsec";
- repo = pname;
- rev = version;
- sha256 = "sha256-ows6zJyygdAwgKNKKCURWX+kl42f3CN23/xZrLjkfrw=";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0il5sj47wyf9gn76alm8v1l63rqw2vsd27v6f7q1dpn0wq209syi";
};
propagatedBuildInputs = [
+ aiosmb
aiowinreg
minikerberos
msldap
diff --git a/pkgs/development/python-modules/pyradios/default.nix b/pkgs/development/python-modules/pyradios/default.nix
new file mode 100644
index 000000000000..f95988063dd2
--- /dev/null
+++ b/pkgs/development/python-modules/pyradios/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, appdirs, requests }:
+buildPythonPackage rec {
+ pname = "pyradios";
+ version = "0.0.22";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1bgfb8vz7jybswss16pdzns0qpqfrwa9f2g8qrh1r4mig4xh2dmi";
+ };
+
+ propagatedBuildInputs = [
+ appdirs
+ requests
+ ];
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Python client for the https://api.radio-browser.info";
+ homepage = "https://github.com/andreztz/pyradios";
+ license = licenses.mit;
+ maintainers = with maintainers; [ infinisil ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index 206e3671f47f..1bb91953983f 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pyshark";
- version = "0.4.2.11";
+ version = "0.4.3";
src = fetchFromGitHub {
owner = "KimiNewt";
repo = pname;
rev = "v${version}";
- sha256 = "07dkhkf85cplcj1h3k8mmqzsn4zdkxzr0zg3gvf8yc8p5g5azx9q";
+ sha256 = "sha256-cveiFkkSplfQPgUEVWyV40KKHCtKJZsfvdV8JmEUmE4=";
};
propagatedBuildInputs = [
@@ -29,6 +29,8 @@ buildPythonPackage rec {
wireshark-cli
];
+ pythonImportsCheck = [ "pyshark" ];
+
meta = with lib; {
description = "Python wrapper for tshark, allowing python packet parsing using wireshark dissectors";
homepage = "https://github.com/KimiNewt/pyshark/";
diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix
index f1005fe0b7a9..5cc86e909f00 100644
--- a/pkgs/development/python-modules/pysma/default.nix
+++ b/pkgs/development/python-modules/pysma/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pysma";
- version = "0.3.5";
+ version = "0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1awcsbk14i2aw01f7b7hrmpn9q6vr9v6la0i9n7ldv1h8rzq6j16";
+ sha256 = "sha256-BOVALVFb/p2q3A4NkvgtwmL5fNvwMCk0hb1L5MRWzHY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix
index 39c26a3e0f36..58b69c4ce560 100644
--- a/pkgs/development/python-modules/pytest-catchlog/default.nix
+++ b/pkgs/development/python-modules/pytest-catchlog/default.nix
@@ -10,7 +10,8 @@ buildPythonPackage rec {
extension = "zip";
};
- buildInputs = [ pytest unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ pytest ];
checkPhase = "make test";
# Requires pytest < 3.1
diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix
index 7108a8f4c176..6e243b55bbd0 100644
--- a/pkgs/development/python-modules/pytest-dependency/default.nix
+++ b/pkgs/development/python-modules/pytest-dependency/default.nix
@@ -9,6 +9,14 @@ buildPythonPackage rec {
sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b";
};
+ patches = [
+ # Fix build with pytest ≥ 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51
+ (fetchpatch {
+ url = "https://github.com/RKrahl/pytest-dependency/commit/0930889a13e2b9baa7617f05dc9b55abede5209d.patch";
+ sha256 = "0ka892j0rrlnfvk900fcph0f6lsnr9dy06q5k2s2byzwijhdw6n5";
+ })
+ ];
+
propagatedBuildInputs = [ pytest ];
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-error-for-skips/default.nix b/pkgs/development/python-modules/pytest-error-for-skips/default.nix
new file mode 100644
index 000000000000..60d3f16a1c97
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-error-for-skips/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-error-for-skips";
+ version = "2.0.2";
+
+ src = fetchFromGitHub {
+ owner = "jankatins";
+ repo = pname;
+ rev = version;
+ sha256 = "04i4jd3bg4lgn2jfh0a0dzg3ml9b2bjv2ndia6b64w96r3r4p3qr";
+ };
+
+ buildInputs = [ pytest ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "pytest_error_for_skips" ];
+
+ meta = with lib; {
+ description = "Pytest plugin to treat skipped tests a test failures";
+ homepage = "https://github.com/jankatins/pytest-error-for-skips";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
index 855e1fb470c2..0cfb8cd6afc8 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -18,7 +18,13 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ py pytest ];
+ buildInputs = [
+ pytest
+ ];
+
+ propagatedBuildInputs = [
+ py
+ ];
checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix
index e5fbb6bb0707..2fbc7a651c18 100644
--- a/pkgs/development/python-modules/pytest-freezegun/default.nix
+++ b/pkgs/development/python-modules/pytest-freezegun/default.nix
@@ -18,9 +18,10 @@ buildPythonPackage rec {
sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
freezegun
- pytest
];
checkInputs = [
diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix
index b86947f5f758..7d2e07db01fc 100644
--- a/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/pkgs/development/python-modules/pytest-testmon/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pytest-testmon";
- version = "1.0.3";
+ version = "1.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169";
+ sha256 = "sha256-+IpT0o+Jg2UJcy6d7mEdZsYfW4IXIBu4IqBFbywyPRk=";
};
propagatedBuildInputs = [ coverage ];
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index 5833790cf92d..8c59b6ee2c9c 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0";
};
- propagatedBuildInputs = [ pytest ];
+ buildInputs = [ pytest ];
checkInputs = [ pytestCheckHook pexpect pytestcov ];
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index a6f6ffd7dc0d..bbc08fb59df4 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -22,8 +22,11 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ setuptools_scm ];
+ buildInputs = [
+ pytest
+ ];
checkInputs = [ pytestCheckHook filelock ];
- propagatedBuildInputs = [ execnet pytest pytest-forked psutil ];
+ propagatedBuildInputs = [ execnet pytest-forked psutil ];
# access file system
disabledTests = [
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 798084d11117..579cfe1271f3 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,19 +1,16 @@
{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
, atomicwrites
, attrs
-, funcsigs
, hypothesis
, iniconfig
-, mock
, more-itertools
, packaging
, pathlib2
, pluggy
, py
, pygments
-, python
, setuptools
-, setuptools_scm
+, setuptools-scm
, six
, toml
, wcwidth
@@ -21,18 +18,17 @@
}:
buildPythonPackage rec {
- version = "6.1.2";
pname = "pytest";
-
+ version = "6.2.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e";
+ sha256 = "sha256-nR7fnn0LhNcuo9vN/SKzX7VDpejypgCS3VeJNr9j1/k=";
};
- checkInputs = [ hypothesis pygments ];
- nativeBuildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools-scm ];
+
propagatedBuildInputs = [
atomicwrites
attrs
@@ -47,6 +43,11 @@ buildPythonPackage rec {
wcwidth
] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+ checkInputs = [
+ hypothesis
+ pygments
+ ];
+
doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
preCheck = ''
@@ -80,8 +81,9 @@ buildPythonPackage rec {
];
meta = with lib; {
- homepage = "https://docs.pytest.org";
description = "Framework for writing tests";
+ homepage = "https://docs.pytest.org";
+ changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
license = licenses.mit;
};
diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix
index 78c89408ac2d..07d7ba9b3c11 100644
--- a/pkgs/development/python-modules/python-miio/default.nix
+++ b/pkgs/development/python-modules/python-miio/default.nix
@@ -1,51 +1,75 @@
{ lib
, buildPythonPackage
+, pythonOlder
, fetchPypi
-, appdirs
+, poetry
, click
-, construct
-, croniter
, cryptography
-, importlib-metadata
-, pytest
-, pytest-mock
+, construct
, zeroconf
, attrs
, pytz
+, appdirs
, tqdm
, netifaces
+, android-backup
+, importlib-metadata
+, croniter
+, defusedxml
+, pytestCheckHook
+, pytest-mock
+, pyyaml
}:
buildPythonPackage rec {
pname = "python-miio";
- version = "0.5.4";
+ version = "0.5.5.2";
+ disabled = pythonOlder "3.6";
+ format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "5a6fd3bb2cc2f75cdfe5673f36a5a418144d08add6e53b384cb146e99f27bd39";
+ sha256 = "sha256-lk7egCyj+vSsaXmxuWxlQuom8n3JEs/RIWwCuwTOXeI=";
};
postPatch = ''
- substituteInPlace setup.py \
- --replace "zeroconf>=0.25.1,<0.26.0" "zeroconf"
- substituteInPlace setup.py \
- --replace "pytz>=2019.3,<2020.0" "pytz"
- substituteInPlace setup.py \
- --replace "cryptography>=2.9,<3.0" "cryptography"
- '';
-
- checkInputs = [ pytest pytest-mock];
- propagatedBuildInputs = [ appdirs click construct croniter cryptography importlib-metadata zeroconf attrs pytz tqdm netifaces ];
-
- checkPhase = ''
- pytest
+ substituteInPlace pyproject.toml \
+ --replace 'croniter = "^0"' 'croniter = "*"' \
+ --replace 'defusedxml = "^0.6"' 'defusedxml = "*"'
'';
+ nativeBuildInputs = [
+ poetry
+ ];
+
+ propagatedBuildInputs = [
+ click
+ cryptography
+ construct
+ zeroconf
+ attrs
+ pytz
+ appdirs
+ tqdm
+ netifaces
+ android-backup
+ croniter
+ defusedxml
+ ] ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-mock
+ pyyaml
+ ];
+
+ pythonImportsCheck = [ "miio" ];
+
meta = with lib; {
description = "Python library for interfacing with Xiaomi smart appliances";
homepage = "https://github.com/rytilahti/python-miio";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ flyfloh ];
};
}
diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix
index 634ccea371e0..906f08439808 100644
--- a/pkgs/development/python-modules/python-opendata-transport/default.nix
+++ b/pkgs/development/python-modules/python-opendata-transport/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "python-opendata-transport";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchPypi {
pname = "python_opendata_transport";
inherit version;
- sha256 = "0pxs9zqk00vn1s74cx1416mqmixrr74wb0jb0j6b1c3xpvzlfbks";
+ sha256 = "sha256-Z0VHkKYHpwbBwwFrMtA5JRy0m7f0566IjCmGizoKEoo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix
index 2fd88858de75..dc967b54305c 100644
--- a/pkgs/development/python-modules/python-prctl/default.nix
+++ b/pkgs/development/python-modules/python-prctl/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, libcap
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -13,9 +14,25 @@ buildPythonPackage rec {
sha256 = "b4ca9a25a7d4f1ace4fffd1f3a2e64ef5208fe05f929f3edd5e27081ca7e67ce";
};
- patches = [ ./skip_bad_tests.patch ];
buildInputs = [ libcap ];
+ checkInputs = [ pytestCheckHook ];
+
+ disabledTests = [
+ # Intel MPX support was removed in GCC 9.1 & Linux kernel 5.6
+ "test_mpx"
+
+ # The Nix build sandbox has no_new_privs already enabled
+ "test_no_new_privs"
+
+ # The Nix build sandbox has seccomp already enabled
+ "test_seccomp"
+
+ # This will fail if prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_FORCE_DISABLE)
+ # has been set system-wide, even outside the sandbox
+ "test_speculation_ctrl"
+ ];
+
meta = {
description = "Python(ic) interface to the linux prctl syscall";
homepage = "https://github.com/seveas/python-prctl";
diff --git a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch b/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch
deleted file mode 100644
index 19d70f234a99..000000000000
--- a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./test_prctl.py 2018-01-26 16:02:52.000000000 -0500
-+++ ./test_prctl.py 2018-06-21 18:26:43.370065009 -0400
-@@ -154,6 +154,7 @@
- prctl.set_keepcaps(False)
- self.assertEqual(prctl.get_keepcaps(), False)
-
-+ @unittest.skip("No access to /proc in the Nix build sandbox")
- @require('set_mce_kill')
- def test_mce_kill(self):
- """Test the MCE_KILL setting"""
-@@ -173,6 +174,7 @@
- prctl.set_name(name)
- self.assertEqual(prctl.get_name(), name[:15])
-
-+ @unittest.skip("The Nix build sandbox has no_new_privs already enabled")
- @require('get_no_new_privs')
- def test_no_new_privs(self):
- """Test the no_new_privs function"""
-@@ -189,6 +191,7 @@
- self.assertNotEqual(sp.returncode, 0)
- os._exit(0)
-
-+ @unittest.skip("No access to /proc in the Nix build sandbox")
- def test_proctitle(self):
- """Test setting the process title, including too long titles"""
- title = "This is a test!"
-@@ -225,6 +228,7 @@
- os._exit(0)
- self.assertRaises(OSError, prctl.set_ptracer, new_pid)
-
-+ @unittest.skip("The Nix build sandbox has seccomp already enabled")
- @require('get_seccomp')
- def test_seccomp(self):
- """Test manipulation of the seccomp setting"""
diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix
index 3162a0326288..904437bdcf66 100644
--- a/pkgs/development/python-modules/python-simple-hipchat/default.nix
+++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
meta = with lib; {
description = "Easy peasy wrapper for HipChat's v1 API";
diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix
index 720fdff743e7..c1901a750864 100644
--- a/pkgs/development/python-modules/pytile/default.nix
+++ b/pkgs/development/python-modules/pytile/default.nix
@@ -25,10 +25,6 @@ buildPythonPackage rec {
format = "pyproject";
- postPatch = ''
- substituteInPlace pyproject.toml --replace 'aiohttp = "^3.7.4"' 'aiohttp = "^3.7.3"'
- '';
-
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix
index 700188f15dd1..87f6b9756ed3 100644
--- a/pkgs/development/python-modules/pyxnat/default.nix
+++ b/pkgs/development/python-modules/pyxnat/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPy27
+, pythonOlder
, nose
, lxml
, requests
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyxnat";
version = "1.4";
- disabled = isPy27;
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -19,6 +19,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ lxml requests ];
+ # future is not used, and pathlib is installed part of python38+
+ # w/o an external package
+ prePatch = ''
+ substituteInPlace setup.py \
+ --replace "pathlib>=1.0" "" \
+ --replace "future>=0.16" ""
+ '';
+
checkInputs = [ nose ];
checkPhase = "nosetests pyxnat/tests";
doCheck = false; # requires a docker container running an XNAT server
diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix
index 0de5d6de3bba..57c52ff49ba9 100644
--- a/pkgs/development/python-modules/rabbitpy/default.nix
+++ b/pkgs/development/python-modules/rabbitpy/default.nix
@@ -38,6 +38,10 @@ buildPythonPackage rec {
description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library";
homepage = "https://pypi.python.org/pypi/rabbitpy";
license = licenses.bsd3;
+
+ # broken by pamqp==3, tracked in
+ # https://github.com/gmr/rabbitpy/issues/125
+ broken = true;
};
}
diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix
index b747304446b7..97f2e5a6afc2 100644
--- a/pkgs/development/python-modules/rdkit/default.nix
+++ b/pkgs/development/python-modules/rdkit/default.nix
@@ -40,8 +40,8 @@ let
};
in
buildPythonPackage rec {
- version = "2020.09.3";
pname = "rdkit";
+ version = "2020.09.5";
src =
let
@@ -51,7 +51,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "Release_${versionTag}";
- sha256 = "1k1wvzcd1yfx4nhz3iq2aaadzdk5w6sfcb4imhvm7pkbzij0nicx";
+ sha256 = "1ycbjia223d0w9xiwk36x2vkdidsx198rzkfyxz48cbax9vvklzq";
};
unpackPhase = ''
@@ -89,7 +89,7 @@ buildPythonPackage rec {
];
hardeningDisable = [ "format" ]; # required by yaehmop
- # doCheck = false;
+
dontUseSetuptoolsBuild = true;
dontUsePipInstall = true;
dontUseSetuptoolsCheck = true;
diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix
index 3380ef99f180..02ac2da96726 100644
--- a/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/pkgs/development/python-modules/regenmaschine/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "regenmaschine";
- version = "3.1.1";
+ version = "3.1.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "0m6i7vspp8ssdk2k32kznql1j8gkp300kzb7pk67hzvpijdy3mca";
+ sha256 = "sha256-lARti3Sb/jh7h8x+lFLqkM/BlL6XmELm46owsL041Cw=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
index acce48c45d04..b2fc2d9beae7 100644
--- a/pkgs/development/python-modules/restview/default.nix
+++ b/pkgs/development/python-modules/restview/default.nix
@@ -7,38 +7,32 @@
, packaging
, pygments
, mock
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "restview";
- version = "2.9.1";
+ version = "2.9.2";
src = fetchPypi {
inherit pname version;
- sha256 = "de87c84f19526bd4a76505f6d40b51b7bb03ca43b6067c93f82f1c7237ac9e84";
+ sha256 = "1p1jgdvc04ws8kga3r0vrq3m0b52qw3clwyydl96a13wb3mrf03r";
};
- propagatedBuildInputs = [ docutils readme_renderer packaging pygments ];
- checkInputs = [ mock ];
-
patches = [
- # fix tests after readme_renderer update
- # TODO remove on next update
(fetchpatch {
- url = "https://github.com/mgedmin/restview/commit/541743ded13ae55dea4c437046984a5f13d06e8b.patch";
- sha256 = "031b1dlqx346bz7afpc011lslnq771lnxb6iy1l2285pph534bci";
+ url = "https://github.com/mgedmin/restview/commit/a1ded30a87c65f3ce59a18497a7fc5099317c2be.patch";
+ sha256 = "1ax7pih456a3nbj8qrrq7hqigbyag4ihzpn6bm0z4y74d0r3v8a5";
})
];
- postPatch = ''
- # dict order breaking tests
- sed -i 's@@...@' src/restview/tests.py
- '';
+ propagatedBuildInputs = [ docutils readme_renderer packaging pygments ];
+ checkInputs = [ mock pytestCheckHook ];
meta = {
description = "ReStructuredText viewer";
homepage = "https://mg.pov.lt/restview/";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ koral ];
};
}
diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index c4e451aade5e..21d5886efe21 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, nose }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }:
buildPythonPackage rec {
pname = "rope";
@@ -9,6 +9,15 @@ buildPythonPackage rec {
sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04";
};
+ patches = [
+ # Python 3.9 ast changes
+ (fetchpatch {
+ url = "https://github.com/python-rope/rope/pull/333.patch";
+ excludes = [ ".github/workflows/main.yml" ];
+ sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0";
+ })
+ ];
+
checkInputs = [ nose ];
checkPhase = ''
# tracked upstream here https://github.com/python-rope/rope/issues/247
@@ -19,6 +28,6 @@ buildPythonPackage rec {
description = "Python refactoring library";
homepage = "https://github.com/python-rope/rope";
maintainers = with maintainers; [ goibhniu ];
- license = licenses.gpl2;
+ license = licenses.gpl3Plus;
};
}
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index f8de633c613c..8476701d47a6 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.29.1";
+ version = "2.31.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-5hFX6tVLolPxC/40ssdr0XYp3Vn3fVvBWGi7Utp6/k8=";
+ sha256 = "sha256-RMw7l3s0QBzB+exiZg2aBQYeprHUJM+f0Rf+N8ywaBU=";
};
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index 0b8edf8bdd90..52aa8a98e1e4 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://salmon-mail.readthedocs.org/";
description = "Pythonic mail application server";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ jluttine ];
};
}
diff --git a/pkgs/development/python-modules/sane/default.nix b/pkgs/development/python-modules/sane/default.nix
index d45c736d8d03..b02feb9e2192 100644
--- a/pkgs/development/python-modules/sane/default.nix
+++ b/pkgs/development/python-modules/sane/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, saneBackends
+, sane-backends
}:
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
};
buildInputs = [
- saneBackends
+ sane-backends
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix
index 06d2d40d1802..08c9e7ce3ebe 100644
--- a/pkgs/development/python-modules/sasmodels/default.nix
+++ b/pkgs/development/python-modules/sasmodels/default.nix
@@ -1,20 +1,30 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils
-, pyopencl, opencl-headers
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pytest_5
+, numpy
+, scipy
+, matplotlib
+, docutils
+, pyopencl
+, opencl-headers
}:
buildPythonPackage rec {
pname = "sasmodels";
- version = "1.0.2";
+ version = "1.0.4";
src = fetchFromGitHub {
owner = "SasView";
repo = "sasmodels";
rev = "v${version}";
- sha256 = "1qvh7q0fkls5r8r9mrph6igcvv8x3qsslqsc5jf1n20alcs5zjrl";
+ sha256 = "0h2k81dm92sm0z086qy3ipw6y6cfgpb7ppl7lhjmx6816s3k50sa";
};
buildInputs = [ opencl-headers ];
- checkInputs = [ pytest ];
+ # Note: the 1.0.5 release should be compatible with pytest6, so this can
+ # be set back to 'pytest' at that point
+ checkInputs = [ pytest_5 ];
propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index c281a6d6b0da..cb4578671b98 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -1,27 +1,34 @@
{ lib
-, fetchFromGitHub
, buildPythonPackage
+, fetchFromGitHub
+, pytest-cov
, pytestCheckHook
-, pytestcov
}:
buildPythonPackage rec {
pname = "semver";
- version = "2.10.2";
+ version = "2.13.0";
src = fetchFromGitHub {
owner = "python-semver";
repo = "python-semver";
rev = version;
- sha256 = "0yxjmcgk5iwp53l9z1cg0ajrj18i09ircs11ifpdrggzm8n1blf3";
+ sha256 = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w=";
};
- preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest
- checkInputs = [ pytestCheckHook pytestcov ];
+ checkInputs = [
+ pytest-cov
+ pytestCheckHook
+ ];
+
+ # Confuses source vs dist imports in pytest
+ preCheck = "rm -r dist";
+
+ pythonImportsCheck = [ "semver" ];
meta = with lib; {
description = "Python package to work with Semantic Versioning (http://semver.org/)";
- homepage = "https://python-semver.readthedocs.io/en/latest/";
+ homepage = "https://python-semver.readthedocs.io/";
license = licenses.bsd3;
maintainers = with maintainers; [ np ];
};
diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index e24c771457fc..e3d8a35186a9 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ callPackage
+, lib
, buildPythonPackage
, fetchPypi
, isPy27
@@ -26,6 +27,8 @@ buildPythonPackage rec {
doCheck = false;
pythonImportsCheck = [ "setuptools_rust" ];
+ passthru.tests.pyo3 = callPackage ./pyo3-test {};
+
meta = with lib; {
description = "Setuptools plugin for Rust support";
homepage = "https://github.com/PyO3/setuptools-rust";
diff --git a/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix b/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix
new file mode 100644
index 000000000000..9af17aa5159c
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix
@@ -0,0 +1,21 @@
+{ callPackage
+, rustPlatform
+, setuptools-rust
+}:
+
+callPackage ../../../tools/rust/maturin/pyo3-test/generic.nix {
+ # Isolated builds break for this package, because PyO3 is not
+ # in the build root of the Python Package:
+ #
+ # https://github.com/pypa/pip/issues/6276
+ #
+ format = "setuptools";
+
+ nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
+
+ sourceRoot = "source/examples/word-count";
+}
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index fe08f5bbe2e5..dd27c02dc874 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -2,39 +2,35 @@
, buildPythonPackage
, fetchFromGitHub
, stdenv
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "simplejson";
- version = "3.17.0";
+ version = "3.17.2";
doCheck = !stdenv.isDarwin;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1b1hhh1dia673vhq3jl2br1iqwb9yjii6iak56w96s9972vjbz3z";
+ sha256 = "sha256-2ZC7aKyUUcth43Ce0j6JdjrJ4gb4QfJDlY2M5TLMQ+o=";
};
- # Package does not need pytest, but its a bit easier debugging.
- checkInputs = [ pytest ];
- # Ignore warnings because test does not expect them in stderr
- # See https://github.com/simplejson/simplejson/issues/241
- checkPhase = ''
- PYTHONWARNINGS="ignore" pytest simplejson/tests
- '';
+ checkInputs = [ pytestCheckHook ];
- meta = {
- description = "A simple, fast, extensible JSON encoder/decoder for Python";
+ pythonImportsCheck = [ "simplejson" ];
+
+ meta = with lib; {
+ description = "Extensible JSON encoder/decoder for Python";
longDescription = ''
- simplejson is compatible with Python 2.4 and later with no
- external dependencies. It covers the full JSON specification
- for both encoding and decoding, with unicode support. By
- default, encoding is done in an encoding neutral fashion (plain
- ASCII with \uXXXX escapes for unicode characters).
+ simplejson covers the full JSON specification for both encoding
+ and decoding, with unicode support. By default, encoding is done
+ in an encoding neutral fashion (plain ASCII with \uXXXX escapes
+ for unicode characters).
'';
homepage = "https://github.com/simplejson/simplejson";
- license = with lib.licenses; [ mit afl21 ];
+ license = with licenses; [ mit afl21 ];
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/simplekml/default.nix b/pkgs/development/python-modules/simplekml/default.nix
index 6b8bac25b87b..42e93d63faee 100644
--- a/pkgs/development/python-modules/simplekml/default.nix
+++ b/pkgs/development/python-modules/simplekml/default.nix
@@ -1,4 +1,7 @@
-{ lib , buildPythonPackage , fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
buildPythonPackage rec {
pname = "simplekml";
@@ -9,11 +12,13 @@ buildPythonPackage rec {
sha256 = "17h48r1dsfz4g9xcxh1xq85h20hiz7qzzymc1gla96bj2wh4wyv5";
};
- doCheck = false; # no tests are defined in 1.3.5
+ # no tests are defined in 1.3.5
+ doCheck = false;
+ pythonImportsCheck = [ "simplekml" ];
meta = with lib; {
- description = "Generate KML with as little effort as possible";
- homepage = "https://readthedocs.org/projects/simplekml/";
+ description = "Python package to generate KML";
+ homepage = "https://simplekml.readthedocs.io/";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ rvolosatovs ];
};
diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix
new file mode 100644
index 000000000000..5b8925b0a4c6
--- /dev/null
+++ b/pkgs/development/python-modules/simplisafe-python/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, aiohttp
+, aresponses
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+, python-engineio
+, python-socketio
+, pythonOlder
+, pytz
+, voluptuous
+, websockets
+}:
+
+buildPythonPackage rec {
+ pname = "simplisafe-python";
+ version = "9.6.9";
+ format = "pyproject";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "bachya";
+ repo = pname;
+ rev = version;
+ sha256 = "1q5w5pvrgj94bzd5wig79l4hipkfrcdah54rvwyi7b8q46gw77sg";
+ };
+
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ python-engineio
+ python-socketio
+ pytz
+ voluptuous
+ websockets
+ ];
+
+ checkInputs = [
+ aresponses
+ asynctest
+ pytest-asyncio
+ pytest-cov
+ pytestCheckHook
+ ];
+
+ disabledTestPaths = [ "examples/" ];
+
+ pythonImportsCheck = [ "simplipy" ];
+
+ meta = with lib; {
+ description = "Python library the SimpliSafe API";
+ homepage = "https://simplisafe-python.readthedocs.io/";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix
index 958fc613f6f3..d973bc70bcdb 100644
--- a/pkgs/development/python-modules/sklearn-deap/default.nix
+++ b/pkgs/development/python-modules/sklearn-deap/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
};
patches = [
- # Fix for newer versions of scikit-learn. See: https://github.com/rsteca/sklearn-deap/pull/62
+ # Fix for scikit-learn v0.21.1. See: https://github.com/rsteca/sklearn-deap/pull/62
(fetchpatch {
url = "https://github.com/rsteca/sklearn-deap/commit/3ae62990fc87f36b59382e7c4db3c74cf99ec3bf.patch";
sha256 = "1na6wf4v0dcmyz3pz8aiqkmv76d1iz3hi4iyfq9kfnycgzpv1kxk";
@@ -31,6 +31,8 @@ buildPythonPackage rec {
homepage = "https://github.com/rsteca/sklearn-deap";
license = licenses.lgpl3;
maintainers = with maintainers; [ psyanticy ];
+ # broken by scikit-learn 0.24.1
+ broken = true;
};
}
diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index cb491cf60078..195bd720615c 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
- version = "3.4.0";
+ version = "3.4.2";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
- sha256 = "sha256-WlHVorltN8Apq0MZUStPlJZKbBFSbnAoIBQUZYGdDiY=";
+ sha256 = "sha256-AbQqe6hCy6Ke5lwKHFWLJlXv7HdDApYYK++SPNQ2Nxg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix
index c5df9f7d991d..702b0e3e365e 100644
--- a/pkgs/development/python-modules/snapcast/default.nix
+++ b/pkgs/development/python-modules/snapcast/default.nix
@@ -1,23 +1,25 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest
-, construct }:
+{ lib
+, buildPythonPackage
+, construct
+, fetchPypi
+, isPy3k
+}:
buildPythonPackage rec {
pname = "snapcast";
- version = "2.1.1";
-
+ version = "2.1.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "c3ecd63d997fbcf6e5322dc47c1f02615f1d9611cba01ec18e9c9f8c14ed824b";
+ sha256 = "sha256-ILBleqxEO7wTxAw/fvDW+4O4H4XWV5m5WWtaNeRBr4g=";
};
- checkInputs = [ pytest ];
-
propagatedBuildInputs = [ construct ];
# no checks from Pypi - https://github.com/happyleavesaoc/python-snapcast/issues/23
doCheck = false;
+ pythonImportsCheck = [ "snapcast" ];
meta = with lib; {
description = "Control Snapcast, a multi-room synchronous audio solution";
diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index e86144dff04d..a72c413c1860 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -30,10 +30,12 @@ buildPythonPackage rec {
sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0=";
};
- patches = [(fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
- sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
- })];
+ patches = [
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
+ sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
+ })
+ ];
# N.B. These exist because:
# 1. Upstream's pinning isn't well maintained, leaving dependency versions no
diff --git a/pkgs/development/python-modules/solaredge/default.nix b/pkgs/development/python-modules/solaredge/default.nix
new file mode 100644
index 000000000000..f593ff501620
--- /dev/null
+++ b/pkgs/development/python-modules/solaredge/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python-dateutil
+, pythonOlder
+, pytz
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "solaredge";
+ version = "0.0.4";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0q4gib0l3qnlpncg84ki027vr1apjlr47vd6845rpk7zkm8lqgfz";
+ };
+
+ propagatedBuildInputs = [
+ python-dateutil
+ pytz
+ requests
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "solaredge" ];
+
+ meta = with lib; {
+ description = "Python wrapper for Solaredge monitoring service";
+ homepage = "https://github.com/bertouttier/solaredge";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix
index 739ea2afa820..94047b359aa9 100644
--- a/pkgs/development/python-modules/sphinx-autobuild/default.nix
+++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
description = "Rebuild Sphinx documentation on changes, with live-reload in the browser";
homepage = "https://github.com/executablebooks/sphinx-autobuild";
license = with licenses; [ mit ];
- maintainer = with maintainers; [holgerpeters];
+ maintainers = with maintainers; [holgerpeters];
};
}
diff --git a/pkgs/development/python-modules/sphinx-navtree/default.nix b/pkgs/development/python-modules/sphinx-navtree/default.nix
index 02e5711e888f..ae56a9fdce11 100644
--- a/pkgs/development/python-modules/sphinx-navtree/default.nix
+++ b/pkgs/development/python-modules/sphinx-navtree/default.nix
@@ -14,5 +14,7 @@ buildPythonPackage rec {
description = "Navigation tree customization for Sphinx";
homepage = "https://github.com/bintoro/sphinx-navtree";
license = lib.licenses.mit;
+ # not compatible with sphinx 3.3, not updated since 2016
+ broken = true;
};
}
diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix
index 3ec4246cd02c..a6dd6e41dc57 100644
--- a/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "sqlite-utils";
- version = "3.5";
+ version = "3.6";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-i9SnT+DcQOcujV25bD/SNV1uRA2IgfiSWhEWlQC5TiA=";
+ sha256 = "sha256-WCqbz0tssy7i76Sg2PeexjDollypPGnOqqfUJOHAFWA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 940dbdab9894..065228eca218 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -1,17 +1,17 @@
{ lib
, buildPythonPackage
, fetchPypi
-, stdenv
, file
+, stdenv
}:
buildPythonPackage rec {
pname = "sqlmap";
- version = "1.4.12";
+ version = "1.5.3";
src = fetchPypi {
inherit pname version;
- sha256 = "166adazdrv92azx4p0qng0cm3va6i301vfsr4yyf0azj3sdg0waj";
+ sha256 = "sha256-b2Q5Zelz0AWbNQotOLWdwN5+20Q5jATH3nzLEJQRwno=";
};
postPatch = ''
@@ -29,9 +29,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "sqlmap" ];
meta = with lib; {
- homepage = "http://sqlmap.org";
- license = licenses.gpl2;
description = "Automatic SQL injection and database takeover tool";
+ homepage = "http://sqlmap.org";
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ bennofs ];
};
}
diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index 071bbcd3061a..694b678930b2 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -10,7 +10,6 @@
, python-multipart
, pyyaml
, requests
-, ujson
, aiosqlite
, databases
, pytestCheckHook
@@ -21,16 +20,21 @@
buildPythonPackage rec {
pname = "starlette";
- version = "0.13.8";
+ version = "0.14.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "11i0yd8cqwscixajl734g11vf8pghki11c81chzfh8ifmj6mf9jk";
+ sha256 = "0fz28czvwiww693ig9vwdja59xxs7m0yp1df32ms1hzr99666bia";
};
+ postPatch = ''
+ # remove coverage arguments to pytest
+ sed -i '/--cov/d' setup.cfg
+ '';
+
propagatedBuildInputs = [
aiofiles
graphene
@@ -39,7 +43,6 @@ buildPythonPackage rec {
python-multipart
pyyaml
requests
- ujson
] ++ lib.optional stdenv.isDarwin [ ApplicationServices ];
checkInputs = [
@@ -50,9 +53,10 @@ buildPythonPackage rec {
typing-extensions
];
+ # fails to import graphql, but integrated graphql support is about to
+ # be removed in 0.15, see https://github.com/encode/starlette/pull/1135.
disabledTestPaths = [ "tests/test_graphql.py" ];
- # https://github.com/encode/starlette/issues/1131
- disabledTests = [ "test_debug_html" ];
+
pythonImportsCheck = [ "starlette" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix
index ac80be2fe0c5..6ed265f65615 100644
--- a/pkgs/development/python-modules/subarulink/default.nix
+++ b/pkgs/development/python-modules/subarulink/default.nix
@@ -1,38 +1,49 @@
{ lib
-, buildPythonPackage
-, fetchFromGitHub
, aiohttp
, asynctest
-, stdiomask
+, buildPythonPackage
, cryptography
-, pytestcov
+, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
+, pythonOlder
+, stdiomask
}:
buildPythonPackage rec {
pname = "subarulink";
- version = "0.3.12";
+ version = "0.3.13";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "G-Two";
repo = pname;
rev = "subaru-v${version}";
- sha256 = "0mhy4np3g10k778062sp2q65cfjhp4y1fghn8yvs6qg6jmg047z6";
+ sha256 = "0dqbb1iiil1vn97zxnpphn63bl8z0ibgyca90ynx958cy78kys0g";
};
- propagatedBuildInputs = [ aiohttp stdiomask ];
+ propagatedBuildInputs = [
+ aiohttp
+ stdiomask
+ ];
checkInputs = [
asynctest
cryptography
pytest-asyncio
- pytestcov
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace setup.cfg --replace "--cov=subarulink" ""
+ '';
+
__darwinAllowLocalNetworking = true;
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
pythonImportsCheck = [ "subarulink" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix
index 540c315c8ff6..d5dfda53c08c 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/pkgs/development/python-modules/tatsu/default.nix
@@ -1,37 +1,26 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, colorama, mypy, pyyaml, regex
-, dataclasses, typing
-, pytestrunner, pytest-mypy
+, colorama, regex
+, pytestrunner, pytestCheckHook, pytest-mypy
}:
buildPythonPackage rec {
- pname = "TatSu";
- version = "5.0.0";
+ pname = "tatsu";
+ version = "5.6.1";
src = fetchFromGitHub {
owner = "neogeny";
- repo = pname;
+ repo = "TatSu";
rev = "v${version}";
- sha256 = "1c16fcxf0xjkh5py9bnj6ljb9krhrj57mkwayl1w1dvzwl5lkgj3";
+ sha256 = "149ra1lwax5m1svlv4dwjfqw00lc5vwyfj6zw2v0ammmfm1b94x9";
};
- # Since version 5.0.0 only >=3.8 is officially supported, but ics is not
- # compatible with Python 3.8 due to aiohttp:
- disabled = pythonOlder "3.7";
- postPatch = ''
- substituteInPlace setup.py \
- --replace "python_requires='>=3.8'," "python_requires='>=3.7',"
- '';
+ disabled = pythonOlder "3.8";
nativeBuildInputs = [ pytestrunner ];
- propagatedBuildInputs = [ colorama mypy pyyaml regex ]
- ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]
- ++ lib.optionals (pythonOlder "3.5") [ typing ];
- checkInputs = [ pytest-mypy ];
+ propagatedBuildInputs = [ colorama regex ];
+ checkInputs = [ pytestCheckHook pytest-mypy ];
- checkPhase = ''
- pytest test/
- '';
+ pythonImportsCheck = [ "tatsu" ];
meta = with lib; {
description = "Generates Python parsers from grammars in a variation of EBNF";
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index bebd32877dfa..19dcc708651d 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "transformers";
- version = "4.3.3";
+ version = "4.4.2";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
- hash = "sha256-KII7ZR+vnCxCxUcBOQo9y0KxZa+XuIIAkSJejk8HrlA=";
+ hash = "sha256-kl1Z2FBo+yqVXUqLaUtet6IycmdcAtfydNTI4MNNrkc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 94da63cd3ec6..baaff068dbc3 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "trio";
- version = "0.17.0";
+ version = "0.18.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0zcxirpdvvl54pbfkgw7vz984879xwvdygqfpggnam24is2zjp78";
+ sha256 = "0xm0bd1rrlb4l9q0nf2n1wg7xh42ljdnm4i4j0651zi73zk6m9l7";
};
checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ];
@@ -34,6 +34,8 @@ buildPythonPackage rec {
"getprotobyname"
"waitpid"
"static_tool_sees_all_symbols"
+ # tests pytest more than python
+ "fallback_when_no_hook_claims_it"
];
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/urllib3/2.nix b/pkgs/development/python-modules/urllib3/2.nix
new file mode 100644
index 000000000000..a67ebd62f7e3
--- /dev/null
+++ b/pkgs/development/python-modules/urllib3/2.nix
@@ -0,0 +1,73 @@
+{ lib
+, brotli
+, buildPythonPackage
+, certifi
+, cryptography
+, dateutil
+, fetchPypi
+, idna
+, mock
+, pyopenssl
+, pysocks
+, pytest-freezegun
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, tornado
+, trustme
+}:
+
+buildPythonPackage rec {
+ pname = "urllib3";
+ version = "1.26.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
+ };
+
+ propagatedBuildInputs = [
+ brotli
+ certifi
+ cryptography
+ idna
+ pyopenssl
+ pysocks
+ ];
+
+ checkInputs = [
+ dateutil
+ mock
+ pytest-freezegun
+ pytest-timeout
+ pytestCheckHook
+ tornado
+ trustme
+ ];
+
+ # Tests in urllib3 are mostly timeout-based instead of event-based and
+ # are therefore inherently flaky. On your own machine, the tests will
+ # typically build fine, but on a loaded cluster such as Hydra random
+ # timeouts will occur.
+ #
+ # The urllib3 test suite has two different timeouts in their test suite
+ # (see `test/__init__.py`):
+ # - SHORT_TIMEOUT
+ # - LONG_TIMEOUT
+ # When CI is in the env, LONG_TIMEOUT will be significantly increased.
+ # Still, failures can occur and for that reason tests are disabled.
+ doCheck = false;
+
+ preCheck = ''
+ export CI # Increases LONG_TIMEOUT
+ '';
+
+ pythonImportsCheck = [ "urllib3" ];
+
+ meta = with lib; {
+ description = "Powerful, sanity-friendly HTTP client for Python";
+ homepage = "https://github.com/shazow/urllib3";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 7bfb2ba75a35..b4fb9a0e71c8 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -1,33 +1,74 @@
-{ lib, buildPythonPackage, fetchPypi
-, pytest, mock, tornado, pyopenssl, cryptography
-, idna, certifi, ipaddress, pysocks }:
+{ lib
+, brotli
+, buildPythonPackage
+, certifi
+, cryptography
+, dateutil
+, fetchPypi
+, idna
+, mock
+, pyopenssl
+, pysocks
+, pytest-freezegun
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, tornado
+, trustme
+}:
buildPythonPackage rec {
pname = "urllib3";
version = "1.26.3";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73";
};
- NOSE_EXCLUDE = lib.concatStringsSep "," [
- "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
- "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
+ propagatedBuildInputs = [
+ brotli
+ certifi
+ cryptography
+ idna
+ pyopenssl
+ pysocks
];
- checkPhase = ''
- nosetests -v --cover-min-percentage 1
- '';
+ checkInputs = [
+ dateutil
+ mock
+ pytest-freezegun
+ pytest-timeout
+ pytestCheckHook
+ tornado
+ trustme
+ ];
+ # Tests in urllib3 are mostly timeout-based instead of event-based and
+ # are therefore inherently flaky. On your own machine, the tests will
+ # typically build fine, but on a loaded cluster such as Hydra random
+ # timeouts will occur.
+ #
+ # The urllib3 test suite has two different timeouts in their test suite
+ # (see `test/__init__.py`):
+ # - SHORT_TIMEOUT
+ # - LONG_TIMEOUT
+ # When CI is in the env, LONG_TIMEOUT will be significantly increased.
+ # Still, failures can occur and for that reason tests are disabled.
doCheck = false;
- checkInputs = [ pytest mock tornado ];
- propagatedBuildInputs = [ pyopenssl cryptography idna certifi ipaddress pysocks ];
+ preCheck = ''
+ export CI # Increases LONG_TIMEOUT
+ '';
+
+ pythonImportsCheck = [ "urllib3" ];
meta = with lib; {
description = "Powerful, sanity-friendly HTTP client for Python";
homepage = "https://github.com/shazow/urllib3";
license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/volkszaehler/default.nix b/pkgs/development/python-modules/volkszaehler/default.nix
index b86394bc2b62..6bd509d7cd40 100644
--- a/pkgs/development/python-modules/volkszaehler/default.nix
+++ b/pkgs/development/python-modules/volkszaehler/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "volkszaehler";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "13zhxq08wn5y9yn6xbazfl0gxxysmirwpc26wcnr6jk2va1kpc4l";
+ sha256 = "sha256-1oqzhC3Yq2V30F3ilr80vKFnTmI/CdIVLuzMlIr40xI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix
index 40b1b328f16f..bd592d686826 100644
--- a/pkgs/development/python-modules/vsure/default.nix
+++ b/pkgs/development/python-modules/vsure/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "vsure";
- version = "1.7.2";
+ version = "1.7.3";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-EFat1sewh0Y9PHs08Grlk2RparA47GqkUv/WJ3J2494=";
+ sha256 = "sha256-tnUL9krKHqHR79EROsmVflCy9uO1n0iV6evQc/YpxnM=";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/websocket_client/default.nix b/pkgs/development/python-modules/websocket_client/default.nix
index dacae3e81e1f..6ad0634631de 100644
--- a/pkgs/development/python-modules/websocket_client/default.nix
+++ b/pkgs/development/python-modules/websocket_client/default.nix
@@ -1,25 +1,33 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
-, six
+{ lib
, backports_ssl_match_hostname
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, pytestCheckHook
+, six
}:
buildPythonPackage rec {
- version = "0.57.0";
pname = "websocket_client";
+ version = "0.58.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010";
+ sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8=";
};
propagatedBuildInputs = [
six
] ++ lib.optional isPy27 backports_ssl_match_hostname;
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "websocket" ];
+
meta = with lib; {
- description = "Websocket client for python";
+ description = "Websocket client for Python";
homepage = "https://github.com/websocket-client/websocket-client";
- license = licenses.bsd3;
- maintainers = with maintainers; [ ];
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index 280470957dc7..3da25743594e 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "xdis";
- version = "5.0.5";
+ version = "5.0.8";
disabled = isPy27;
src = fetchFromGitHub {
owner = "rocky";
repo = "python-xdis";
rev = version;
- sha256 = "01248nh8y5szin6ymd3hrl8qnsg4xijsk3lxyks8zk9cjh008lmq";
+ sha256 = "01g1bk7rscwmvr2i183z0y2bs1iw7bxk7c5rcf9gf25242nppv6a";
};
checkInputs = [ pytest ];
@@ -22,10 +22,11 @@ buildPythonPackage rec {
checkPhase = ''
make check
'';
+ pythonImportsCheck = [ "xdis" ];
meta = with lib; {
description = "Python cross-version byte-code disassembler and marshal routines";
homepage = "https://github.com/rocky/python-xdis/";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
};
}
diff --git a/pkgs/development/python-modules/xmldiff/default.nix b/pkgs/development/python-modules/xmldiff/default.nix
new file mode 100644
index 000000000000..1dfb09147589
--- /dev/null
+++ b/pkgs/development/python-modules/xmldiff/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, lxml
+, setuptools
+, six
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "xmldiff";
+ version = "2.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-Bb6iDOHyyWeGg7zODDupmB+H2StwnRkOAYvL8Efsz2M=";
+ };
+
+ propagatedBuildInputs = [ lxml setuptools six ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ homepage = "https://github.com/Shoobx/xmldiff";
+ description = "Creates diffs of XML files";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sfrijters ];
+ };
+}
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index 9c0e9d353993..9c759f3a2b7e 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -1,19 +1,46 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
buildPythonPackage rec {
pname = "yapf";
- version = "0.30.0";
+ version = "0.31.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3000abee4c28daebad55da6c85f3cd07b8062ce48e2e9943c8da1b9667d48427";
+ hash = "sha256-QI+5orJUwwL0nbg8WfmqC0sP0OwlvjpcURgTJ5Iv9j0=";
};
+ checkInputs = [
+ nose
+ ];
+
meta = with lib; {
- description = "A formatter for Python code.";
- homepage = "https://github.com/google/yapf";
- license = licenses.asl20;
- maintainers = with maintainers; [ siddharthist ];
- };
+ homepage = "https://github.com/google/yapf";
+ description = "Yet Another Python Formatter";
+ longDescription = ''
+ Most of the current formatters for Python --- e.g., autopep8, and pep8ify
+ --- are made to remove lint errors from code. This has some obvious
+ limitations. For instance, code that conforms to the PEP 8 guidelines may
+ not be reformatted. But it doesn't mean that the code looks good.
+ YAPF takes a different approach. It's based off of 'clang-format',
+ developed by Daniel Jasper. In essence, the algorithm takes the code and
+ reformats it to the best formatting that conforms to the style guide, even
+ if the original code didn't violate the style guide. The idea is also
+ similar to the 'gofmt' tool for the Go programming language: end all holy
+ wars about formatting - if the whole codebase of a project is simply piped
+ through YAPF whenever modifications are made, the style remains consistent
+ throughout the project and there's no point arguing about style in every
+ code review.
+
+ The ultimate goal is that the code YAPF produces is as good as the code
+ that a programmer would write if they were following the style guide. It
+ takes away some of the drudgery of maintaining your code.
+ '';
+ license = licenses.asl20;
+ maintainers = with maintainers; [ AndersonTorres siddharthist ];
+ };
}
diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
new file mode 100644
index 000000000000..f84db4ff6242
--- /dev/null
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "ytmusicapi";
+ version = "0.15.0";
+
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-pVQqoMvuuFc/1QNG5z/AspGlgIGPi9aqjZ3/3eVNhis=";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ doCheck = false; # requires network access
+
+ pythonImportsCheck = [ "ytmusicapi" ];
+
+ meta = with lib; {
+ description = "Unofficial API for YouTube Music";
+ homepage = "https://github.com/sigma67/ytmusicapi";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index fe823c17d938..24f6e7ccfc4f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -231,7 +231,7 @@ let
};
packagesWithNativeBuildInputs = {
- arrow = [ pkgs.pkgconfig pkgs.arrow-cpp ];
+ arrow = [ pkgs.pkg-config pkgs.arrow-cpp ];
adimpro = [ pkgs.imagemagick ];
animation = [ pkgs.which ];
audio = [ pkgs.portaudio ];
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index 9e64b120af85..02af8eaa9672 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -129,6 +129,12 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
runHook postUnpack
'';
+ # As of ruby 3.0, ruby headers require -fdeclspec when building with clang
+ # Introduced in https://github.com/ruby/ruby/commit/0958e19ffb047781fe1506760c7cbd8d7fe74e57
+ NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [
+ "-fdeclspec"
+ ];
+
buildPhase = attrs.buildPhase or ''
runHook preBuild
diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix
index 48182760dcae..eab5716d105c 100644
--- a/pkgs/development/tools/ameba/default.nix
+++ b/pkgs/development/tools/ameba/default.nix
@@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "ameba";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "v${version}";
- sha256 = "sha256-9oLVv0fCJzYyBApR4yzQKc25Uz9X5Rrvj638yD0JDMU=";
+ sha256 = "sha256-yRahBY2ob3EkBKXZN9K7UqgHM4k5CVOcWG0/oOWQFuk=";
};
meta = with lib; {
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index fb5d5b0c53f8..49b711c2c19b 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.4.4";
+ version = "2.4.6";
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 = "sha256-ZwGOk4HxURlPwGcWGHg6rqPh9ONPx9iJ2EB6lWKOMiY=";
+ sha256 = "sha256-lJ/N9oduWGZAc70wl7ATBd1mnaUkeTXAW/RfqbAthsI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 30c0614446e6..600d0efc92ee 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cppcheck";
- version = "2.3";
+ version = "2.4";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "0mlw0z20qf0g9qrmdmbykzf87wlcgmah8bacmp4mk6dwfzr9g9n3";
+ sha256 = "sha256-mGJPqOmz1/siAVkwDP5WXFvx3TtD5KT/klciqnaEoCo=";
};
buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ];
diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix
index 97f93722a182..a1e88d8ebfb8 100644
--- a/pkgs/development/tools/analysis/emma/default.nix
+++ b/pkgs/development/tools/analysis/emma/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj";
};
- buildInputs = [unzip];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/lib/jars
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 5c6fd8e3b90d..47c7b0fac9f8 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.145.0";
+ version = "0.147.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "sha256-6fRKXKh+hB/d2CcmZYYSlMzP1IGCl7fLdXCQ1M0wuY4=";
+ sha256 = "sha256-3U8BOYUHl1YiOnxAIV2V6Ib+LZ0DydtSfwAxN2Hj09g=";
};
installPhase = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
'';
- buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ])
+ buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ])
++ lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/facebook/flow/releases/tag/v${version}";
license = licenses.mit;
platforms = ocamlPackages.ocaml.meta.platforms;
- broken = stdenv.isAarch64; # https://github.com/facebook/flow/issues/7556
maintainers = with maintainers; [ marsam puffnfresh ];
};
}
diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix
index 66f767f47028..1f9e2ba3c562 100644
--- a/pkgs/development/tools/analysis/makefile2graph/default.nix
+++ b/pkgs/development/tools/analysis/makefile2graph/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file";
maintainers = with maintainers; [ cmcdragonkai ];
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 3623893ea63e..287321804e21 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -105,12 +105,12 @@ in {
#
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
- version_commit = "25480";
- gittap = "5.0.0";
- gittip = "a476454c00f64acbb7425c178c98714ef76e26d7";
- rev = "5.0.0";
- version = "5.0.0";
- sha256 = "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420";
+ version_commit = "25741";
+ gittap = "5.1.1";
+ gittip = "a86f8077fc148abd6443384362a3717cd4310e64";
+ rev = "5.1.1";
+ version = "5.1.1";
+ sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3";
cs_ver = "4.0.2";
cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
};
diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py
index ebd6e073fe53..a9a0a2343171 100755
--- a/pkgs/development/tools/analysis/radare2/update.py
+++ b/pkgs/development/tools/analysis/radare2/update.py
@@ -124,6 +124,7 @@ def main() -> None:
radare2_info = get_repo_info(dirname, radare2_rev)
+ git(dirname, "fetch", r2_cutter_rev)
git(dirname, "checkout", r2_cutter_rev)
timestamp = git(dirname, "log", "-n1", "--format=%at")
diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix
index 0d10d6d6b277..ed060d847ec8 100644
--- a/pkgs/development/tools/analysis/randoop/default.nix
+++ b/pkgs/development/tools/analysis/randoop/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0v3vla3k6csfb8w0j9njrhcjj4n7yh172n9wv6z397f1sa0fs202";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/lib $out/doc
diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix
index 3455d78b23f4..a562a1baeeeb 100644
--- a/pkgs/development/tools/analysis/svlint/default.nix
+++ b/pkgs/development/tools/analysis/svlint/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "svlint";
- version = "0.4.16";
+ version = "0.4.18";
src = fetchFromGitHub {
owner = "dalance";
repo = "svlint";
rev = "v${version}";
- sha256 = "sha256-2PYHKJ141RWdUIDAKAFK6IzR4C41bHi/A8lDErSRLnU=";
+ sha256 = "sha256-p002oWwTQxesWLgLq8oKKzuZKXUdO4C1TZ7lR/Mh1PA=";
};
- cargoSha256 = "sha256-x5wU0Ld4ssRoNqo9graJhjlpel+VdVdkKZMjHFqZsrE=";
+ cargoSha256 = "sha256-M0hng1JcR5Q829bVOaTASl0Eq6fFm8mUFsS5zx1JX94=";
meta = with lib; {
description = "SystemVerilog linter";
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix
index 894d9a2357ea..e4ebb85f27f4 100644
--- a/pkgs/development/tools/analysis/swarm/default.nix
+++ b/pkgs/development/tools/analysis/swarm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
description = "Verification script generator for Spin";
homepage = "http://spinroot.com/";
license = licenses.free;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix
index 09a77d0f9355..87143766d428 100644
--- a/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/pkgs/development/tools/analysis/tfsec/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "tfsec";
- version = "0.39.6";
+ version = "0.39.10";
src = fetchFromGitHub {
owner = "tfsec";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2P+/y3iP/eMGGc0W1lHWWxO+uMy5gvlvjKzZ/8maJ9o=";
+ sha256 = "sha256-T2soogk5KcNSeluNyJ4b2GjLkvauvvznaLSMQVgVZgI=";
};
goPackagePath = "github.com/tfsec/tfsec";
diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix
index c93b864b70f8..dca74fa76b73 100644
--- a/pkgs/development/tools/asmfmt/default.nix
+++ b/pkgs/development/tools/asmfmt/default.nix
@@ -1,12 +1,11 @@
{ buildGoPackage
, lib
, fetchFromGitHub
-, fetchpatch
}:
buildGoPackage rec {
pname = "asmfmt";
- version = "1.2.1";
+ version = "1.2.3";
goPackagePath = "github.com/klauspost/asmfmt";
@@ -14,7 +13,7 @@ buildGoPackage rec {
owner = "klauspost";
repo = "asmfmt";
rev = "v${version}";
- sha256 = "0qwxb4yx12yl817vgbhs7acaj98lgk27dh50mb8sm9ccw1f43h9i";
+ sha256 = "0f2cgwxs2b2kpq5348h8hjkcqc40p8ajapzpcy9ia2fsmsn2a2s4";
};
goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index bc3a2828f6cd..657704a653c7 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
, git
, go
-, python
+, python3
, lib, stdenv
}:
@@ -22,7 +22,7 @@ buildBazelPackage rec {
sha256 = "0gigl1lg8sb4bj5crvj54329ws4yirldbncs15f96db6vhp0ig7r";
};
- nativeBuildInputs = [ go git python ];
+ nativeBuildInputs = [ go git python3 ];
removeRulesCC = false;
bazelTarget = "//ibazel";
diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix
new file mode 100644
index 000000000000..fc232d55da6d
--- /dev/null
+++ b/pkgs/development/tools/buf/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, protobuf
+}:
+
+buildGoModule rec {
+ pname = "buf";
+ version = "0.40.0";
+
+ src = fetchFromGitHub {
+ owner = "bufbuild";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-N6o+1cfer8rgKJ3+CL25axJSjGV/YSG1sLIHXJzsC6o=";
+ };
+
+ patches = [
+ ./skip_test_requiring_network.patch
+ ];
+
+ preCheck = ''
+ export PATH=$PATH:$GOPATH/bin
+ '';
+
+ nativeBuildInputs = [ protobuf ];
+
+ vendorSha256 = "sha256-vl+WqtpegoAvylx/lcyfJk8DAOub8U4Lx3Pe3eW4M/E=";
+
+ meta = with lib; {
+ description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices";
+ homepage = "https://buf.build";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ raboof ];
+ };
+}
diff --git a/pkgs/development/tools/buf/skip_test_requiring_network.patch b/pkgs/development/tools/buf/skip_test_requiring_network.patch
new file mode 100644
index 000000000000..8d3e15c17ffb
--- /dev/null
+++ b/pkgs/development/tools/buf/skip_test_requiring_network.patch
@@ -0,0 +1,15 @@
+diff --git a/internal/buf/internal/buftesting/buftesting.go b/internal/buf/internal/buftesting/buftesting.go
+index dc8da0c..70ad299 100644
+--- a/internal/buf/internal/buftesting/buftesting.go
++++ b/internal/buf/internal/buftesting/buftesting.go
+@@ -100,6 +100,10 @@ func RunActualProtoc(
+
+ // GetGoogleapisDirPath gets the path to a clone of googleapis.
+ func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string {
++ // Requires network access, which is not available during
++ // the nixpkgs sandboxed build
++ t.Skip()
++
+ googleapisDirPath := filepath.Join(buftestingDirPath, testGoogleapisDirPath)
+ require.NoError(
+ t,
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index a828c57b8c00..556725cca6c4 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, lua5_3, python }:
+{ lib, stdenv, fetchFromGitHub, lua5_3, python3 }:
stdenv.mkDerivation rec {
pname = "bam";
@@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6";
};
- buildInputs = [ lua5_3 python ];
+ nativeBuildInputs = [ lua5_3 python3 ];
buildPhase = "${stdenv.shell} make_unix.sh";
- checkPhase = "${python.interpreter} scripts/test.py";
+ checkPhase = "${python3.interpreter} scripts/test.py";
+
+ strictDeps = true;
installPhase = ''
mkdir -p "$out/share/bam"
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix
index 2ec244e502bf..f03f42be389f 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
, zip, unzip, bash, writeCBin, coreutils
-, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
+, which, python3, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
# Apple dependencies
, cctools, llvmPackages_8, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
@@ -210,8 +210,8 @@ stdenv'.mkDerivation rec {
# Substitute python's stub shebang to plain python path. (see TODO add pr URL)
# See also `postFixup` where python is added to $out/nix-support
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\
- --replace "/usr/bin/env python" "${python}/bin/python" \
- --replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \
+ --replace "/usr/bin/env python" "${python3.interpreter}" \
+ --replace "NIX_STORE_PYTHON_PATH" "${python3.interpreter}" \
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|' \
@@ -287,11 +287,13 @@ stdenv'.mkDerivation rec {
buildJdk
];
+ strictDeps = true;
+
# when a command can’t be found in a bazel build, you might also
# need to add it to `defaultShellPath`.
nativeBuildInputs = [
zip
- python
+ python3
unzip
makeWrapper
which
@@ -380,7 +382,7 @@ stdenv'.mkDerivation rec {
echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
# The templates get tar’d up into a .jar,
# so nix can’t detect python is needed in the runtime closure
- echo "${python}" >> $out/nix-support/depends
+ echo "${python3}" >> $out/nix-support/depends
'';
dontStrip = true;
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
index 41ae9ce21125..5b20ece76803 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
@@ -62,6 +62,7 @@ let
srcs.rules_cc
srcs.rules_java
srcs.rules_proto
+ srcs.com_google_protobuf
]);
distDir = runCommand "bazel-deps" {} ''
@@ -527,6 +528,13 @@ stdenv.mkDerivation rec {
--output=./bazel_src/output/bazel-complete.bash \
--prepend=./bazel_src/scripts/bazel-complete-header.bash \
--prepend=./bazel_src/scripts/bazel-complete-template.bash
+
+ # need to change directory for bazel to find the workspace
+ cd ./bazel_src
+ # build execlog tooling
+ export HOME=$(mktemp -d)
+ ./output/bazel build src/tools/execlog:parser_deploy.jar
+ cd -
'';
installPhase = ''
@@ -537,7 +545,15 @@ stdenv.mkDerivation rec {
# The binary _must_ exist with this naming if your project contains a .bazelversion
# file.
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
+
+ mkdir $out/share
+ cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
+ cat < $out/bin/bazel-execlog
+ #!${runtimeShell} -e
+ ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
+ EOF
+ chmod +x $out/bin/bazel-execlog
# shell completion files
installShellCompletion --bash \
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
index 5482db67caee..31dbc2779cde 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
@@ -315,7 +315,7 @@ stdenv.mkDerivation rec {
src_for_updater = stdenv.mkDerivation rec {
name = "updater-sources";
inherit src;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
inherit sourceRoot;
installPhase = ''
cp -r . "$out"
@@ -560,6 +560,13 @@ stdenv.mkDerivation rec {
${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \
--bazel=./bazel_src/output/bazel \
--output=./bazel_src/output/bazel-complete.fish
+
+ # need to change directory for bazel to find the workspace
+ cd ./bazel_src
+ # build execlog tooling
+ export HOME=$(mktemp -d)
+ ./output/bazel build src/tools/execlog:parser_deploy.jar
+ cd -
'';
installPhase = ''
@@ -572,6 +579,14 @@ stdenv.mkDerivation rec {
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
+ mkdir $out/share
+ cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
+ cat < $out/bin/bazel-execlog
+ #!${runtimeShell} -e
+ ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
+ EOF
+ chmod +x $out/bin/bazel-execlog
+
# shell completion files
installShellCompletion --bash \
--name bazel.bash \
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 7c2e5372e731..65e1b553875b 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkg-config
-, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
+, bzip2, curlMinimal, expat, libarchive, xz, zlib, libuv, rhash
, buildPackages
# darwin attributes
, ps
@@ -20,12 +20,12 @@ stdenv.mkDerivation (rec {
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
- version = "3.19.4";
+ version = "3.19.6";
src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
- sha256 = "sha256-fQIyufHFfo3oHzgHHvggPmgg/n7siuRqHfEl2I28wuE=";
+ sha256 = "sha256-7IerZ8RfR8QoXyBCgMXN5I4ckgz8/tFVWyf7OxodILo=";
};
patches = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ setupHook pkg-config ];
buildInputs = []
- ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
+ ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]
++ lib.optional useOpenSSL openssl
++ lib.optional useNcurses ncurses
++ lib.optional useQt4 qt4
@@ -64,8 +64,6 @@ stdenv.mkDerivation (rec {
--subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \
--subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \
--subst-var-by libc_lib ${lib.getLib stdenv.cc.libc}
- substituteInPlace Modules/FindCxxTest.cmake \
- --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
''
# CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake
+ ''
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 0bb695615fce..89e8e0e197a0 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -50,9 +50,6 @@ cmakeConfigurePhase() {
# because we usually do not package the framework
cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags"
- # on macOS i686 was only relevant for 10.5 or earlier.
- cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags"
-
# we never want to use the global macOS SDK
cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags"
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 2df829a02295..fb85c1f33269 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
+{ lib, stdenv, fetchFromGitHub, curl, libevent, rsync, ldc, dcompiler ? ldc }:
+
+assert dcompiler != null;
stdenv.mkDerivation rec {
pname = "dub";
@@ -24,12 +26,23 @@ stdenv.mkDerivation rec {
--replace "dub remove" "\"${dubvar}\" remove"
'';
- nativeBuildInputs = [ dmd libevent rsync ];
+ nativeBuildInputs = [ dcompiler libevent rsync ];
buildInputs = [ curl ];
buildPhase = ''
- export DMD=${dmd.out}/bin/dmd
- ./build.sh
+ for dc_ in dmd ldmd2 gdmd; do
+ echo "... check for D compiler $dc_ ..."
+ dc=$(type -P $dc_ || echo "")
+ if [ ! "$dc" == "" ]; then
+ break
+ fi
+ done
+ if [ "$dc" == "" ]; then
+ exit "Error: could not find D compiler"
+ fi
+ echo "$dc_ found and used as D compiler to build $pname"
+ $dc ./build.d
+ ./build
'';
doCheck = !stdenv.isDarwin;
@@ -37,7 +50,8 @@ stdenv.mkDerivation rec {
checkPhase = ''
export DUB=$NIX_BUILD_TOP/source/bin/dub
export PATH=$PATH:$NIX_BUILD_TOP/source/bin/
- export DC=${dmd.out}/bin/dmd
+ export DC=${dcompiler.out}/bin/${dcompiler.pname}
+ echo "DC out --> $DC"
export HOME=$TMP
rm -rf test/issue502-root-import
@@ -46,7 +60,6 @@ stdenv.mkDerivation rec {
rm test/issue990-download-optional-selected.sh
rm test/issue877-auto-fetch-package-on-run.sh
rm test/issue1037-better-dependency-messages.sh
- rm test/issue1040-run-with-ver.sh
rm test/issue1416-maven-repo-pkg-supplier.sh
rm test/issue1180-local-cache-broken.sh
rm test/issue1574-addcommand.sh
@@ -62,13 +75,73 @@ stdenv.mkDerivation rec {
rm test/version-spec.sh
rm test/0-init-multi.sh
rm test/0-init-multi-json.sh
+ rm test/4-describe-data-1-list.sh
+ rm test/4-describe-data-3-zero-delim.sh
+ rm test/4-describe-import-paths.sh
+ rm test/4-describe-string-import-paths.sh
+ rm test/4-describe-json.sh
+ rm test/5-convert-stdout.sh
+ rm test/issue1003-check-empty-ld-flags.sh
+ rm test/issue103-single-file-package.sh
+ rm test/issue1040-run-with-ver.sh
+ rm test/issue1091-bogus-rebuild.sh
+ rm test/issue1194-warn-wrong-subconfig.sh
+ rm test/issue1277.sh
+ rm test/issue1372-ignore-files-in-hidden-dirs.sh
+ rm test/issue1447-build-settings-vars.sh
+ rm test/issue1531-toolchain-requirements.sh
+ rm test/issue346-redundant-flags.sh
+ rm test/issue361-optional-deps.sh
+ rm test/issue564-invalid-upgrade-dependency.sh
+ rm test/issue586-subpack-dep.sh
+ rm test/issue616-describe-vs-generate-commands.sh
+ rm test/issue686-multiple-march.sh
+ rm test/issue813-fixed-dependency.sh
+ rm test/issue813-pure-sub-dependency.sh
+ rm test/issue820-extra-fields-after-convert.sh
+ rm test/issue923-subpackage-deps.sh
+ rm test/single-file-sdl-default-name.sh
+ rm test/subpackage-common-with-sourcefile-globbing.sh
+ rm test/issue934-path-dep.sh
+ rm -r test/1-dynLib-simple
+ rm -r test/1-exec-simple-package-json
+ rm -r test/1-exec-simple
+ rm -r test/1-staticLib-simple
+ rm -r test/2-dynLib-dep
+ rm -r test/2-staticLib-dep
+ rm -r test/2-dynLib-with-staticLib-dep
+ rm -r test/2-sourceLib-dep/
+ rm -r test/3-copyFiles
+ rm -r test/custom-source-main-bug487
+ rm -r test/custom-unittest
+ rm -r test/issue1262-version-inheritance-diamond
+ rm -r test/issue1003-check-empty-ld-flags
+ rm -r test/ignore-hidden-1
+ rm -r test/ignore-hidden-2
+ rm -r test/issue1427-betterC
+ rm -r test/issue130-unicode-*
+ rm -r test/issue1262-version-inheritance
+ rm -r test/issue1372-ignore-files-in-hidden-dirs
+ rm -r test/issue1350-transitive-none-deps
+ rm -r test/issue1775
+ rm -r test/issue1447-build-settings-vars
+ rm -r test/issue1408-inherit-linker-files
+ rm -r test/issue1551-var-escaping
+ rm -r test/issue754-path-selection-fail
+ rm -r test/issue1788-incomplete-string-import-override
+ rm -r test/subpackage-ref
+ rm -r test/issue777-bogus-path-dependency
+ rm -r test/issue959-path-based-subpack-dep
+ rm -r test/issue97-targettype-none-nodeps
+ rm -r test/issue97-targettype-none-onerecipe
+ rm -r test/path-subpackage-ref
+ rm -r test/sdl-package-simple
./test/run-unittest.sh
'';
installPhase = ''
- mkdir $out
- mkdir $out/bin
+ mkdir -p $out/bin
cp bin/dub $out/bin
'';
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 4c5d9a5df809..b27d75b78012 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -33,8 +33,8 @@ rec {
echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip java ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ java ];
meta = {
description = "Enterprise-grade build system";
diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
index e5ac95d0b9dc..4eb292a2e529 100644
--- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
+++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
@@ -1,14 +1,14 @@
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
-@@ -491,7 +491,6 @@ class CoreData:
+@@ -506,7 +506,6 @@ class CoreData:
return value
- if option.endswith('dir') and value.is_absolute() and \
- option not in builtin_dir_noprefix_options:
+ if option.name.endswith('dir') and value.is_absolute() and \
+ option not in BULITIN_DIR_NOPREFIX_OPTIONS:
- # Value must be a subdir of the prefix
# commonpath will always return a path in the native format, so we
# must use pathlib.PurePath to do the same conversion before
# comparing.
-@@ -503,7 +502,7 @@ class CoreData:
+@@ -518,7 +517,7 @@ class CoreData:
try:
value = value.relative_to(prefix)
except ValueError:
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 7009aa4898fa..de82609a5486 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -9,11 +9,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "meson";
- version = "0.56.0";
+ version = "0.57.1";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "04vj250bwrzq7c0z1r96b0z0vgirvn0m367wm3ygqmfdy67x6799";
+ sha256 = "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj";
};
patches = [
diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch
index ada58fff6d41..4b2606e2d694 100644
--- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch
+++ b/pkgs/development/tools/build-managers/meson/more-env-vars.patch
@@ -1,8 +1,8 @@
-diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 219b62ec8..e3ceaddbd 100644
---- a/mesonbuild/envconfig.py
-+++ b/mesonbuild/envconfig.py
-@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice,
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 756dd8193..a5cc6ef8b 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -151,7 +151,7 @@ def _get_env_var(for_machine: MachineChoice, is_cross: bool, var_name: str) -> T
# compiling we fall back on the unprefixed host version. This
# allows native builds to never need to worry about the 'BUILD_*'
# ones.
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index 5942e20ec920..4538c212da58 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
- version = "0.9.3";
+ version = "0.9.5";
src = fetchurl {
- url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
- sha256 = "0x9mvcm5znyi7w6cpiasj2v6f63y7d8qdck7lx03p2k6i9aa2f77";
+ url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}";
+ sha256 = "142vr40p60mapvvb5amn8hz6a8930kxsz510baql40hai4yhga7z";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix
index ce08986b3e17..82c5c88d174e 100644
--- a/pkgs/development/tools/build-managers/msbuild/default.nix
+++ b/pkgs/development/tools/build-managers/msbuild/default.nix
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
dotnet-sdk
mono
+ unzip
];
buildInputs = [
dotnetPackages.Nuget
glibcLocales
makeWrapper
- unzip
];
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index 73c23b88752e..7e46e39b438b 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "qbs";
- version = "1.17.0";
+ version = "1.18.0";
src = fetchFromGitHub {
owner = "qbs";
repo = "qbs";
rev = "v${version}";
- sha256 = "0sd4qwl1wh8b1hck846plrgddkrdwdfqwk2dgh5hdsrlrvx5xjrr";
+ sha256 = "sha256-W1ky3PWPzfKygY+diBld+BqTAxJvNw9mqw3owcQ6no4=";
};
nativeBuildInputs = [ qmake ];
diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix
index 5b9a456ce75f..16ea0dc28318 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 = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "rocm-cmake";
rev = "rocm-${version}";
- hash = "sha256-1T0S2GWA/ojRZMRyWgtFQ2rzmIqvMvaa19jI4Fl9R44=";
+ hash = "sha256-uK060F7d7/pTCNbGqdKCzxgPrPPbGjNwuUOt176z7EM=";
};
nativeBuildInputs = [ cmake ];
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/RadeonOpenCompute/rocm-cmake";
license = licenses.mit;
maintainers = with maintainers; [ danieldk ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index db988bb16e75..bbe4a8ba403a 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
- rev = "6db3d3d1c38082dd4c49cce9933738d9bff50065";
- version = "2021-03-08";
+ rev = "483533f7fad8e5de57a5c37bc387f5e7a94b4493";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
- sha256 = "0sd9a6ldcl3pgs2rjg4pydk72ciavhggbpwfar3bj1h7vsgafnng";
+ sha256 = "1z6ass2w1hrp5yxki0d4zrsrrnqbl6k0bvxia090mqrcm9mig2y3";
};
dontBuild = true;
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 62d704fccd5e..5b3ce3ab1623 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
version = "1.4.9";
src = fetchurl {
- url =
- "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
+ url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224=";
};
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 0f4ea722d966..16b2967e632d 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -44,8 +44,8 @@ rec {
};
shards_0_14 = generic {
- version = "0.14.0";
- sha256 = "sha256-HEyGXoGkQvLrk672/ekmBxnR1eRM//GwRPd/19LM8Wo=";
+ version = "0.14.1";
+ sha256 = "sha256-/C6whh5RbTBkFWqpn0GqyVe0opbrklm8xPv5MIG99VU=";
crystal = crystal_0_36;
};
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index e5763e6aa918..4ca0343d8fa1 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
- version = "1.19.8";
+ version = "1.20.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "sha256-xhnhc4vhKw5T93076vS+pszIOpj22KzaPyzCvuHMaPE=";
+ sha256 = "12gmn61mfrr58071x3cdsksad6swn1b23ghih128hjdpdzk1zxs3";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
index aa60d7be5b51..0f31f7b1b37d 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pack";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "buildpacks";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-VTQ3NOskBp7ic8a/nn/ZbALJVff+Pb/ZHHbld/OxQdo=";
+ sha256 = "sha256-+fYw5dIDJJKGQKBL6RQh1SCQufbAkKeuJpPlywzbbnM=";
};
- vendorSha256 = "sha256-n8X2NyQiOpEQ0d/ek1kdxKFfaCFf0EucflVLZjOGMfY=";
+ vendorSha256 = "sha256-fSUTl5W/DyloCuCpEqA5z4bhB7wYxzPt6E0SfjorfQ0=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index 886d435b8114..1c5f316cea9d 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, emacs }:
+{ lib, stdenv, fetchurl, python3, emacs }:
stdenv.mkDerivation rec {
pname = "cask";
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
s f dash ansi ecukes servant ert-runner el-mock
noflet ert-async shell-split-string git package-build
] ++ [
- python
+ python3
];
+ strictDeps = true;
+
buildPhase = ''
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
'';
diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix
index ff47bd0e9f36..f3d9b74181aa 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -1,52 +1,69 @@
-{ lib, stdenv, fetchFromGitHub
-, python3Packages
+{ lib
+, stdenv
+, fetchFromGitHub
+, clang-unwrapped
, cmake
-, llvmPackages
-, libffi, libxml2, zlib
-, withMan ? true
+, libclang
+, libffi
+, libxml2
+, llvm
+, sphinx
+, zlib
+, withManual ? true
+, withHTML ? true
}:
-stdenv.mkDerivation rec {
- pname = "CastXML";
- version = "0.3.4";
+stdenv.mkDerivation rec {
+ pname = "CastXML";
+ version = "0.4.3";
src = fetchFromGitHub {
- owner = pname;
- repo = pname;
- rev = "v${version}";
- sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4";
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-MschwCEkZrZmNgr8a1ocdukjXzHbXl2gmkPmygJaA6k=";
};
- nativeBuildInputs = [ cmake ] ++ lib.optionals withMan [ python3Packages.sphinx ];
-
- clangVersion = lib.getVersion llvmPackages.clang;
+ nativeBuildInputs = [
+ cmake
+ llvm
+ ] ++ lib.optionals (withManual || withHTML) [
+ sphinx
+ ];
cmakeFlags = [
- "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${clangVersion}/"
- "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}"
+ "-DCLANG_RESOURCE_DIR=${clang-unwrapped}/lib/clang/${lib.getVersion clang-unwrapped}/"
+ "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}"
+ "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}"
];
buildInputs = [
- llvmPackages.clang-unwrapped
- llvmPackages.llvm
- libffi libxml2 zlib
+ clang-unwrapped
+ libffi
+ libxml2
+ zlib
];
- propagatedBuildInputs = [ llvmPackages.libclang ];
+ propagatedBuildInputs = [
+ libclang
+ ];
# 97% tests passed, 97 tests failed out of 2881
# mostly because it checks command line and nix append -isystem and all
doCheck = false;
+ # -E exclude 4 tests based on names
+ # see https://github.com/CastXML/CastXML/issues/90
checkPhase = ''
- # -E exclude 4 tests based on names
- # see https://github.com/CastXML/CastXML/issues/90
+ runHook preCheck
ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd'
+ runHook postCheck
'';
meta = with lib; {
homepage = "https://github.com/CastXML/CastXML";
+ description = "C-family Abstract Syntax Tree XML Output";
license = licenses.asl20;
- description = "Abstract syntax tree XML output tool";
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/tools/ccloud-cli/default.nix b/pkgs/development/tools/ccloud-cli/default.nix
index abf5845b7e9d..3095d661ab35 100644
--- a/pkgs/development/tools/ccloud-cli/default.nix
+++ b/pkgs/development/tools/ccloud-cli/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "ccloud-cli";
- version = "0.202.0";
+ version = "1.25.0";
# To get the latest version:
- # curl -L 'https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=ccloud-cli/archives/&delimiter=/' | nix run nixpkgs.libxml2 -c xmllint --format -
+ # curl -L https://cnfl.io/ccloud-cli | sh -s -- -l | grep -v latest | sort -V | tail -n1
src = fetchurl (if stdenv.hostPlatform.isDarwin then {
url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_darwin_amd64.tar.gz";
- sha256 = "1w7c7fwpjj6f26nmcgm6rkrl4v9zhdpygkh02la77n23lg8wxah5";
+ sha256 = "0306jg36dpccwyy239r2xvw3bvsrnrdc88390g26fhcb0048qmgb";
} else {
url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_linux_amd64.tar.gz";
- sha256 = "1xbhv2viw8cbwv03rfq99jddnw5lwy812a8xby348290l323xi89";
+ sha256 = "02sly7cxqlrfd6chamlp05k9ar93mpfrkx5183js0hf595nlki61";
});
nativeBuildInputs = [ autoPatchelfHook ];
@@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
homepage = "https://docs.confluent.io/current/cloud/cli/index.html";
license = licenses.unfree;
maintainers = with maintainers; [ kalbasit ];
- platforms = platforms.linux ++ platforms.darwin;
+
+ # TODO: There's support for i686 systems but I do not have any such system
+ # to build it locally on, it's also unfree so I cannot rely on ofborg to
+ # build it. Get the list of supported system by looking at the list of
+ # files in the S3 bucket:
+ #
+ # https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=ccloud-cli/archives/1.25.0/&delimiter=/%27
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 5ba6718a6bd2..4a402111b086 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -2,16 +2,16 @@
makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
buildGoModule rec {
name = "buildkite-agent-${version}";
- version = "3.27.0";
+ version = "3.28.1";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
- sha256 = "sha256-JfOCht+awc0I22vtRD5hgowgdVkcJR3qSxnxLoc3XZY=";
+ sha256 = "sha256-5YOXYOAh/0fOagcqdK2IEwm5XDCxyfTeTzwBGtsQRCs=";
};
- vendorSha256 = "sha256-4zKe8y+9fedvCt/XmPf0HxtyqLz+FP4Ylt6k9KBjaIw=";
+ vendorSha256 = "sha256-3UXZxeiL0WO4X/3/hW8ubL1TormGbn9X/k0PX+/cLuM=";
postPatch = ''
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix
index aee2a4e23416..73aefdd0cda7 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "buildkite-cli";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "buildkite";
repo = "cli";
rev = "v${version}";
- sha256 = "05hz59qzadkk4ji5icv5sxih31pnn0abnmiwcyfa2mr3l5jaqjnd";
+ sha256 = "sha256-AIa+hEYtPJ4CFvAFSpNJFxY+B3+DJH1Q0hL/3BD/yN0=";
};
- vendorSha256 = "0jxh3yhh0sdvaykhinxngpipk369hw8z1y3g2z4c1115m5rjp2bb";
+ vendorSha256 = "sha256-4AH9PZWSrBXi9w4Mr7dpXqDkQZGzuELG876YCaFTj2Q=";
doCheck = false;
diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
new file mode 100644
index 000000000000..a2e7b739718b
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+ pname = "drone-runner-docker";
+ version = "1.6.3";
+
+ src = fetchFromGitHub {
+ owner = "drone-runners";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-WI3pr0t6EevIBOQwCAI+CY2O8Q7+W/CLDT/5Y0+tduQ=";
+ };
+
+ vendorSha256 = "15lpdliqz129yq5zgzjvndwdxngxa96g0ska4zkny7ycb3vwq0xm";
+
+ meta = with lib; {
+ maintainers = with maintainers; [ endocrimes ];
+ license = licenses.unfreeRedistributable;
+ homepage = "https://github.com/drone-runners/drone-runner-docker";
+ description = "Drone pipeline runner that executes builds inside Docker containers";
+ };
+}
diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index 3b0a0f402277..91c494f73123 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fly";
- version = "7.0.0";
+ version = "7.1.0";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
- sha256 = "sha256-WpwMx8mPedunBKlRUDdcVA1sLWkZvuoaw6DEtvGSyAg=";
+ sha256 = "sha256-M0Jo4DyvPghhVLK3eFdew10lGUJJODxKoL+v16y9CW8=";
};
- vendorSha256 = "sha256-OxU+Hb8bX71SFuyAw583Z7bEu+b/j2i/fOGE5S9C91M=";
+ vendorSha256 = "sha256-W6m+nDNcZBVfa1OTkOHWf4E9LmEUewsTLT/56Iyp6+Y=";
doCheck = false;
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index ad886e0c3c6e..eeffee057d4a 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "13.9.0";
+ version = "13.10.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
- sha256 = "0zgnp6l0p1i7x6lppd24nfb6kqa8mw7rnr2p5gmwbmjv9i9zkycs";
+ sha256 = "0lw087xcbzf4d68mq0h0s31na7lww2d9nv43icw9qx05aknlcddv";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
- sha256 = "06b5p9ygcnrjrisp6bcgw9s3j2zlycp8jsri259bjf7rrfbwpkma";
+ sha256 = "1mf3w85ivc8r2rmb78r4b87rrxmbb1zda9pp8n4nvd0igg23xqk8";
};
in
buildGoPackage rec {
@@ -30,7 +30,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "0wzqrfjg43wnf9lr34jn3ydlxi7vsnqs55pm5igba592q8ykfbxk";
+ sha256 = "0xy5mpcpxcmwfdrspd29z8nyn1m9i4ma7d5kbihwa2yxznylydpx";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
index 6e58b74654da..3041a0317370 100644
--- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ grahamc swarren83 ];
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = "
unzip $src -d $out
diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
index 90eb61dbff8d..4b3f61cf4b4b 100644
--- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix
+++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ grahamc swarren83 ];
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = "
unzip $src -d $out
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 65077d6134b7..64c48b702cf1 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -2,7 +2,7 @@
, coreutils, git, gnused, nix, nixfmt }:
let
- version = "2.0.12";
+ version = "2.0.16";
zshCompletion = fetchurl {
url =
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://github.com/coursier/coursier/releases/download/v${version}/coursier";
- sha256 = "sha256-SLl8pXGl9612FDEOy1vz/mXTb3+7YAJ/wq/njBL+V+I=";
+ sha256 = "sha256-Yx6PvBo763GnEwU5s7AYUs++Au25TF6cZ4WYGgruHpw=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 8fb7677f5845..2e361076ae48 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -49,8 +49,7 @@ in
sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
unpackCmd = "unzip $curSrc";
diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix
index 5de8296299fb..042f5a1aa6d6 100644
--- a/pkgs/development/tools/database/webdis/default.nix
+++ b/pkgs/development/tools/database/webdis/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "webdis";
- version = "0.1.11";
+ version = "0.1.12";
src = fetchFromGitHub {
owner = "nicolasff";
repo = pname;
rev = version;
- sha256 = "162xbx4dhfx4a6sksm7x60gr7ylyila4vidmdf0bn7xlvglggazf";
+ sha256 = "sha256-pppA/Uyz1ge7UOG1PrqpTQC5sSGMWPw0J+CtaoZpOCM=";
};
buildInputs = [ hiredis http-parser jansson libevent ];
diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix
index 86d55ab07804..26124b1054fb 100644
--- a/pkgs/development/tools/drm_info/default.nix
+++ b/pkgs/development/tools/drm_info/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "drm_info";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "ascent12";
repo = "drm_info";
rev = "v${version}";
- sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f";
+ sha256 = "sha256-UTDYLe3QezPCyG9CIp+O+KX716JDTL9mn+OEjjyTwlg=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index 1c1604db654a..7a994df51b40 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -1,22 +1,22 @@
-{stdenv, lib, fetchFromGitHub, dmd, curl}:
+{stdenv, lib, fetchFromGitHub, ldc, curl}:
stdenv.mkDerivation rec {
pname = "dtools";
- version = "2.085.1";
+ version = "2.095.1";
srcs = [
(fetchFromGitHub {
owner = "dlang";
repo = "dmd";
rev = "v${version}";
- sha256 = "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660";
+ sha256 = "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk";
name = "dmd";
})
(fetchFromGitHub {
owner = "dlang";
repo = "tools";
rev = "v${version}";
- sha256 = "1x85w4k2zqgv2bjbvhschxdc6kq8ygp89h499cy8rfqm6q23g0ws";
+ sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b";
name = "dtools";
})
];
@@ -27,14 +27,13 @@ stdenv.mkDerivation rec {
mv dmd dtools
cd dtools
- substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" ""
'';
- nativeBuildInputs = [ dmd ];
+ nativeBuildInputs = [ ldc ];
buildInputs = [ curl ];
makeCmd = ''
- make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc
+ make -f posix.mak all DMD_DIR=dmd DMD=${ldc.out}/bin/ldmd2 CC=${stdenv.cc}/bin/cc
'';
buildPhase = ''
diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix
index 4f475440b048..608c721caf00 100644
--- a/pkgs/development/tools/eclipse-mat/default.nix
+++ b/pkgs/development/tools/eclipse-mat/default.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png
'';
+ nativeBuildInputs = [ unzip ];
buildInputs = [
fontconfig
freetype
@@ -91,7 +92,6 @@ stdenv.mkDerivation rec {
libXtst
makeWrapper
zlib
- unzip
shared-mime-info
webkitgtk
];
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index e0792fbc36ba..518eef2d1a0d 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -86,30 +86,30 @@ rec {
headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885";
};
- electron_10 = mkElectron "10.4.0" {
- x86_64-linux = "6246481577bc0bfa719e0efb3144e8d7ca53e3f20defce7b5e1be4d9feb0becb";
- x86_64-darwin = "bc9e201643db3dae803db934fa4e180d13b707de6be1c3348ca5ed2c21d30bf4";
- i686-linux = "aa6a9042097b964230b519c158e369a249a668cc6c7654b30ddd02ced4bad9d1";
- armv7l-linux = "7e99a9c6aeedd7cc0b25260ac4630730629f363a09b72bd024b42837ab9777bd";
- aarch64-linux = "ef671fe3cbb7c84e277d885ed157552602bc88d326dc95b322953c6b193f59a1";
- headers = "1vsvna2zr7qxnk2qsdjzgkv5v2svrllbsjj08qrilly7nbksk9fg";
+ electron_10 = mkElectron "10.4.2" {
+ x86_64-linux = "3d613b413f01c8af1600be42c82941761452407e1160125eca60feec0d7dd0c0";
+ x86_64-darwin = "87b18811d165f2fd64606ae13a567b737f54bd41c7e2204a047a3532f4fa2d9c";
+ i686-linux = "297083ca9b21554ea1f729ed17c0c8b13aaea24e77194f9c1b340489fcfc0fa6";
+ armv7l-linux = "3d93ec220824cce5d99b3a7511604b89c63935bd1130fc64ce08b8436e34c096";
+ aarch64-linux = "0060e37eada91bac51945ae325ab04309438609089d31ab3f8bbfda73cc26166";
+ headers = "13cpkblkvhvd3sww8n1gw4rhva84x2fkkg81yr3n2mb0virlfgpn";
};
- electron_11 = mkElectron "11.3.0" {
- x86_64-linux = "136794f9ecc1c6ea38fe9b85682e8fcc8c4afd559f5cd6b4059339b017279917";
- x86_64-darwin = "7569db1d2e470b0db512735f27f99498f631da3cd86374345139f18df88789fe";
- i686-linux = "48ab133cab380c564529ea605d4521404b9bd07d80dad6346e1756a0952081cd";
- armv7l-linux = "5774c2995c6dcf911ece00a94ace0f37d55132da91b1fd242c69e047872ef137";
- aarch64-linux = "fad31c6fba7aba54db19a2aaedb03b514c51dd58bf301afab5265126833feb15";
- headers = "123g3dgsb4vp8w1bm4apbp973ppzx4i4y35lhhmqjbp51jhrm9f0";
+ electron_11 = mkElectron "11.4.1" {
+ x86_64-linux = "3efd3d3b5a9f71323320288aece65fcec89ea0331c3d6d3afc2495d3b0dc95d3";
+ x86_64-darwin = "6ff91613c51b2ebaf280eb86b826f47d62639081a0f38c2012c428a17619a163";
+ i686-linux = "513e1bc7a3e546dc0e712836886ac89c9f76bb7fb1e4b7a1f9d9cbc7347d8569";
+ armv7l-linux = "838fc96d90cfcc5e1e892287008f9d9d2dbe27f3d4cf2479e6275ecdd140fb65";
+ aarch64-linux = "a3de4208b5033a19ffa9dd8130d440909b181c0ef57cb51c8f9c8dbbb1267a26";
+ headers = "1bpsmmlxl4gk9yn5w7f8m6g8k1gmvwk0jwpqlk5islpkcy6x7107";
};
- electron_12 = mkElectron "12.0.0" {
- x86_64-linux = "d132a80e08500e783e36a25cb72bc2555ec388798326c22348e3d9ff57fa91f1";
- x86_64-darwin = "18546dec0ecc63d1a679762e00bc85fbb820e08f7ca205924681379bb0a7afc2";
- i686-linux = "79651836e857f8c860c6ad053346f7e2cf38351160845687b199faba113b9483";
- armv7l-linux = "e98eb2df69f240806e283018d4e0349a45b4cb5b6635d1e1c11d869e50cc60cb";
- aarch64-linux = "ea26777ffea5e788bb708814c8707e8ac3529146e7738729aa8bd49d0d74bcd1";
- headers = "0h7mkz7wmcf0jq8gmq21ag2ax5ivy2wlz0ykw7rv2r4l5686xdjr";
+ electron_12 = mkElectron "12.0.2" {
+ x86_64-linux = "fc3ff888d8cd4ada8368420c8951ed1b5ad78919bdcb688abe698d00e12a2e0a";
+ x86_64-darwin = "766ca8f8adc4535db3069665ea8983979ea79dd5ec376e1c298f858b420ec58f";
+ i686-linux = "78ab55db275b85210c6cc14ddf41607fbd5cefed93ef4d1b6b74630b0841b23c";
+ armv7l-linux = "8be8c6ea05da669d79179c5969ddee853710a1dd44f86e8f3bbe1167a2daf13c";
+ aarch64-linux = "9ef70ab9347be63555784cac99efbaff1ef2d02dcc79070d7bccd18c38de87ef";
+ headers = "07095b5rylilbmyd0syamm6fc4pngazldj5jgm7blgirdi8yzzd2";
};
}
diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix
index c60ab738aa45..7d4593dee3c5 100644
--- a/pkgs/development/tools/electron/generic.nix
+++ b/pkgs/development/tools/electron/generic.nix
@@ -97,7 +97,7 @@ let
};
darwin = {
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out/Applications
diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
index d9633e88f346..2ba0f494c216 100644
--- a/pkgs/development/tools/fedpkg/default.nix
+++ b/pkgs/development/tools/fedpkg/default.nix
@@ -1,4 +1,6 @@
-{ lib, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
+{ lib, python2Packages, fetchurl }:
+
+with python2Packages;
let
fedora_cert = buildPythonPackage rec {
diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix
new file mode 100644
index 000000000000..133db2d9ff00
--- /dev/null
+++ b/pkgs/development/tools/fission/default.nix
@@ -0,0 +1,30 @@
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+ pname = "fission";
+ version = "1.12.0";
+
+ src = fetchFromGitHub {
+ owner = "fission";
+ repo = "fission";
+ rev = version;
+ sha256 = "0izvkjd7ydcxhr6zmgrbfm3ybz2kf4p27099lr07gd4x7c6xxmqr";
+ };
+
+ vendorSha256 = "12clw0wy4lypf45imqnabj39yxqpi348csr4m5d0d1rksxgvwngq";
+
+ buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}";
+
+ subPackages = [ "cmd/fission-cli" ];
+
+ postInstall = ''
+ ln -s $out/bin/fission-cli $out/bin/fission
+ '';
+
+ meta = with lib; {
+ description = "The cli used by end user to interact Fission";
+ homepage = "https://fission.io";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ neverbehave ];
+ };
+}
diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix
index 00831c05691a..df7e58bde457 100644
--- a/pkgs/development/tools/galen/default.nix
+++ b/pkgs/development/tools/galen/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "13dq8cf0yy24vym6z7p8hb0mybgpcl4j5crsaq8a6pjfxz6d17mq";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index fbbb773519ab..437013e1af2b 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ginkgo";
- version = "1.15.1";
+ version = "1.15.2";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
- sha256 = "sha256-w2eP8mDGHHZGYQUU7lOe7gp3tdr9VO/NP5fFBWOWt/A=";
+ sha256 = "sha256-lZ2PIfZSvBxVIAEpRgsLvTWPFRsh2ZpXkame6pk0Cio=";
};
- vendorSha256 = "sha256-fB9/cf2VOMXWLHnnHJZDmOutIUvPleWBGCirJrypCts=";
+ vendorSha256 = "sha256:1nqam6y2dar8320yb5fg9chsvswq8fb1rrvr5kbcaf4mzmqpy7vw";
doCheck = false;
meta = with lib; {
diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix
index db876ea09f2f..a65a9276add4 100644
--- a/pkgs/development/tools/go-mockery/default.nix
+++ b/pkgs/development/tools/go-mockery/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-mockery";
- version = "2.5.1";
+ version = "2.7.4";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
- sha256 = "5W5WGWqxpZzOqk1VOlLeggIqfneRb7s7ZT5faNEhDos=";
+ sha256 = "sha256-St8QgUZUU7THM9H8i7Z+bgKu9LhXhUqH/B14LGmDCn0=";
};
- vendorSha256 = "//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";
+ vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";
meta = with lib; {
homepage = "https://github.com/vektra/mockery";
diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix
index 1fa027ae72b9..b463ecd5dee8 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/pkgs/development/tools/go-protobuf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-protobuf";
- version = "1.4.3";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "golang";
repo = "protobuf";
rev = "v${version}";
- sha256 = "1kf1d7xmyjvy0z6j5czp6nqyvj9zrk6liv6znif08927xqfrzyln";
+ sha256 = "sha256-TYx7nAyUE70hoCNKnR74FzWhrQyWG17VPoKH3vR+qOM=";
};
- vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54";
+ vendorSha256 = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE=";
doCheck = false;
diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix
index e6d34ba41392..d2ea8a4f6bd5 100644
--- a/pkgs/development/tools/go-task/default.nix
+++ b/pkgs/development/tools/go-task/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-task";
- version = "3.2.2";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = pname;
repo = "task";
rev = "v${version}";
- sha256 = "0x94z023rsl7h9prw0i4zkwb5xf2frjz8f15mmcknw48r9ymw598";
+ sha256 = "sha256-+JhU0DXSUbpaHWJYEgiUwsR8DucGRwkiNiKDyhJroqk=";
};
- vendorSha256 = "05sh4jbva23ggg2viknl49bwgkhf8dfvsv3rqkl4wwi9ag64qgha";
+ vendorSha256 = "sha256-pNKzqUtEIQs0TP387ACHfCv1RsMjZi7O8P1A8df+QtI=";
doCheck = false;
@@ -22,7 +22,7 @@ buildGoModule rec {
];
postInstall = ''
- mv $out/bin/task $out/bin/go-task
+ ln -s $out/bin/task $out/bin/go-task
'';
meta = with lib; {
diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
index e55cea0895be..424942663393 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gofumpt";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "mvdan";
repo = pname;
rev = "v${version}";
- sha256 = "0xln0a5n8na3p6b7l8im3bh4ys5rr3k413ibzk8mnp471f5h1558";
+ sha256 = "sha256-MHNxJ9DPBWrLkaEEfXOmRqo2h2ugwgZT/SIe7bi3J2E=";
};
- vendorSha256 = "05qdwz1icl8in0j94gx9pgplidm2v29hsn4kgg5gw35bsbn1c7id";
+ vendorSha256 = "sha256-LR4W7NKrDP7Ke5NYDZPYorZI77upP5IksBFRFsPnDRc=";
doCheck = false;
diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
index 364117577bc3..23bd3dd3267f 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
@@ -1,4 +1,4 @@
-{ lib, supportedGhcVersions ? [ "865" "884" "8104" ], stdenv, haskellPackages
+{ lib, supportedGhcVersions ? [ "884" "8104" ], stdenv, haskellPackages
, haskell }:
#
# The recommended way to override this package is
diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix
index c10fa46f6700..4c35aaaae05a 100644
--- a/pkgs/development/tools/jbang/default.nix
+++ b/pkgs/development/tools/jbang/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec {
- version = "0.66.1";
+ version = "0.69.1";
pname = "jbang";
src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
- sha256 = "sha256-D7xZbuxSdE1zcyVZ9hqNOgq1oZDSFjBeITNqKXEpjyU=";
+ sha256 = "sha256-FuwivcF1SpGbLcoQshVNSWSQ7PgWC0XPCQF+i9zHb/w=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix
index 6a94d40c2062..b311ce4deacb 100644
--- a/pkgs/development/tools/k6/default.nix
+++ b/pkgs/development/tools/k6/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "k6";
- version = "0.30.0";
+ version = "0.31.1";
goPackagePath = "github.com/loadimpact/k6";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "loadimpact";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-eUvkW6IBmUp4/zYNlQKrNrxMszdzU8v6tCc2o4DN1As=";
+ sha256 = "sha256-wngOG0uSNoUU+88oShDpCgPpzuevzJxcwzSzWS3PzAw=";
};
subPackages = [ "./" ];
diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix
index 8a199f9191c0..c00304c1ec52 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.11.1";
+ version = "0.13.4";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
- sha256 = "0q21qd9fhchggby18gzyvds517n9vq7b1rr0gmzik4036ykg1lm2";
+ sha256 = "sha256-ZD63Xtnw7qzTrzFxzzZ37N177/PnRaMEzBbhz7h/zCY=";
};
- cargoSha256 = "0dp4prv8c2a6mxl7wskpc65qlfjphdxshb4q2bswqa5i21h8r534";
+ cargoSha256 = "sha256-c6veaasuwRtaO8TwHS0tNxjbBfekQOa52I9INcE1Jn0=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix
index 4c8693b0e513..e073c4f2e9e0 100644
--- a/pkgs/development/tools/kustomize/kustomize-sops.nix
+++ b/pkgs/development/tools/kustomize/kustomize-sops.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kustomize-sops";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "viaduct-ai";
repo = pname;
rev = "v${version}";
- sha256 = "0sr4d7amwn62xywwn83y58ynl8xv6l1q6zwbky5rmy0qxk909bqp";
+ sha256 = "sha256-aJGYkWMMg26V/T5BcWo3ibtHJBm4g2iIQn8cxs105Ys=";
};
- vendorSha256 = "0vn6vrczbdln7ngz061xixjwn899jn7p2a46770xqx44bh3f2lgv";
+ vendorSha256 = "sha256-6yfsGGzdUQySyQNuB58gwbsMjJgtUhfgfPI2zYlyUQo=";
installPhase = ''
mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/
diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index f741ca3382a7..1d8e4115309e 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazygit";
- version = "0.26";
+ version = "0.26.1";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-9CiXbMYb+EoxBrVFiPuWAlRJvYAq8hpxVDFcymk7Ud0=";
+ sha256 = "sha256-naTO5cckUfs32z7bm5jGGEuo8db11fnTnQdUDKK2W/I=";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix
index 87213b911a96..88b2f63fd5a5 100644
--- a/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/pkgs/development/tools/literate-programming/Literate/default.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, fetchgit, dmd, dub }:
+{ lib, stdenv, fetchgit, ldc, dub }:
stdenv.mkDerivation {
pname = "Literate";
- version = "unstable-2020-09-02";
+ version = "unstable-2021-01-22";
src = fetchgit {
url = "https://github.com/zyedidia/Literate.git";
- rev = "533991cca6ec7a608a778396d32d51b35182d944";
- sha256 = "09h1as01z0fw0bj0kf1g9nlhvinya7sqq2x8qb6zmhvqqm6v4n49";
+ rev = "7004dffec0cff3068828514eca72172274fd3f7d";
+ sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs";
};
- buildInputs = [ dmd dub ];
+ buildInputs = [ ldc dub ];
installPhase = "install -D bin/lit $out/bin/lit";
diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix
index 5d4441ecfbb6..c02764035161 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }:
+{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }:
-let noweb = stdenv.mkDerivation rec {
+lib.fix (noweb: stdenv.mkDerivation rec {
pname = "noweb";
version = "2.12";
@@ -11,25 +11,28 @@ let noweb = stdenv.mkDerivation rec {
sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95";
};
- patches = [ ./no-FAQ.patch ];
+ sourceRoot = "source/src";
- nativeBuildInputs = [ groff ] ++ lib.optionals (!isNull icon-lang) [ icon-lang ];
+ patches = [
+ # Remove FAQ
+ ./no-FAQ.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip'
+ '';
+
+ nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ];
+ buildInputs = [ nawk ];
preBuild = ''
mkdir -p "$out/lib/noweb"
- cd src
'';
- makeFlags = lib.optionals (!isNull icon-lang) [
+ makeFlags = lib.optionals useIcon [
"LIBSRC=icon"
"ICONC=icont"
- ] ++ lib.optionals stdenv.isDarwin [
- "CC=clang"
- ];
-
-
- installFlags = [
- ];
+ ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
preInstall = ''
mkdir -p "$tex/tex/latex/noweb"
@@ -50,11 +53,11 @@ let noweb = stdenv.mkDerivation rec {
for f in $out/bin/no{index,roff,roots,untangle,web} \
$out/lib/noweb/to{ascii,html,roff,tex} \
$out/lib/noweb/{bt,empty}defn \
- $out/lib/noweb/{noidx,unmarkup}; do
+ $out/lib/noweb/{noidx,pipedocs,unmarkup}; do
# NOTE: substituteInPlace breaks Icon binaries, so make sure the script
# uses (n)awk before calling.
if grep -q nawk "$f"; then
- substituteInPlace "$f" --replace "nawk" "${gawk}/bin/awk"
+ substituteInPlace "$f" --replace "nawk" "${nawk}/bin/awk"
fi
done
@@ -77,4 +80,4 @@ let noweb = stdenv.mkDerivation rec {
maintainers = with maintainers; [ yurrriq ];
platforms = with platforms; linux ++ darwin;
};
-}; in noweb
+})
diff --git a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
index 3230924990b8..2fa601d35c83 100644
--- a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
+++ b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
@@ -1,5 +1,5 @@
---- a/src/Makefile 2006-06-12 22:14:20.000000000 +0200
-+++ b/src/Makefile 2010-06-17 11:30:11.804018145 +0200
+--- a/Makefile 2006-06-12 22:14:20.000000000 +0200
++++ b/Makefile 2010-06-17 11:30:11.804018145 +0200
@@ -198,7 +198,7 @@
(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index 97aedfd8f8a0..c1e0a356df35 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
let
- version = "2.5.3";
+ version = "2.5.5";
in
stdenv.mkDerivation {
pname = "minizinc";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "MiniZinc";
repo = "libminizinc";
rev = version;
- sha256 = "1kc65sxkc64pr560qaaznc44jnlvq7pbpzwijad410lpcnna5byg";
+ sha256 = "sha256-9z2E6KqOys9UUXlXWB4eDhg34kS3PhUB1Dd1F6iGYoE=";
};
meta = with lib; {
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index e0d558b18800..b53adfd0be06 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "autoconf-archive";
- version = "2019.01.06";
+ version = "2021.02.19";
src = fetchurl {
url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
- sha256 = "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p";
+ sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0=";
};
buildInputs = [ xz ];
diff --git a/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix b/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix
new file mode 100644
index 000000000000..cf84a98467d6
--- /dev/null
+++ b/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, fetchFromGitHub, go }:
+
+stdenv.mkDerivation rec {
+ pname = "AutomaticComponentToolkit";
+ version = "1.6.0";
+
+ src = fetchFromGitHub {
+ owner = "Autodesk";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1r0sbw82cf9dbcj3vgnbd4sc1lklzvijic2z5wgkvs21azcm0yzh";
+ };
+
+ nativeBuildInputs = [ go ];
+
+ buildPhase = ''
+ cd Source
+ export HOME=/tmp
+ go build -o act *.go
+ '';
+
+ installPhase = ''
+ install -Dm0755 act $out/bin/act
+ '';
+
+ meta = with lib; {
+ description = "Toolkit to automatically generate software components: abstract API, implementation stubs and language bindings";
+ homepage = "https://github.com/Autodesk/AutomaticComponentToolkit";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ gebner ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix
index 780b2a8906f7..e9bc52874018 100644
--- a/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/pkgs/development/tools/misc/blackfire/php-probe.nix
@@ -18,11 +18,11 @@ let
}.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
in stdenv.mkDerivation rec {
pname = "php-blackfire";
- version = "1.49.1";
+ version = "1.53.0";
src = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
- sha256 = "5Z6CUj/HfSj+pC9iDEmU/OKCYePSAazU9q9M3glnOZU=";
+ sha256 = "ApKj5gulTCzWh7oSAM+JWQnWviHCnHV3OJHegpXJL54=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix
index fc1af1a4d684..080bc7a7f740 100644
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/pkgs/development/tools/misc/blackmagic/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
-, python, pythonPackages
+, python3
}:
with lib;
@@ -21,15 +21,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gcc-arm-embedded pkg-config
+ python3
];
buildInputs = [
libftdi1
libusb-compat-0_1
- python
- pythonPackages.intelhex
];
+ strictDeps = true;
+
postPatch = ''
# Prevent calling out to `git' to generate a version number:
substituteInPlace src/Makefile \
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index e8e84a7f51d9..2d5e77f79186 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circleci-cli";
- version = "0.1.15108";
+ version = "0.1.15149";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-r0GSv9JaQQkVLYDh51Rz6OIDTqV75RIT+NIWAFXWcV8=";
+ sha256 = "sha256-pmLDCNgCQv4fetl/q6ZokH1qF6pSqsR0DUWbzGeEtaw=";
};
vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s=";
diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix
index 03c3e51cb89b..d62ad413e1ac 100644
--- a/pkgs/development/tools/misc/cli11/default.nix
+++ b/pkgs/development/tools/misc/cli11/default.nix
@@ -3,7 +3,7 @@
fetchFromGitHub,
cmake,
gtest,
- python,
+ python3,
boost
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- checkInputs = [ boost python ];
+ checkInputs = [ boost python3 ];
doCheck = true;
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index 5ee1a64f2c23..84890f166235 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "cproto";
- version = "4.7q";
+ version = "4.7r";
src = fetchurl {
urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
# No version listings and apparently no versioned tarball over http(s).
"ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
];
- sha256 = "138n5j6lkanbbdcs63irzxny4nfgp0zk66z621xjbnybf920svpk";
+ sha256 = "sha256-bgRg2yVZXHobUz8AUaV4ZKBkp2KjP+2oXbDXmPTUX8U=";
};
# patch made by Joe Khoobyar copied from gentoo bugs
diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix
index 6684fdc88679..fe33df530cfd 100644
--- a/pkgs/development/tools/misc/cvise/default.nix
+++ b/pkgs/development/tools/misc/cvise/default.nix
@@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "cvise";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "marxin";
repo = "cvise";
rev = "v${version}";
- sha256 = "116cicz4d506ds3m9bmnb7f9nkp07hyzcrw29ljhznh1i620msim";
+ sha256 = "1x2i8nv0nncgvr07znhh2slngbrg8qcsz2zqx76bcyq9hssn6yal";
};
patches = [
diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index 3ab8800f3c4e..055a24f3fe0a 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -16,7 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj";
};
- buildInputs = [ tie ];
+ # Remove references to __DATE__ and __TIME__
+ postPatch = ''
+ substituteInPlace wmerg-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
+ substituteInPlace ctang-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
+ substituteInPlace ctangle.cxx --replace ' ("__DATE__", "__TIME__")' ""
+ substituteInPlace cweav-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
+ '';
+
+ nativeBuildInputs = [ tie ];
makeFlags = [
"MACROSDIR=$(out)/share/texmf/tex/generic/cweb"
@@ -27,7 +35,7 @@ stdenv.mkDerivation rec {
"CP=cp"
"RM=rm"
"PDFTEX=echo"
- "CC=c++"
+ "CC=${stdenv.cc.targetPrefix}c++"
];
buildPhase = ''
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index ac5fb4118beb..dca8d9666af5 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
stdenv.mkDerivation rec {
pname = "dialog";
- version = "1.3-20210117";
+ version = "1.3-20210306";
src = fetchurl {
url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz";
- sha256 = "PB7Qj0S89vFZ8qpv3nZduU6Jl7Pu+0nYtMhmkWk8Q+E=";
+ hash = "sha256-pz57YHtjX2PAICuzMTEG5wD5H+Sp9NJspwA/brK5yw8=";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index cad9fe0960b5..38ddc1ff4312 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand
+{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk2, runCommand
, gcc, autoconf, automake, which, procps, libiberty_static
, runtimeShell
, sysconfDir ? "" # set this parameter to override the default value $out/etc
@@ -18,7 +18,7 @@ let
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static];
+ buildInputs = [popt avahi pkg-config python3 gtk2 autoconf automake which procps libiberty_static];
preConfigure =
''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix
index 8b7717881119..0692d84b4544 100644
--- a/pkgs/development/tools/misc/doclifter/default.nix
+++ b/pkgs/development/tools/misc/doclifter/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, python}:
+{lib, stdenv, fetchurl, python3}:
stdenv.mkDerivation {
name = "doclifter-2.19";
@@ -6,7 +6,9 @@ stdenv.mkDerivation {
url = "http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz";
sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2";
};
- buildInputs = [ python ];
+ buildInputs = [ python3 ];
+
+ strictDeps = true;
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix
index 82b2d2af7cd8..b93416094931 100644
--- a/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
- version = "2.3.3";
+ version = "2.3.4";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
- sha256 = "sha256-u3gTzsAoV4fgQjsnONIIGFE/Y02bKbCTg30O9FTI2/w=";
+ sha256 = "sha256-aTHY9RFFkpTQKv+Erczu5joqvE7L05Ev2GOSiXNxLj8=";
};
- vendorSha256 = "sha256-0Eznh9xXuYf4mVZipyE99fKwkGYeSAorhBLamupGkvw=";
+ vendorSha256 = "sha256-y+wQ6XzX4vmKzesUcF9jgfrKPj5EsCuw/aKizVX/ogI=";
doCheck = false;
diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix
index a978c31c34d1..042d085c1e0c 100644
--- a/pkgs/development/tools/misc/jscoverage/default.nix
+++ b/pkgs/development/tools/misc/jscoverage/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
./jsfalse_to_null.patch
];
- buildInputs = [ autoconf makedepend perl python unzip zip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ autoconf makedepend perl python zip ];
# It works without MOZ_FIX_LINK_PATHS, circumventing an impurity
# issue. Maybe we could kick js/ (spidermonkey) completely and
diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix
index 1919e26ddec4..7f73fb9a1bc3 100644
--- a/pkgs/development/tools/misc/nimlsp/default.nix
+++ b/pkgs/development/tools/misc/nimlsp/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
export HOME=$TMPDIR
nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \
c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \
- -d:debugLogging -d:explicitSourcePath=${srcOnly nim.unwrapped} -d:tempDir=/tmp src/nimlsp
+ -d:debugLogging -d:explicitSourcePath=${srcOnly nim.passthru.nim} -d:tempDir=/tmp src/nimlsp
'';
installPhase = ''
diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
index 9176842d75d0..d72cca0e785b 100644
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/pkgs/development/tools/misc/premake/3.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
};
- buildInputs = [unzip];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
install -Dm755 bin/premake $out/bin/premake
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index c26e834ee0f7..5943b57d8088 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
categories = "Development";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
# Copy prebuilt app to $out
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index ccadaa8aeb47..4379efd5071b 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj";
- cargoBuildFlags = [ "--features=dist-client,dist-server" ];
+ cargoBuildFlags = lib.optionals (!stdenv.isDarwin) [ "--features=dist-client,dist-server" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
@@ -27,6 +27,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/mozilla/sccache";
maintainers = with maintainers; [ doronbehar ];
license = licenses.asl20;
- platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix
index c6915e294d2e..6af24ed5d10b 100644
--- a/pkgs/development/tools/misc/svls/default.nix
+++ b/pkgs/development/tools/misc/svls/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "svls";
- version = "0.1.25";
+ version = "0.1.27";
src = fetchFromGitHub {
owner = "dalance";
repo = "svls";
rev = "v${version}";
- sha256 = "sha256-+o15rElJZXQu2Hq1/79ms9wqYimINrViSdQltSJlGN8=";
+ sha256 = "sha256-+/4D0pRZs1Gy6DJnsDZA8wWi1FKhr7gRS0oq1TyWpuE=";
};
- cargoSha256 = "sha256-zLDUQcnvjyr+QJLVq6ADGPee0Fd7HeDhPAkb05hYLcE=";
+ cargoSha256 = "sha256-o6/L/4QcIei4X1pHYjV72hcEmTMp+pvJkwbb+niqWP8=";
meta = with lib; {
description = "SystemVerilog language server";
diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix
index 29edccf496ee..b51cfa96d07e 100644
--- a/pkgs/development/tools/misc/terracognita/default.nix
+++ b/pkgs/development/tools/misc/terracognita/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terracognita";
- version = "0.6.0";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "cycloidio";
repo = pname;
rev = "v${version}";
- sha256 = "1f0wi5mlb9r7ncvyvgmcdfngxrzgbdv7hm2ckb8bwmzcki2h2255";
+ sha256 = "sha256-RX2L9EwxfZ+utptTDR3+W9ACVPALF/hiE40SJTmZuLs=";
};
- vendorSha256 = "015r7zvah7lk5rbkaqhh2abbv19ky1in3ngzzrdvhbcqfns25iqr";
+ vendorSha256 = "sha256-sN9GTcG5cZxvMaLqNjY2jfLkf8a3lugM2aV3bBdT5Ww=";
doCheck = false;
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index f6b51a969b27..759c83e81c8a 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "uncrustify";
- version = "0.71.0";
+ version = "0.72.0";
src = fetchFromGitHub {
owner = product;
repo = product;
rev = name;
- sha256 = "1wyhkhn000yad94fnjj61h7lyvan6hig8wh7jxlnyp5wxdwki0pj";
+ sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY=";
};
nativeBuildInputs = [ cmake python ];
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index a8b48e9fa53f..4f4dddbc9453 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "yodl";
- version = "4.02.02";
+ version = "4.03.02";
nativeBuildInputs = [ icmake ];
buildInputs = [ perl ];
src = fetchFromGitLab {
- sha256 = "1kf4h99p9i35fgas8z5wdy2qpd7gqfd645b5z7mfssjzsfdrv745";
+ sha256 = "sha256-ZxiF9He0JgqhbnQS2pE7Y85sED8avbdwGuVmFN8/XgE=";
rev = version;
repo = "yodl";
owner = "fbb-git";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index f1398c2f7c7d..12306d2a305a 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -1,16 +1,16 @@
{ lib, fetchurl, buildDunePackage
-, cmdliner, cppo, yojson, ppxlib
+, ocaml, cmdliner, cppo, yojson, ppxlib
, menhir
}:
buildDunePackage rec {
pname = "js_of_ocaml-compiler";
- version = "3.8.0";
+ version = "3.9.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
- sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy";
+ sha256 = "0ib551kfsjlp9vr3fk36hrbq7xxyl8bj6vcn3ccr0s370bsmgpm6";
};
nativeBuildInputs = [ cppo menhir ];
diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
index 009998a3f851..b3b737760588 100644
--- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
+++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
@@ -1,6 +1,4 @@
-{ lib, fetchurl, ocamlPackages }:
-
-with ocamlPackages;
+{ lib, fetchurl, yojson, csexp, result, buildDunePackage }:
buildDunePackage rec {
pname = "dot-merlin-reader";
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix
index 610093af19ff..60804684ccbc 100644
--- a/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -47,8 +47,8 @@ in stdenv.mkDerivation {
pname = "opam";
version = "1.2.2";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip curl ncurses ocaml ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ curl ncurses ocaml ];
src = srcs.opam;
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 30bc089ee0fe..bd33d4cc1d34 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -63,8 +63,8 @@ in stdenv.mkDerivation {
pname = "opam";
version = "2.0.8";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
src = srcs.opam;
diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl
index b94aa7dd9a2f..bfaea0c7ef30 100755
--- a/pkgs/development/tools/ocaml/opam/opam.nix.pl
+++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl
@@ -68,7 +68,8 @@ in stdenv.mkDerivation {
pname = "opam";
version = "$OPAM_RELEASE";
- buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
src = srcs.opam;
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index ac5ab022ef12..5ed83c541168 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -1,7 +1,10 @@
{ lib, stdenv
, fetchurl
-, mono5
+, mono6
+, msbuild
+, dotnet-sdk
, makeWrapper
+, dotnetPackages
}:
stdenv.mkDerivation rec {
@@ -14,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0pknphydf194n7rjyax4mh8n7j8679j0jflw63gfgh37daxry0r2";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper dotnet-sdk dotnetPackages.Nuget ];
preUnpack = ''
mkdir src
@@ -26,8 +29,13 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cd ..
cp -r src $out/
- ls -al $out/src
- makeWrapper ${mono5}/bin/mono $out/bin/omnisharp \
+ rm -r $out/src/.msbuild
+ cp -r ${msbuild}/lib/mono/msbuild $out/src/.msbuild
+
+ chmod -R u+w $out/src
+ mv $out/src/.msbuild/Current/{bin,Bin}
+
+ makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \
--add-flags "$out/src/OmniSharp.exe"
'';
@@ -36,7 +44,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
platforms = platforms.linux;
license = licenses.mit;
- maintainers = with maintainers; [ tesq0 ];
+ maintainers = with maintainers; [ tesq0 ericdallo ];
};
}
diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix
index 764041b6ad4a..0df831b579e1 100644
--- a/pkgs/development/tools/operator-sdk/default.nix
+++ b/pkgs/development/tools/operator-sdk/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "operator-sdk";
- version = "1.4.2";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-wGlxi9X8RrAtvevDfufY1t3en6QgHy5XoSh0K/M/ve4=";
+ sha256 = "sha256-95fTfUKoknGBIoc/ALd5w9X89Tl9DBxapl9EgWENsa0=";
};
- vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30=";
+ vendorSha256 = "sha256-Sp0ml5tnsbnuyk3NkA80dmFj6IOiL/NeYYbEbr7EPRY=";
doCheck = false;
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index 665609fe90af..ebba9903a47c 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -12,6 +12,30 @@ stdenv.mkDerivation rec {
};
patches = [
+ (fetchpatch {
+ name = "CVE-2018-21232-part1.patch";
+ url = "https://github.com/skvadrik/re2c/commit/fd634998f813340768c333cdad638498602856e5.patch";
+ sha256 = "1blyg5lyhqd4ymisih65xl0g36ig71ijia4skkkd59rdvj78aiw6";
+ })
+
+ (fetchpatch {
+ name = "CVE-2018-21232-part2.patch";
+ url = "https://github.com/skvadrik/re2c/commit/7b5643476bd99c994c4f51b8143f942982d85521.patch";
+ sha256 = "0rhmgqrinpk49r9x75ygrs14lz72aw5ad5kr6qp9bdyl8gs082qp";
+ })
+
+ (fetchpatch {
+ name = "CVE-2018-21232-part3.patch";
+ url = "https://github.com/skvadrik/re2c/commit/4d9c809355b574f2a58eac119f5e076c48e4d1e2.patch";
+ sha256 = "0k86wg9icw1gkqpf7rq2w6xsq4caxw3rc0zfxf39liwa35027rai";
+ })
+
+ (fetchpatch {
+ name = "CVE-2018-21232-part4.patch";
+ url = "https://github.com/skvadrik/re2c/commit/89be91f3df00657261870adbc590209fdb2bc405.patch";
+ sha256 = "1aygy9va7jwby93chlskwg7z90fn07x5hym0gziwlkx8k900p3a3";
+ })
+
(fetchpatch {
name = "CVE-2020-11958.patch";
url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch";
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 48f48ed748f2..ac2ad69fea33 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -1,9 +1,21 @@
-{ lib, stdenv
-, fetchgit, fetchFromGitHub, fetchurl
-, writeShellScript, runCommand, which, formats
-, rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten
+{ lib
+, stdenv
+, fetchgit
+, fetchFromGitHub
+, fetchurl
+, writeShellScript
+, runCommand
+, which
+, formats
+, rustPlatform
+, jq
+, nix-prefetch-git
+, xe
+, curl
+, emscripten
, Security
, callPackage
+, linkFarm
, enableShared ? !stdenv.hostPlatform.isStatic
, enableStatic ? stdenv.hostPlatform.isStatic
@@ -16,9 +28,9 @@ let
# 1) change all these hashes
# 2) nix-build -A tree-sitter.updater.update-all-grammars
# 3) run the ./result script that is output by that (it updates ./grammars)
- version = "0.18.2";
- sha256 = "1kh3bqn28nal3mmwszbih8hbq25vxy3zd45pzj904yf0ds5ql684";
- cargoSha256 = "06jbn4ai5lrxzv51vfjzjs7kgxw4nh2vbafc93gma4k14gggyygc";
+ version = "0.19.3";
+ sha256 = "0zd1p9x32bwdc5cdqr0x8i9fpcykk1zczb8zdjawrrr92465d26y";
+ cargoSha256 = "0mlrbl85x1x2ynwrps94mxn95rjj1r7gb3vdivfaxqv1xvp25m41";
src = fetchFromGitHub {
owner = "tree-sitter";
@@ -32,35 +44,35 @@ let
inherit writeShellScript nix-prefetch-git curl jq xe src formats lib;
};
- fetchGrammar = (v: fetchgit {inherit (v) url rev sha256 fetchSubmodules; });
+ fetchGrammar = (v: fetchgit { inherit (v) url rev sha256 fetchSubmodules; });
grammars =
- runCommand "grammars" {} (''
- mkdir $out
- '' + (lib.concatStrings (lib.mapAttrsToList
- (name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n")
- (import ./grammars))));
+ runCommand "grammars" { } (''
+ mkdir $out
+ '' + (lib.concatStrings (lib.mapAttrsToList
+ (name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n")
+ (import ./grammars))));
- builtGrammars = let
- change = name: grammar:
- callPackage ./grammar.nix {} {
- language = name;
- inherit version;
- source = fetchGrammar grammar;
- };
- in
- lib.mapAttrs change (removeAttrs (import ./grammars) [
- # TODO these don't have parser.c in the same place as others.
- # They might require more elaborate builds?
- # /nix/…/src/parser.c: No such file or directory
- "tree-sitter-typescript"
- # /nix/…/src/parser.c: No such file or directory
- "tree-sitter-ocaml"
- # /nix/…/src/parser.c:1:10: fatal error: tree_sitter/parser.h: No such file or directory
- "tree-sitter-razor"
- ]);
+ builtGrammars =
+ let
+ change = name: grammar:
+ callPackage ./grammar.nix { } {
+ language = name;
+ inherit version;
+ source = fetchGrammar grammar;
+ location = if grammar ? location then grammar.location else null;
+ };
+ grammars' = (import ./grammars);
+ grammars = grammars' //
+ { tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "ocaml"; }; } //
+ { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } //
+ { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } //
+ { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; };
+ in
+ lib.mapAttrs change grammars;
-in rustPlatform.buildRustPackage {
+in
+rustPlatform.buildRustPackage {
pname = "tree-sitter";
inherit src version cargoSha256;
@@ -99,8 +111,7 @@ in rustPlatform.buildRustPackage {
updater = {
inherit update-all-grammars;
};
- inherit grammars;
- inherit builtGrammars;
+ inherit grammars builtGrammars;
tests = {
# make sure all grammars build
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
index d9ad21dea613..5ca381e6d2ff 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
@@ -11,6 +11,7 @@
, version
# source for the language grammar
, source
+, location ? null
}:
stdenv.mkDerivation {
@@ -18,12 +19,18 @@ stdenv.mkDerivation {
pname = "${language}-grammar";
inherit version;
- src = source;
+ src =
+ if location == null
+ then
+ source
+ else
+ "${source}/${location}"
+ ;
buildInputs = [ tree-sitter ];
dontUnpack = true;
- configurePhase= ":";
+ configurePhase = ":";
buildPhase = ''
runHook preBuild
scanner_cc="$src/src/scanner.cc"
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 6d8c9237bd0f..d9d5fa46badc 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -6,6 +6,7 @@
tree-sitter-cpp = (builtins.fromJSON (builtins.readFile ./tree-sitter-cpp.json));
tree-sitter-css = (builtins.fromJSON (builtins.readFile ./tree-sitter-css.json));
tree-sitter-embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json));
+ tree-sitter-fennel = (builtins.fromJSON (builtins.readFile ./tree-sitter-fennel.json));
tree-sitter-fluent = (builtins.fromJSON (builtins.readFile ./tree-sitter-fluent.json));
tree-sitter-go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json));
tree-sitter-haskell = (builtins.fromJSON (builtins.readFile ./tree-sitter-haskell.json));
@@ -16,17 +17,19 @@
tree-sitter-json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json));
tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json));
tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json));
+ tree-sitter-markdown = (builtins.fromJSON (builtins.readFile ./tree-sitter-markdown.json));
tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json));
tree-sitter-ocaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-ocaml.json));
tree-sitter-php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json));
tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json));
tree-sitter-ql = (builtins.fromJSON (builtins.readFile ./tree-sitter-ql.json));
- tree-sitter-razor = (builtins.fromJSON (builtins.readFile ./tree-sitter-razor.json));
tree-sitter-regex = (builtins.fromJSON (builtins.readFile ./tree-sitter-regex.json));
tree-sitter-ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json));
tree-sitter-rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json));
tree-sitter-scala = (builtins.fromJSON (builtins.readFile ./tree-sitter-scala.json));
+ tree-sitter-svelte = (builtins.fromJSON (builtins.readFile ./tree-sitter-svelte.json));
tree-sitter-swift = (builtins.fromJSON (builtins.readFile ./tree-sitter-swift.json));
tree-sitter-typescript = (builtins.fromJSON (builtins.readFile ./tree-sitter-typescript.json));
tree-sitter-verilog = (builtins.fromJSON (builtins.readFile ./tree-sitter-verilog.json));
+ tree-sitter-yaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-yaml.json));
}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
index f1d5efbe7ea0..abb86b305459 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-bash",
- "rev": "e213464b5062017dc058cfb7effe2fc7a2eebb04",
- "date": "2020-03-02T14:55:46+01:00",
- "path": "/nix/store/napdz7i4k0gz469zsszdlvr5hmj8y7i9-tree-sitter-bash",
- "sha256": "0wz9rmpd36g88l2hhy1xl3i5d6a6di1jlw11qkvccgg16kb9p4h7",
+ "rev": "b6667bed364733c8a8f8e5973749f86cfa04ba2a",
+ "date": "2021-03-04T14:15:26-08:00",
+ "path": "/nix/store/nvlvdv02wdy4dq4w19bvzq6nlkgvpj20-tree-sitter-bash",
+ "sha256": "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
index 989f7bf53671..03c4bb06a0c8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
- "rev": "21ec3c3deb4365085aa353fadbc6a616d7769f9f",
- "date": "2021-02-18T09:41:56-08:00",
- "path": "/nix/store/8172rv05dvvlyp4cfmr2b41g4a20vlcf-tree-sitter-c-sharp",
- "sha256": "1cc0ss09bfv2xy77bpcmy6y2hqis7a8xby9afcaxcn5llj593ynj",
+ "rev": "70fd2cba742506903589b5e046c32e0e3e06404a",
+ "date": "2021-03-03T17:18:54-08:00",
+ "path": "/nix/store/m0pzbb0vg0fm9nycj05ay0yldzp7qwbi-tree-sitter-c-sharp",
+ "sha256": "12jj66rsn1klsk24yj0ymgsqwy7lc5kb3nkj7griip8rmi3kgy41",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
index 31301d981d08..3d98f69f053a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c",
- "rev": "fa408bc9e77f4b770bd1db984ca00c901ddf95fc",
- "date": "2021-02-24T11:13:22-08:00",
- "path": "/nix/store/8rlr93kjsvbpc8vgfxw02vcaprlfmprq-tree-sitter-c",
- "sha256": "03nb8nlnkfw8p8bi4grfyh31l6419sk7ak2hnkpnnjs0y0gqb7jm",
+ "rev": "5aa0bbbfc41868a3727b7a89a90e9f52e0964b2b",
+ "date": "2021-03-03T17:00:36-08:00",
+ "path": "/nix/store/2wa64ii39p31wpngvqk4ni8z8ws29r2g-tree-sitter-c",
+ "sha256": "1diys8yigvhm4ppbmp3a473yxjg2d5lk11y0ay7qprcz7233lakv",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index d5878b65fa3c..fcd0457454d3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-cpp",
- "rev": "3bfe046f3967fef92ebb33f8cd58c3ff373d5e56",
- "date": "2021-02-25T11:55:19-08:00",
- "path": "/nix/store/m2sd8ic8j3dayfa0zz0shc2pjaamahpf-tree-sitter-cpp",
- "sha256": "052imxj6920ia002pzgwj2rg75xq3xpa80w8sjdq4mnlksy8v7g6",
+ "rev": "05cf2030e5415e9e931f620f0924107f73976796",
+ "date": "2021-03-04T10:01:34-08:00",
+ "path": "/nix/store/fraya34acwl9i3cxpml9hwzfkyc8vs89-tree-sitter-cpp",
+ "sha256": "08ywv6n80sa541rr08bqz4zyg7byvjcabp68lvxmcahjk8xzcgwk",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
index 6a4795d74050..924eea489cee 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-css",
- "rev": "e882c98b5e62d864f7f9e4d855b19b6050c897a8",
- "date": "2021-02-12T10:45:27-08:00",
- "path": "/nix/store/g368rqak07i91ddma16pkccp63y2s5yv-tree-sitter-css",
- "sha256": "0firlbl81vxnw5dp31inabizjhqc37rnbvwf05668qpfjl9gc03z",
+ "rev": "94e10230939e702b4fa3fa2cb5c3bc7173b95d07",
+ "date": "2021-03-04T15:25:23-08:00",
+ "path": "/nix/store/0q3y4zhphdcc54qijbx2pdp8li9idk64-tree-sitter-css",
+ "sha256": "0y90nsfbh13mf33yahbk7zklbv7124rpm0v19qydz6nv1f9hpywd",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index 02e4977fa333..32459e77ef01 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
- "rev": "872f037009ae700e3d4c3f83284af8f51c184dd4",
- "date": "2021-02-05T09:53:39-08:00",
- "path": "/nix/store/qg1lmgjrvjxg05bf7dczx5my9r83rxyb-tree-sitter-embedded-template",
- "sha256": "0iffxki8pqavvi0cyndgyr4gp0f4zcdbv7gn7ar4sp17pksk5ss6",
+ "rev": "1c03594a44df1fc2020b989d503cb084abd5fd01",
+ "date": "2021-03-04T10:06:18-08:00",
+ "path": "/nix/store/09b9drfnywcy1i8wlw6slnn76ch40kqk-tree-sitter-embedded-template",
+ "sha256": "0c9l4i6kwb29zp05h616y3vk2hhcfc8bhdf9m436bk47pfy2zabg",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
new file mode 100644
index 000000000000..8d3c6608ab83
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
@@ -0,0 +1,10 @@
+{
+ "url": "https://github.com/travonted/tree-sitter-fennel",
+ "rev": "5aad9d1f490b7fc8a847a5b260f23396c56024f5",
+ "date": "2020-11-03T09:22:17-05:00",
+ "path": "/nix/store/gsxg67brk198201h70lip7miwny084sy-tree-sitter-fennel",
+ "sha256": "1imv5nwmhsyxwq7b9z4qz72lfva40wgybdkmq0gbbfbszl9a9bgl",
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
index 612b8eb64d88..d0a7188c6b2e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-go",
- "rev": "dadfd9c9aab2630632e61cfce645c13c35aa092f",
- "date": "2020-10-27T13:42:16-04:00",
- "path": "/nix/store/91a8w265vjc955hyp7cqvpm8ks9zcmqv-tree-sitter-go",
- "sha256": "1pwbzkg7s0l2fhr4p1rpcldjcpxbkaqsm3q81543almc75k38x8w",
+ "rev": "e41dd569d91eb58725baa7089c34fc3d785b2978",
+ "date": "2021-03-03T17:11:05-08:00",
+ "path": "/nix/store/87n5nl5p1fnmwgy0zshz90vyvha6b7mn-tree-sitter-go",
+ "sha256": "0nxs47vd2fc2fr0qlxq496y852rwg39flhg334s7dlyq7d3lcx4x",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index 10d2dd64ac28..191a23dd78c6 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
- "rev": "2a0aa1cb5f1b787a4056a29fa0791e87846e33fb",
- "date": "2018-11-03T09:56:20-07:00",
- "path": "/nix/store/9xszs4xi51qr72laxr67zxnh8y2br0gy-tree-sitter-haskell",
- "sha256": "0z0nfip5m0yrjgm49j5nld7jkgyjdmps101xhbng39pwfnh1av83",
+ "rev": "24cf84ff618e96528882c67c8740fadcd6c4a921",
+ "date": "2021-03-06T17:58:27+01:00",
+ "path": "/nix/store/46hpbz06d1p5n0rp6z3iwy2lpwrn8kgl-tree-sitter-haskell",
+ "sha256": "1l004x1z9g1p8313ipvrf581vr2wi82qcwc0281kg083m2z4535p",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
index 7e53e76c0dea..8c190011fd0f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-html",
- "rev": "7f442e1c6163d450c69c75c7a621badc3a0ea98f",
- "date": "2020-07-20T12:46:52-07:00",
- "path": "/nix/store/qklk97krsas1kjbh8dp6ii1gj9sqz8h9-tree-sitter-html",
- "sha256": "0z249nnxlal8g6zbrys6kb80vksgcw2j5nd737m6yna2h5bhl126",
+ "rev": "d93af487cc75120c89257195e6be46c999c6ba18",
+ "date": "2021-03-04T14:11:18-08:00",
+ "path": "/nix/store/26yjfh6v17n4ajs9ln7x25sf1m3ijcjg-tree-sitter-html",
+ "sha256": "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
index 66c859449695..19c8edef5e25 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-java",
- "rev": "16c07a726c34c9925b3e28716b2d6d60e3643252",
- "date": "2021-02-11T09:32:05-08:00",
- "path": "/nix/store/1b64g1a3cvq1hspys9z2z1lsawg2b9m2-tree-sitter-java",
- "sha256": "1rag75r71cp8cvkf4f3wj911jppypziri19zysyy3pgzhznqy4zd",
+ "rev": "7ad106e81963b4d5c0aff99b93d16dc577fa3bc8",
+ "date": "2021-03-05T16:03:00-08:00",
+ "path": "/nix/store/ax9m7v0pv7q7xsnrjlfdpljs4f6xi2z3-tree-sitter-java",
+ "sha256": "1594mrhqcdfs8b7wmwpzcwna4m3ra8cbzq162flwrhcsb3w0rr9w",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index 8d1aa2daf53e..6f31e096f598 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
- "rev": "37af80d372ae9e2f5adc2c6321d5a34294dc348b",
- "date": "2021-02-24T09:50:29-08:00",
- "path": "/nix/store/y8jbjblicw2c65kil2y4d6vdn9r9h9w5-tree-sitter-javascript",
- "sha256": "0cr75184abpg95bl6wgkqn7ay849bjsib48m9pdb5jrly1idw6n2",
+ "rev": "b3e7667995c065be724d10b69fbc3d0177ccef0b",
+ "date": "2021-03-08T13:12:59-08:00",
+ "path": "/nix/store/1y3nirw7bbnld4qy7ysm20bq0x9403wz-tree-sitter-javascript",
+ "sha256": "0bzyq5x8x1r34fzy1f05yqdlz51b1i1jmyssm0i571n9n6142s3j",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
index 5dca4a5f9615..94920e80442f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
- "rev": "77e7785739ad3e90c3de8ed5a55418a5fd2b8225",
- "date": "2020-05-14T14:58:51-07:00",
- "path": "/nix/store/3wp3hff203z15fvbnizcqzic1pjxmpg4-tree-sitter-jsdoc",
- "sha256": "0i2ac7i0vs46668q56dpmd9c02vcyy3f8rh4i0dbvd3rvihifbgc",
+ "rev": "189a6a4829beb9cdbe837260653b4a3dfb0cc3db",
+ "date": "2021-03-04T14:39:14-08:00",
+ "path": "/nix/store/dpm11vziss6jbgp3dxvmgkb0dgg1ygc8-tree-sitter-jsdoc",
+ "sha256": "0qpsy234p30j6955wpjlaqwbr21bi56p0ln5vhrd84s99ac7s6b6",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index a70809369888..34f2563b12a4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-json",
- "rev": "d3976b27df8622ed17bef6dd5e358b398e73c676",
- "date": "2020-05-14T14:59:27-07:00",
- "path": "/nix/store/ds2wnlrh289rsnjx828h3jy1706g3x21-tree-sitter-json",
- "sha256": "1cbhsmzbjni0mynjcai6gshhg16nls82v9lcihxf350dz57f7sax",
+ "rev": "89607925e8989f2638cc935b8de7e44ac3c91907",
+ "date": "2021-03-04T14:55:58-08:00",
+ "path": "/nix/store/xpykb8mr4xarh6finzkz71z2bpqm8k26-tree-sitter-json",
+ "sha256": "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
index 2cf5f06dc19c..d90f09348cad 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-julia",
- "rev": "6a0863f1ce3fcf6f99dc0addb7886dcbd27c5a48",
- "date": "2020-09-08T19:39:52-07:00",
- "path": "/nix/store/xn5nii9mi2aw7xdabyxlglha2vk12h1w-tree-sitter-julia",
- "sha256": "07ds4wzgvnkgkq07izdglkk8lgpqrylvrs96afnwxi56bnzs8sbv",
+ "rev": "0ba7a24b062b671263ae08e707e9e94383b25bb7",
+ "date": "2021-03-04T14:52:13-08:00",
+ "path": "/nix/store/2ni8p1cgyrkn1mcccl4zqdpkfm63a10m-tree-sitter-julia",
+ "sha256": "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
index 804d613357e3..9996ac8d917e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
@@ -1,9 +1,9 @@
{
- "url": "https://github.com/nvim-treesitter/tree-sitter-lua",
- "rev": "97b757ad3546d68dc1131e6ffb9b1d2a750eea29",
- "date": "2020-11-25T21:23:57+01:00",
- "path": "/nix/store/irz0dikk9dahkayi41chcznqq1i3wr84-tree-sitter-lua",
- "sha256": "1nhg139vk3xm6ip4mhr29z0rprfg4q417z2vlvkz3m9wp8gppzls",
+ "url": "https://github.com/Azganoth/tree-sitter-lua",
+ "rev": "a943944ec09c5e96f455bb166079de4ef3534457",
+ "date": "2020-12-27T00:15:24-03:00",
+ "path": "/nix/store/6glr8p3x58pva0nn586dk5jwb3bpgqrj-tree-sitter-lua",
+ "sha256": "0pm6wwb3kv73bfvvshdmvazcb1is5x1z6jwr31gz0niln18nqvpb",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
new file mode 100644
index 000000000000..164b7c0549bb
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
@@ -0,0 +1,10 @@
+{
+ "url": "https://github.com/ikatyang/tree-sitter-markdown",
+ "rev": "5a139bed455268a06410471bf48b19d11abdd367",
+ "date": "2021-01-24T15:17:18+08:00",
+ "path": "/nix/store/125cbxcqvwyq8b7kvmg7wxjjz16s2jvw-tree-sitter-markdown",
+ "sha256": "072b4nnpymrh90y4dk18kr8l1g7m83r3gvp6v0ad9f9dnq47fgax",
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
index 32488ebb73ed..d13f77a9f047 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ocaml",
- "rev": "4ec9ee414dadc2b6e7325a9f8124d02f6cd8c250",
- "date": "2020-09-18T02:13:40+02:00",
- "path": "/nix/store/dszjdnwnbziqxav2khs85026msm6fasz-tree-sitter-ocaml",
- "sha256": "0wy85940fhmrnz7c1gk6xkipm8ixzalq5q4i7mcc6wnjiiwq60gx",
+ "rev": "19a8d2aab425c4c4c8dc6a882e67c37010620c3b",
+ "date": "2021-03-08T16:57:09-08:00",
+ "path": "/nix/store/y8jsf6vp278svqm4c6xnl4i6vanslrkk-tree-sitter-ocaml",
+ "sha256": "0c5wjanka87bhha0aq3m5p448apxhv8hndlqvhly6qafj99jp85i",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index 1fb2a0798481..8a013179e3de 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
- "rev": "b0c0367d4b7058921fdc4ba11e257441a64ab809",
- "date": "2020-07-29T16:56:25-07:00",
- "path": "/nix/store/la06yzcv5w1dpp31s4clllkfic8rs98a-tree-sitter-php",
- "sha256": "0a47rr1d5dg70kfvk257g7mhpcwslv6prxc7012spxcrfiwbx89l",
+ "rev": "ba231f9844e5a1bf60e1cb72c34c0a431239585a",
+ "date": "2021-03-03T17:17:11-08:00",
+ "path": "/nix/store/cn06h14pgq3psjq3ms0yvdm3x1wwbc1j-tree-sitter-php",
+ "sha256": "1xaml64b7cx3hn6x35bbgar8cp7ccxkwvxddjdvyj5nzfx1id8y3",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index ded864c89768..976ec6c57cdf 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-python",
- "rev": "3196e288650992bca2399dda15ac703c342a22bb",
- "date": "2021-01-19T11:31:59-08:00",
- "path": "/nix/store/0y394nsknvjxpxnsfscab531mivnzhap-tree-sitter-python",
- "sha256": "0fbkyysz0qsjqzqznwgf52wsgb10h8agc4p68zafiibwlp72gd09",
+ "rev": "dd98afca32aaceff9025f9e85031ac50bee8b08b",
+ "date": "2021-03-05T16:00:15-08:00",
+ "path": "/nix/store/6sbmzgva73fhgqhsdrg5zy7vbs9lzll9-tree-sitter-python",
+ "sha256": "01ykryrv1nn2y8dcbl64d31h1ipz2569ywzjp10pd93h1s6czpnl",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
index f799ce410c6c..37b0d1532408 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ql",
- "rev": "f3738c138ba753eed5da386c7321cb139d185d39",
- "date": "2021-02-19T10:26:41+00:00",
- "path": "/nix/store/dww93fp6psaw4lhiwyn8qajq8mvsyv5s-tree-sitter-ql",
- "sha256": "15wqyf0q9arr4jh0dfjr5200rghy989wvf311cffma7706ngmgxb",
+ "rev": "965948cce9a94a710b1339851e0919471ad5ee2c",
+ "date": "2021-03-04T14:34:34-08:00",
+ "path": "/nix/store/4hi59c856ii2b79nv2wjib6qbp3hk24i-tree-sitter-ql",
+ "sha256": "01y1fzclwlaffx0rzg49h7kyvhhm25fba0w362n2y8hgjp3imgmg",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
index d04c1bdab867..6df921757bb8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-regex",
- "rev": "be2e415b5716615530234d179dc27c32b7a1d86b",
- "date": "2020-05-14T15:05:54-07:00",
- "path": "/nix/store/acbcq9lgh5pf6hq3329fa253yfvaj6ji-tree-sitter-regex",
- "sha256": "0qxbafbwfj64bwhj3455jgkidpdzqwrlsqm3rckq2pi75flnkv42",
+ "rev": "3041aa3472d16fd94c6a9e15b741dbfecd9b714e",
+ "date": "2021-03-04T14:37:27-08:00",
+ "path": "/nix/store/7d200fzyx2rkbbgf47g5ismvd4id0fqy-tree-sitter-regex",
+ "sha256": "0jah3apalvp7966sjzdrka2n7f83h64sd56nbq2lzmrxgv98rxmg",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index d5a1767a23ce..c8142974fd43 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
- "rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0",
- "date": "2020-11-02T20:49:49-08:00",
- "path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby",
- "sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb",
+ "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",
+ "date": "2021-03-03T16:54:30-08:00",
+ "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",
+ "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 12d7f58aecb2..c88d6e2460cd 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
- "rev": "ab7f7962073fec96e0b64fbd1697263fe2c79281",
- "date": "2021-02-16T21:17:08-08:00",
- "path": "/nix/store/zy2sccixlk8lwkqamikz03j42s13ndjp-tree-sitter-rust",
- "sha256": "06zmbwgsvyaz0wgja8r3ir06z67gix7i62zj0k3bbng6smdnhp9w",
+ "rev": "20f064bd758f94b8f47ce5a21e4383c7349ca182",
+ "date": "2021-03-04T14:06:14-08:00",
+ "path": "/nix/store/za0yxqjjp9vxgwrp014qwv2v2qffl0di-tree-sitter-rust",
+ "sha256": "118vkhv7n3sw8y9pi0987cgdcd74sjqwviijw01mhnk3bkyczi3l",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
index 8d9959cf4cf4..3ec792c7190d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-scala",
- "rev": "211bb726bb5857f872247b600c7c1808e641a8d4",
- "date": "2020-07-13T13:31:00-07:00",
- "path": "/nix/store/6q66gzabxazr2581dgp4pp5wwyk2p6mw-tree-sitter-scala",
- "sha256": "096ps5za8gxmq61gdd3xdk8cif07vb4v8asls2kdwm6jazm82777",
+ "rev": "262797b1dfe0303818c2418c0a88f6be65f37245",
+ "date": "2021-03-04T15:02:28-08:00",
+ "path": "/nix/store/vc5fr00vqx5nf17r9grdwb11wci3xrkm-tree-sitter-scala",
+ "sha256": "1zf3b1x1s94dgzjbc6l8ind5fd1mmny3893d4bqc63h4qp0n0bp3",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
new file mode 100644
index 000000000000..6cd63a61e891
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
@@ -0,0 +1,10 @@
+{
+ "url": "https://github.com/Himujjal/tree-sitter-svelte",
+ "rev": "a96899bd1ab6a18e3837f232fd688af69e3a8071",
+ "date": "2021-03-09T15:14:24+05:30",
+ "path": "/nix/store/nlpf6gilkk19aw7pk1kbys2alhnqagqj-tree-sitter-svelte",
+ "sha256": "04virfsiqqhh3gc3cmcjd4s1zn9wdxi47m55x938napaqiaw29nx",
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 679d7e4ed6ae..3ff85a0766b1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
- "rev": "543cbe44f16189f7f1b739cf268d70f373d94b87",
- "date": "2021-02-25T11:54:57-08:00",
- "path": "/nix/store/liyi8hkl55dcbs1wc4w2jw4zf717bb29-tree-sitter-typescript",
- "sha256": "0ljhkhi8fp38l1n6wam7l8bdqxr95d0c1mf7i6p1gb6xrjzssik0",
+ "rev": "7e119621b1d2ab1873ba14d8702f62458df70409",
+ "date": "2021-03-08T13:23:30-08:00",
+ "path": "/nix/store/k7vam1w5c2r0hhxy0bgpmj65bw5wnh96-tree-sitter-typescript",
+ "sha256": "1fv6q1bc0j6b89skz7x2ibi6bxx0ijrb676y23aahycvz2p8x4z0",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
new file mode 100644
index 000000000000..8231a0354d7a
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
@@ -0,0 +1,10 @@
+{
+ "url": "https://github.com/ikatyang/tree-sitter-yaml",
+ "rev": "ab0ce67ce98f8d9cc0224ebab49c64d01fedc1a1",
+ "date": "2021-01-01T21:13:43+08:00",
+ "path": "/nix/store/3vnhqr4l2hb0ank13avj8af4qbni5szw-tree-sitter-yaml",
+ "sha256": "14f0abv68cjkwdcjjwa1nzjpwp6w59cj5v4m5h5h3jxi96z65459",
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 631944cb67a0..c55858b5ff15 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -2,6 +2,9 @@
, curl, jq, xe
, src }:
+# Grammar list:
+# https://github.com/tree-sitter/tree-sitter/blob/master/docs/index.md
+
let
# Grammars we want to fetch from the tree-sitter github orga
knownTreeSitterOrgGrammarRepos = [
@@ -11,7 +14,6 @@ let
"tree-sitter-json"
"tree-sitter-cpp"
"tree-sitter-ruby"
- "tree-sitter-razor"
"tree-sitter-go"
"tree-sitter-c-sharp"
"tree-sitter-python"
@@ -56,6 +58,8 @@ let
"highlight-schema"
# website
"tree-sitter.github.io"
+ # not maintained
+ "tree-sitter-razor"
];
ignoredTreeSitterOrgReposJson = jsonFile "ignored-tree-sitter-org-repos" ignoredTreeSitterOrgRepos;
@@ -68,9 +72,25 @@ let
repo = "tree-sitter-nix";
};
"tree-sitter-lua" = {
- orga = "nvim-treesitter";
+ orga = "Azganoth";
repo = "tree-sitter-lua";
};
+ "tree-sitter-fennel" = {
+ orga = "travonted";
+ repo = "tree-sitter-fennel";
+ };
+ "tree-sitter-markdown" = {
+ orga = "ikatyang";
+ repo = "tree-sitter-markdown";
+ };
+ "tree-sitter-svelte" = {
+ orga = "Himujjal";
+ repo = "tree-sitter-svelte";
+ };
+ "tree-sitter-yaml" = {
+ orga = "ikatyang";
+ repo = "tree-sitter-yaml";
+ };
};
allGrammars =
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index 66cdb09cf15a..4cd49b884ce6 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg";
};
- buildInputs = lib.optional stdenv.isDarwin unzip;
+ nativeBuildInputs = lib.optional stdenv.isDarwin unzip;
buildPhase = lib.optionalString (!stdenv.isDarwin) ''
patchelf \
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index 3b622c20559e..62063ff09947 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
- version = "1.16.0";
+ version = "1.16.1";
inherit (poetryLib) isCompatible readTOML moduleName;
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 2106708a28f6..aa58864fed78 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -250,6 +250,15 @@ self: super:
}
);
+ fiona = super.fiona.overridePythonAttrs (
+ old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal_2 ];
+ nativeBuildInputs = [
+ pkgs.gdal_2 # for gdal-config
+ ];
+ }
+ );
+
gdal = super.gdal.overridePythonAttrs (
old: {
preBuild = (old.preBuild or "") + ''
@@ -266,6 +275,23 @@ self: super:
}
);
+ grpcio = super.grpcio.overridePythonAttrs (old: {
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython pkgs.pkg-config ];
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.c-ares pkgs.openssl pkgs.zlib ];
+
+ outputs = [ "out" "dev" ];
+
+ GRPC_BUILD_WITH_BORING_SSL_ASM = "";
+ GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1;
+ GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1;
+ GRPC_PYTHON_BUILD_SYSTEM_CARES = 1;
+ DISABLE_LIBC_COMPATIBILITY = 1;
+ });
+
+ grpcio-tools = super.grpcio-tools.overridePythonAttrs (old: {
+ outputs = [ "out" "dev" ];
+ });
+
h3 = super.h3.overridePythonAttrs (
old: {
preBuild = (old.preBuild or "") + ''
@@ -277,14 +303,34 @@ self: super:
h5py = super.h5py.overridePythonAttrs (
old:
- if old.format != "wheel" then rec {
- nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
- buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
- configure_flags = "--hdf5=${pkgs.hdf5}";
- postConfigure = ''
- ${self.python.executable} setup.py configure ${configure_flags}
- '';
- } else old
+ if old.format != "wheel" then
+ (
+ let
+ mpi = pkgs.hdf5.mpi;
+ mpiSupport = pkgs.hdf5.mpiSupport;
+ in
+ {
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
+ buildInputs =
+ (old.buildInputs or [ ])
+ ++ [ pkgs.hdf5 self.pkg-config self.cython ]
+ ++ lib.optional mpiSupport mpi
+ ;
+ propagatedBuildInputs =
+ old.propagatedBuildInputs
+ ++ lib.optionals mpiSupport [ self.mpi4py self.openssh ]
+ ;
+ preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
+ HDF5_DIR = "${pkgs.hdf5}";
+ HDF5_MPI = if mpiSupport then "ON" else "OFF";
+ # avoid strict pinning of numpy
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "numpy ==" "numpy >="
+ '';
+ pythonImportsCheck = [ "h5py" ];
+ }
+ ) else old
);
horovod = super.horovod.overridePythonAttrs (
@@ -407,7 +453,7 @@ self: super:
);
jsonslicer = super.jsonslicer.overridePythonAttrs (old: {
- nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ];
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ];
});
@@ -618,6 +664,12 @@ self: super:
}
);
+ munch = super.munch.overridePythonAttrs (
+ old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ];
+ }
+ );
+
mysqlclient = super.mysqlclient.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ];
@@ -939,6 +991,13 @@ self: super:
}
);
+ pygeos = super.pygeos.overridePythonAttrs (
+ old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ];
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.geos ];
+ }
+ );
+
pygobject = super.pygobject.overridePythonAttrs (
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
@@ -1226,6 +1285,15 @@ self: super:
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
});
+ rtree = super.rtree.overridePythonAttrs (old: {
+ propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) ++ [ pkgs.libspatialindex ];
+ postPatch = ''
+ substituteInPlace rtree/finder.py --replace \
+ "find_library('spatialindex_c')" \
+ "'${pkgs.libspatialindex}/lib/libspatialindex_c${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'"
+ '';
+ });
+
scipy = super.scipy.overridePythonAttrs (
old:
if old.format != "wheel" then {
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index d1c86d9248a3..ae1ac3e39f3e 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-UXKObJKk9UUgWtm8U+nXWvIJUr4NLm2f//pGTHJISYA=";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = ''
shopt -s extglob
mkdir -p $out
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index 828b8e5b1cd6..a3599d9ee9db 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nexus";
- version = "3.29.2-02";
+ version = "3.30.0-01";
src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
- sha256 = "sha256-vHy7V32xlYaPJdc8oi3j98weOdc4R5S64Dwo9YI8o6c=";
+ sha256 = "sha256-axhuw1FNut+JqS1WCxyQmP08qh0tXn9UAvz2Gj1kGPs=";
};
preferLocalBuild = true;
diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix
index 4e3e12a8eeb1..bcda3c02dd63 100644
--- a/pkgs/development/tools/rshell/default.nix
+++ b/pkgs/development/tools/rshell/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "rshell";
- version = "0.0.28";
+ version = "0.0.30";
src = fetchPypi {
inherit pname version;
- sha256 = "1crnlv0khplpibl9mj3flrgp877pnr1xz6hnnsi6hk3kfbc6p3nj";
+ sha256 = "d2002d40d735204037d6142a6c2d51beecc763c124faaf759cabf7acd945be95";
};
propagatedBuildInputs = [ pyserial pyudev ];
diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock
index 2c5deffc2d1c..913009f6b2b7 100644
--- a/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/pkgs/development/tools/rubocop/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
rainbow (3.0.0)
regexp_parser (2.1.1)
rexml (3.2.4)
- rubocop (1.11.0)
+ rubocop (1.12.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
index 46d920bc657b..fc919235e2bc 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zrzsgx35mcr81c51gyx63s7yngcfgk33dbkx5j0npkaks4fcm7r";
+ sha256 = "1i3y0h6awywx4rdmjdan908jmnyk589pndbjypxkfbkqvjx514fw";
type = "gem";
};
- version = "1.11.0";
+ version = "1.12.0";
};
rubocop-ast = {
dependencies = ["parser"];
diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix
index 931fb8fd984e..664f3688eaf3 100644
--- a/pkgs/development/tools/rust/cargo-criterion/default.nix
+++ b/pkgs/development/tools/rust/cargo-criterion/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-criterion";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "bheisler";
repo = pname;
rev = version;
- sha256 = "0czagclrn4yhlvlh06wsyiybz69r7mmk3182fywzn9vd0xlclxpi";
+ sha256 = "sha256-NiuK+PexfF2wmA8drqqkv/RQlVwYLT3q2QWvV0ghJwg=";
};
- cargoSha256 = "sha256-XZuZ81hB/GQDopJyfSkxQiehSwJz7VWoJR6/m3WLil8=";
+ cargoSha256 = "sha256-A6Kkm/4MSAEJfehA6zSQJU+JwVIhKPcfMZCO9S6Zyx4=";
meta = with lib; {
description = "Cargo extension for running Criterion.rs benchmarks";
diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix
index b328f32dc265..1225d78d71eb 100644
--- a/pkgs/development/tools/rust/cargo-deny/default.nix
+++ b/pkgs/development/tools/rust/cargo-deny/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
- version = "0.8.8";
+ version = "0.8.9";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = pname;
rev = version;
- sha256 = "sha256-8wmH9DeI+tm3c/6n7bwMe5SslGNCUg4d5BE0+wQ7KTU=";
+ sha256 = "sha256-K8lNo2XmHzgbaVCMNvwDwr86hrXBPws9v3HD8ku+D6w=";
};
- cargoSha256 = "sha256-f0Wisel7NQOyfbhhs0GwyTBiUfydPMSVAysrov/RxxI=";
+ cargoSha256 = "sha256-spTy9vzldzqu66904wRVwAeH1rNOQ3WeC6miJkRiAGg=";
doCheck = false;
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 7cb366c5502c..934976f73866 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
- sha256 = "sha256-FWXSEGjTr2DewZ8NidzPdc6jhfNAUdV9qKyR7ZciWio=";
+ sha256 = "sha256-6FjFG4RYvmsV/W7OMxj1ZWvruwUeP9Nvsdiv8toZmTk=";
};
- cargoSha256 = "sha256-uvTxOZPMTCd+3WQJeVfSC5mlJ487hJKs/0Dd2C8cpcM=";
+ cargoSha256 = "sha256-1+A+n5VQS8zJULiR8IWLGo+RnFuVjg6ist8G3eCsXJM=";
meta = with lib; {
description =
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
index 569c8f88da2f..ced5d7cd583c 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-fuzz";
- version = "0.8.0";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "rust-fuzz";
repo = "cargo-fuzz";
rev = version;
- sha256 = "1d4bq9140bri8cd9zcxh5hhc51vr0s6jadjhwkp688w7k10rq7w8";
+ sha256 = "sha256-kBbwE4ToUud5BDDlGoey2qpp2imzO6t3FcIbV3NTFa8=";
};
- cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr";
+ cargoSha256 = "sha256-zqRlB2Kck4icMKzhaeeakEnn6O7zhoKPa5ZWbGooWIg=";
doCheck = false;
diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index 5e1cdc5e21bb..d89bad18e32a 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
- version = "0.1.18";
+ version = "0.1.19";
src = fetchFromGitHub {
owner = "est31";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-o02MQC0/sc/+qbIXJVN84a2SKxSJaUSXXtBs0h+lQes=";
+ sha256 = "sha256-0XE1w/FZmy0iMm5LI885S7F6GxgeHwh57t8N4hreSKw=";
};
- cargoSha256 = "sha256-tlAA2Aw5OQ9/FCyTckS559s6Zp4Nx8m34yLT9q5F3nI=";
+ cargoSha256 = "sha256-7pfGMCChOMSLlZ/bvaHfpksru5bCHfBQUN+sGyI1M8E=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix
index 1c1a4c32c623..177b12aea0cb 100644
--- a/pkgs/development/tools/rust/cargo-valgrind/default.nix
+++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix
@@ -8,18 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-valgrind";
- version = "1.3.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "jfrimmel";
repo = "cargo-valgrind";
- # repo lacks the 1.3.0 tag
- # https://github.com/jfrimmel/cargo-valgrind/issues/33
- rev = "d47dd810e3971d676cde5757df8b2e05ed563e41";
- sha256 = "163ch5bpwny1di758rpfib1ddqclxm48j0lmmv741ji3l4nqid32";
+ rev = version;
+ sha256 = "0knsq6n3wrsd3ir2r1wpxm6ks7rgkw33bk008s8fq33m3bq2yvm7";
};
- cargoSha256 = "008s1y3pkn8613kp1gqf494fs93ix0nrwhrkqi5q9bim2mixgccb";
+ cargoSha256 = "09mhdi12wgg7s4wdnn0vfxhj7hwj5hjrq32mjgjr2hwm6yzhkzr2";
passthru = {
updateScript = nix-update-script {
@@ -33,6 +31,9 @@ rustPlatform.buildRustPackage rec {
wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]}
'';
+ # Disable check phase as there are failures (2 tests fail)
+ doCheck = false;
+
meta = with lib; {
description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner'';
homepage = "https://github.com/jfrimmel/cargo-valgrind";
diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
index 8bd4bf6fff8f..6ddd7b00d1d7 100644
--- a/pkgs/development/tools/rust/cargo-watch/default.nix
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-watch";
- version = "7.5.0";
+ version = "7.5.1";
src = fetchFromGitHub {
owner = "passcod";
repo = pname;
rev = "v${version}";
- sha256 = "181v922nx8152ymszig1kw6y0mnix6si1zfnv6vqgr5r53pwkbc1";
+ sha256 = "sha256-Eqg+Ke5n2H6/bPd1W8HL4XLMfdV8ard4SDrCeK0MFOg=";
};
- cargoSha256 = "1abhzi1396x8lnxvakj34nysl3ybvsaf21j678wzaqwj16sd3w3d";
+ cargoSha256 = "sha256-s7ip+/1hZJ8dQGix6yI5fQ4gAw2nHU8+dxxYcVvyTAs=";
buildInputs = lib.optional stdenv.isDarwin CoreServices;
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 508090553375..da552600cdc2 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -1,23 +1,32 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, python3Packages, Security }:
rustPlatform.buildRustPackage rec {
pname = "rust-cbindgen";
- version = "0.15.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
- sha256 = "19bwllrajks286wl4zc5axgh4m9qqxdnc5024c30hyk0xnjffd0c";
+ sha256 = "1w9gf6fl1ncm2zlh0p29lislfsd35zd1mhns2mrxl2n734zavaqf";
};
- cargoSha256 = "1lzzckzcgj496chbfd6lhwxcangv0krx8m5k2jwffnb9mfgac7hx";
+ cargoSha256 = "12jw1m842gzy0ma4drgmwk1jac663vysllfpl9cglr039j1sfsx2";
buildInputs = lib.optional stdenv.isDarwin Security;
+ checkInputs = [
+ python3Packages.cython
+ ];
+
checkFlags = [
+ # Disable tests that require rust unstable features
# https://github.com/eqrion/cbindgen/issues/338
"--skip test_expand"
+ "--skip test_bitfield"
+ "--skip lib_default_uses_debug_build"
+ "--skip lib_explicit_debug_build"
+ "--skip lib_explicit_release_build"
];
meta = with lib; {
diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix
index 9432c4fd85d3..b5a3486da71f 100644
--- a/pkgs/development/tools/rust/crate2nix/default.nix
+++ b/pkgs/development/tools/rust/crate2nix/default.nix
@@ -12,13 +12,14 @@ rustPlatform.buildRustPackage rec {
pname = "crate2nix";
version = "0.9.0";
- src = fetchFromGitHub
- {
- owner = "kolloch";
- repo = pname;
- rev = version;
- sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
- } + "/crate2nix";
+ src = fetchFromGitHub {
+ owner = "kolloch";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
+ };
+
+ sourceRoot = "source/crate2nix";
cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik=";
diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index 02b111567ccd..28aeca4a0af1 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ callPackage
+, lib
, stdenv
, fetchFromGitHub
, rustPlatform
@@ -28,6 +29,8 @@ rustPlatform.buildRustPackage rec {
# Requires network access, fails in sandbox.
doCheck = false;
+ passthru.tests.pyo3 = callPackage ./pyo3-test {};
+
meta = with lib; {
description = "Build and publish Rust crates Python packages";
longDescription = ''
diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch b/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch
new file mode 100644
index 000000000000..3aca2e4803a9
--- /dev/null
+++ b/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch
@@ -0,0 +1,688 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 000000000..5e698d4ff
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,682 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "ahash"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
++
++[[package]]
++name = "assert_approx_eq"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd"
++
++[[package]]
++name = "autocfg"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "byteorder"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "const_fn"
++version = "0.4.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
++
++[[package]]
++name = "crossbeam-channel"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
++dependencies = [
++ "cfg-if",
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "crossbeam-deque"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
++dependencies = [
++ "cfg-if",
++ "crossbeam-epoch",
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "crossbeam-epoch"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
++dependencies = [
++ "cfg-if",
++ "const_fn",
++ "crossbeam-utils",
++ "lazy_static",
++ "memoffset",
++ "scopeguard",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
++dependencies = [
++ "autocfg",
++ "cfg-if",
++ "lazy_static",
++]
++
++[[package]]
++name = "ctor"
++version = "0.1.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
++dependencies = [
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "either"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
++
++[[package]]
++name = "getrandom"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "wasi",
++]
++
++[[package]]
++name = "ghost"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "glob"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
++
++[[package]]
++name = "hashbrown"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
++dependencies = [
++ "ahash",
++]
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "indoc"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
++dependencies = [
++ "indoc-impl",
++ "proc-macro-hack",
++]
++
++[[package]]
++name = "indoc-impl"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
++dependencies = [
++ "proc-macro-hack",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "unindent",
++]
++
++[[package]]
++name = "instant"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
++dependencies = [
++ "cfg-if",
++]
++
++[[package]]
++name = "inventory"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f"
++dependencies = [
++ "ctor",
++ "ghost",
++ "inventory-impl",
++]
++
++[[package]]
++name = "inventory-impl"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "libc"
++version = "0.2.86"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
++
++[[package]]
++name = "lock_api"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
++dependencies = [
++ "scopeguard",
++]
++
++[[package]]
++name = "memoffset"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num-bigint"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
++dependencies = [
++ "autocfg",
++ "num-integer",
++ "num-traits",
++]
++
++[[package]]
++name = "num-complex"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
++dependencies = [
++ "num-traits",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
++dependencies = [
++ "autocfg",
++ "num-traits",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num_cpus"
++version = "1.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
++dependencies = [
++ "hermit-abi",
++ "libc",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
++dependencies = [
++ "instant",
++ "lock_api",
++ "parking_lot_core",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
++dependencies = [
++ "cfg-if",
++ "instant",
++ "libc",
++ "redox_syscall",
++ "smallvec",
++ "winapi",
++]
++
++[[package]]
++name = "paste"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
++dependencies = [
++ "paste-impl",
++ "proc-macro-hack",
++]
++
++[[package]]
++name = "paste-impl"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
++dependencies = [
++ "proc-macro-hack",
++]
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
++
++[[package]]
++name = "proc-macro-hack"
++version = "0.5.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
++dependencies = [
++ "unicode-xid",
++]
++
++[[package]]
++name = "proptest"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f"
++dependencies = [
++ "bitflags",
++ "byteorder",
++ "lazy_static",
++ "num-traits",
++ "quick-error",
++ "rand",
++ "rand_chacha",
++ "rand_xorshift",
++ "regex-syntax",
++]
++
++[[package]]
++name = "pyo3"
++version = "0.13.2"
++dependencies = [
++ "assert_approx_eq",
++ "cfg-if",
++ "ctor",
++ "hashbrown",
++ "indoc",
++ "inventory",
++ "libc",
++ "num-bigint",
++ "num-complex",
++ "parking_lot",
++ "paste",
++ "proptest",
++ "pyo3",
++ "pyo3-macros",
++ "rustversion",
++ "serde",
++ "serde_json",
++ "trybuild",
++ "unindent",
++]
++
++[[package]]
++name = "pyo3-macros"
++version = "0.13.2"
++dependencies = [
++ "pyo3-macros-backend",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "pyo3-macros-backend"
++version = "0.13.2"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "quick-error"
++version = "1.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
++
++[[package]]
++name = "quote"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++dependencies = [
++ "getrandom",
++ "libc",
++ "rand_chacha",
++ "rand_core",
++ "rand_hc",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
++dependencies = [
++ "ppv-lite86",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++dependencies = [
++ "getrandom",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++dependencies = [
++ "rand_core",
++]
++
++[[package]]
++name = "rand_xorshift"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
++dependencies = [
++ "rand_core",
++]
++
++[[package]]
++name = "rayon"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
++dependencies = [
++ "autocfg",
++ "crossbeam-deque",
++ "either",
++ "rayon-core",
++]
++
++[[package]]
++name = "rayon-core"
++version = "1.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
++dependencies = [
++ "crossbeam-channel",
++ "crossbeam-deque",
++ "crossbeam-utils",
++ "lazy_static",
++ "num_cpus",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
++
++[[package]]
++name = "rustapi-module"
++version = "0.1.0"
++dependencies = [
++ "pyo3",
++]
++
++[[package]]
++name = "rustversion"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
++
++[[package]]
++name = "ryu"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
++
++[[package]]
++name = "scopeguard"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
++
++[[package]]
++name = "serde"
++version = "1.0.123"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.123"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.62"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
++dependencies = [
++ "itoa",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "smallvec"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
++
++[[package]]
++name = "syn"
++version = "1.0.60"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
++]
++
++[[package]]
++name = "termcolor"
++version = "1.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
++dependencies = [
++ "winapi-util",
++]
++
++[[package]]
++name = "toml"
++version = "0.5.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "trybuild"
++version = "1.0.41"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b"
++dependencies = [
++ "glob",
++ "lazy_static",
++ "serde",
++ "serde_json",
++ "termcolor",
++ "toml",
++]
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
++
++[[package]]
++name = "unindent"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "winapi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++
++[[package]]
++name = "word-count"
++version = "0.1.0"
++dependencies = [
++ "pyo3",
++ "rayon",
++]
diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/default.nix b/pkgs/development/tools/rust/maturin/pyo3-test/default.nix
new file mode 100644
index 000000000000..b118309b36d7
--- /dev/null
+++ b/pkgs/development/tools/rust/maturin/pyo3-test/default.nix
@@ -0,0 +1,12 @@
+{ callPackage
+, rustPlatform
+}:
+
+callPackage ./generic.nix {
+ buildAndTestSubdir = "examples/word-count";
+
+ nativeBuildInputs = with rustPlatform; [
+ cargoSetupHook
+ maturinBuildHook
+ ];
+}
diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix
new file mode 100644
index 000000000000..f82c988fc512
--- /dev/null
+++ b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix
@@ -0,0 +1,45 @@
+# Derivation prototype, used by maturin and setuptools-rust
+# passthrough tests.
+
+{ lib
+, fetchFromGitHub
+, python3Packages
+, rustPlatform
+
+, nativeBuildInputs
+
+, buildAndTestSubdir ? null
+, format ? "pyproject"
+, sourceRoot ? "source"
+}:
+
+python3Packages.buildPythonPackage rec {
+ pname = "word-count";
+ version = "0.13.2";
+
+ src = fetchFromGitHub {
+ owner = "PyO3";
+ repo = "pyo3";
+ rev = "v${version}";
+ hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src sourceRoot patches;
+ name = "${pname}-${version}";
+ hash = "sha256-//TmozgWy9zrSpMKX92XdHj4fw/T1Elfgn4YhhR7ot0=";
+ };
+
+ patches = [ ./Cargo.lock.patch ];
+
+ inherit buildAndTestSubdir format nativeBuildInputs sourceRoot;
+
+ pythonImportsCheck = [ "word_count" ];
+
+ meta = with lib; {
+ description = "PyO3 word count example";
+ homepage = "https://github.com/PyO3/pyo3";
+ license = licenses.asl20;
+ maintainers = [ maintainers.danieldk ];
+ };
+}
diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index e9a5150befa3..d8b31810c54c 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -1,11 +1,13 @@
-{ pkgs, callPackage }:
+{ pkgs, callPackage, CoreServices }:
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
- rev = "2021-03-01";
+ rev = "2021-03-22";
version = "unstable-${rev}";
- sha256 = "10x4fk1nxk548cfxrbfvz0kpa2r955d0bcnxxn8k8zmrdqxs3sph";
- cargoSha256 = "02s6qnq61vifx59hnbaalqmfvp8anfik62y6rzy3rwm1l9r85qrz";
+ sha256 = "sha256-Q8yr5x4+R9UCk5kw/nJgBtGVBeZTDwyuwpyNJUKSPzA=";
+ cargoSha256 = "sha256-cJ5KPNrX1H4IfHENDGyU2rgxl5TTqvoeXk7558oqwuA=";
+
+ inherit CoreServices;
};
rust-analyzer = callPackage ./wrapper.nix {} {
diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix
index 0ce33f0f2336..ddb834af6c38 100644
--- a/pkgs/development/tools/rust/rust-analyzer/generic.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, cmake
+{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
+, libiconv
, useMimalloc ? false
, doCheck ? true
@@ -22,8 +23,10 @@ rustPlatform.buildRustPackage {
nativeBuildInputs = lib.optional useMimalloc cmake;
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin
- [ darwin.apple_sdk.frameworks.CoreServices ];
+ buildInputs = lib.optionals stdenv.isDarwin [
+ CoreServices
+ libiconv
+ ];
RUST_ANALYZER_REV = rev;
@@ -43,6 +46,8 @@ rustPlatform.buildRustPackage {
passthru.updateScript = ./update.sh;
+ patches = [ ./rust_1_49.patch ];
+
meta = with lib; {
description = "An experimental modular compiler frontend for the Rust language";
homepage = "https://github.com/rust-analyzer/rust-analyzer";
diff --git a/pkgs/development/tools/rust/rust-analyzer/rust_1_49.patch b/pkgs/development/tools/rust/rust-analyzer/rust_1_49.patch
new file mode 100644
index 000000000000..fcde6d6337e2
--- /dev/null
+++ b/pkgs/development/tools/rust/rust-analyzer/rust_1_49.patch
@@ -0,0 +1,13 @@
+diff --git a/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs b/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
+index 4e75a7b14..91f51a1a7 100644
+--- a/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
++++ b/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
+@@ -93,7 +93,7 @@ fn validate_method_call_expr(
+ let krate = module.krate();
+
+ let iter_trait = FamousDefs(sema, Some(krate)).core_iter_Iterator()?;
+- it_type.impls_trait(sema.db, iter_trait, &[]).then(|| (expr, receiver))
++ if it_type.impls_trait(sema.db, iter_trait, &[]) { Some((expr, receiver)) } else { None }
+ }
+
+ #[cfg(test)]
diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix
index c6f34a9e20d2..5c4f40bbd094 100644
--- a/pkgs/development/tools/rust/sqlx-cli/default.nix
+++ b/pkgs/development/tools/rust/sqlx-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }:
rustPlatform.buildRustPackage rec {
pname = "sqlx-cli";
@@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p sqlx-cli" ];
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openssl ];
+ buildInputs = lib.optionals stdenv.isLinux [ openssl ]
+ ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ];
meta = with lib; {
description =
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index 12082de98422..64517d865cdf 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
}
);
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
patchPhase = lib.optionalString stdenv.isLinux ''
patchelf \
diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix
index 0f4f1740fac5..eea5dc9b10fc 100644
--- a/pkgs/development/tools/sd-local/default.nix
+++ b/pkgs/development/tools/sd-local/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "sd-local";
- version = "1.0.24";
+ version = "1.0.26";
src = fetchFromGitHub {
owner = "screwdriver-cd";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dqjZQyh7SWkD2dBcB32pR3PgWPMGQYPo7AkOQURt0hs=";
+ sha256 = "sha256-JQeqCvnGWE0VesLQ6HbH7gikwAP3im19nBnwr1ruQqk=";
};
vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20=";
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 76728c5f2d80..473f24b1b55b 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -10,13 +10,11 @@ let
sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4";
rev = version;
};
- buildInputs = [
- unzip zip
- ];
in
stdenv.mkDerivation {
inherit (s) name version;
- inherit buildInputs;
+ buildInputs = [ zip ];
+ nativeBuildInputs = [ unzip ];
#src = fetchurl {
# inherit (s) url sha256;
#};
diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix
index f74698bb11ea..85d64890180e 100644
--- a/pkgs/development/tools/stagit/default.nix
+++ b/pkgs/development/tools/stagit/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "stagit";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchgit {
url = "git://git.codemadness.org/stagit";
rev = version;
- sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm";
+ sha256 = "1wlx5k0v464fr1ifjv04v7ccwb559s54xpsbxdda4whyx1v0fbq4";
};
makeFlags = [ "PREFIX=$(out)" ];
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "https://git.codemadness.org/stagit/file/README.html";
license = licenses.mit;
platforms = platforms.all;
- maintainers = with maintainers; [ jb55 ];
+ maintainers = with maintainers; [ jb55 sikmir ];
};
}
diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix
index 02183282ce16..fcb1edf153ac 100644
--- a/pkgs/development/tools/thrust/default.nix
+++ b/pkgs/development/tools/thrust/default.nix
@@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ thrustEnv unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ thrustEnv ];
phases = [ "installPhase" "fixupPhase" ];
diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix
new file mode 100644
index 000000000000..d31c030edac7
--- /dev/null
+++ b/pkgs/development/tools/trunk/default.nix
@@ -0,0 +1,25 @@
+{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "trunk";
+ version = "0.10.0";
+
+ src = fetchFromGitHub {
+ owner = "thedodd";
+ repo = "trunk";
+ rev = "v${version}";
+ sha256 = "W6d05MKquG1QFkvofqWk94+6j5q8yuAjNgZFG3Z3kNo=";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ openssl ];
+
+ cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s=";
+
+ meta = with lib; {
+ homepage = "https://github.com/thedodd/trunk";
+ description = "Build, bundle & ship your Rust WASM application to the web";
+ maintainers = with maintainers; [ freezeboy ];
+ license = with licenses; [ asl20 ];
+ };
+}
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index fdf66004deb3..adec30a14c5a 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -86,11 +86,6 @@ stdenv.mkDerivation rec {
"-DBUILD_LAYER_SUPPORT_FILES=ON"
];
- # Help vulkan-loader find the validation layers
- setupHook = writeText "setup-hook" ''
- export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS
- '';
-
# Include absolute paths to layer libraries in their associated
# layer definition json files.
patchPhase = ''
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix
index 1f101882b5b9..2f1d6618d3fe 100644
--- a/pkgs/development/tools/vultr/default.nix
+++ b/pkgs/development/tools/vultr/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "vultr";
- version = "2.0.2";
+ version = "2.0.3";
goPackagePath = "github.com/JamesClonk/vultr";
src = fetchFromGitHub {
owner = "JamesClonk";
repo = "vultr";
rev = "v${version}";
- sha256 = "0br8nxi9syraarp4hzav9a3p4zxhyi45cq5dsclzxi3fga2l6mqg";
+ sha256 = "sha256-kyB6gUbc32NsSDqDy1zVT4HXn0pWxHdBOEBOSaI0Xro=";
};
meta = {
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index 27b11870a899..aaffa4f82130 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -1,20 +1,19 @@
-{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "wabt";
- version = "1.0.20";
+ version = "1.0.23";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "wabt";
rev = version;
- sha256 = "1wwyljppxz03slvgx809g87mdrglpimz4xaici71a9mqwjpgj0l8";
+ sha256 = "1drjngcqkaahzk92jysrzv86fhj02c074xffd7kn3k6q8fxc0976";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ];
- buildInputs = [ python3 ];
meta = with lib; {
description = "The WebAssembly Binary Toolkit";
diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix
index e861f20a9194..d360500e1fb2 100644
--- a/pkgs/development/tools/wiggle/default.nix
+++ b/pkgs/development/tools/wiggle/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation {
- name = "wiggle-1.2";
+ name = "wiggle-1.3";
src = fetchurl {
- url = "https://github.com/neilbrown/wiggle/archive/v1.2.tar.gz";
- sha256 = "1gckj0zv2xznzg7i70p9dfmkhdpdg3953msi4gg5h6mpmmiiiwrw";
+ url = "https://github.com/neilbrown/wiggle/archive/v1.3.tar.gz";
+ sha256 = "sha256-/5LPATPB9NzjNWPiY8sw59229KvfhtQnsewUkL7CWvo=";
};
buildInputs = [ ncurses groff ];
diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index f43a0a369d62..5fc7b6a18071 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -1,22 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "wrangler";
- version = "1.13.0";
+ version = "1.15.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
- sha256 = "0xhldarzb71x4k7ydk4yd6g0qv6y2l0mn2lc43hvl9jm29pnz95q";
+ sha256 = "sha256-/5iIdEUbesX+IRQQzeJazt3i/xAtghblct718EmYci4=";
};
- cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
+ cargoSha256 = "sha256-6XWFhfY8QIl4S6zDyyM2YvFUoGMnKZQ3d/GT4yQWb7A=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
- ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
+ ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security libiconv ];
OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/development/tools/xcode-install/Gemfile b/pkgs/development/tools/xcode-install/Gemfile
new file mode 100644
index 000000000000..b9d313ce14fc
--- /dev/null
+++ b/pkgs/development/tools/xcode-install/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'xcode-install'
diff --git a/pkgs/development/tools/xcode-install/Gemfile.lock b/pkgs/development/tools/xcode-install/Gemfile.lock
new file mode 100644
index 000000000000..589543fe47d6
--- /dev/null
+++ b/pkgs/development/tools/xcode-install/Gemfile.lock
@@ -0,0 +1,204 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ CFPropertyList (3.0.3)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ artifactory (3.0.15)
+ atomos (0.1.3)
+ aws-eventstream (1.1.0)
+ aws-partitions (1.419.0)
+ aws-sdk-core (3.111.2)
+ aws-eventstream (~> 1, >= 1.0.2)
+ aws-partitions (~> 1, >= 1.239.0)
+ aws-sigv4 (~> 1.1)
+ jmespath (~> 1.0)
+ aws-sdk-kms (1.41.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-s3 (1.87.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.1)
+ aws-sigv4 (1.2.2)
+ aws-eventstream (~> 1, >= 1.0.2)
+ babosa (1.0.4)
+ claide (1.0.3)
+ colored (1.2)
+ colored2 (3.1.2)
+ commander-fastlane (4.4.6)
+ highline (~> 1.7.2)
+ declarative (0.0.20)
+ declarative-option (0.1.0)
+ digest-crc (0.6.3)
+ rake (>= 12.0.0, < 14.0.0)
+ domain_name (0.5.20190701)
+ unf (>= 0.0.5, < 1.0.0)
+ dotenv (2.7.6)
+ emoji_regex (3.2.1)
+ excon (0.78.1)
+ faraday (1.3.0)
+ faraday-net_http (~> 1.0)
+ multipart-post (>= 1.2, < 3)
+ ruby2_keywords
+ faraday-cookie_jar (0.0.7)
+ faraday (>= 0.8.0)
+ http-cookie (~> 1.0.0)
+ faraday-net_http (1.0.1)
+ faraday_middleware (1.0.0)
+ faraday (~> 1.0)
+ fastimage (2.2.1)
+ fastlane (2.172.0)
+ CFPropertyList (>= 2.3, < 4.0.0)
+ addressable (>= 2.3, < 3.0.0)
+ artifactory (~> 3.0)
+ aws-sdk-s3 (~> 1.0)
+ babosa (>= 1.0.3, < 2.0.0)
+ bundler (>= 1.12.0, < 3.0.0)
+ colored
+ commander-fastlane (>= 4.4.6, < 5.0.0)
+ dotenv (>= 2.1.1, < 3.0.0)
+ emoji_regex (>= 0.1, < 4.0)
+ excon (>= 0.71.0, < 1.0.0)
+ faraday (~> 1.0)
+ faraday-cookie_jar (~> 0.0.6)
+ faraday_middleware (~> 1.0)
+ fastimage (>= 2.1.0, < 3.0.0)
+ gh_inspector (>= 1.1.2, < 2.0.0)
+ google-api-client (>= 0.37.0, < 0.39.0)
+ google-cloud-storage (>= 1.15.0, < 2.0.0)
+ highline (>= 1.7.2, < 2.0.0)
+ json (< 3.0.0)
+ jwt (>= 2.1.0, < 3)
+ mini_magick (>= 4.9.4, < 5.0.0)
+ multipart-post (~> 2.0.0)
+ plist (>= 3.1.0, < 4.0.0)
+ rubyzip (>= 2.0.0, < 3.0.0)
+ security (= 0.1.3)
+ simctl (~> 1.6.3)
+ slack-notifier (>= 2.0.0, < 3.0.0)
+ terminal-notifier (>= 2.0.0, < 3.0.0)
+ terminal-table (>= 1.4.5, < 2.0.0)
+ tty-screen (>= 0.6.3, < 1.0.0)
+ tty-spinner (>= 0.8.0, < 1.0.0)
+ word_wrap (~> 1.0.0)
+ xcodeproj (>= 1.13.0, < 2.0.0)
+ xcpretty (~> 0.3.0)
+ xcpretty-travis-formatter (>= 0.0.3)
+ gh_inspector (1.1.3)
+ google-api-client (0.38.0)
+ addressable (~> 2.5, >= 2.5.1)
+ googleauth (~> 0.9)
+ httpclient (>= 2.8.1, < 3.0)
+ mini_mime (~> 1.0)
+ representable (~> 3.0)
+ retriable (>= 2.0, < 4.0)
+ signet (~> 0.12)
+ google-apis-core (0.2.1)
+ addressable (~> 2.5, >= 2.5.1)
+ googleauth (~> 0.14)
+ httpclient (>= 2.8.1, < 3.0)
+ mini_mime (~> 1.0)
+ representable (~> 3.0)
+ retriable (>= 2.0, < 4.0)
+ rexml
+ signet (~> 0.14)
+ webrick
+ google-apis-iamcredentials_v1 (0.1.0)
+ google-apis-core (~> 0.1)
+ google-apis-storage_v1 (0.1.0)
+ google-apis-core (~> 0.1)
+ google-cloud-core (1.5.0)
+ google-cloud-env (~> 1.0)
+ google-cloud-errors (~> 1.0)
+ google-cloud-env (1.4.0)
+ faraday (>= 0.17.3, < 2.0)
+ google-cloud-errors (1.0.1)
+ google-cloud-storage (1.30.0)
+ addressable (~> 2.5)
+ digest-crc (~> 0.4)
+ google-apis-iamcredentials_v1 (~> 0.1)
+ google-apis-storage_v1 (~> 0.1)
+ google-cloud-core (~> 1.2)
+ googleauth (~> 0.9)
+ mini_mime (~> 1.0)
+ googleauth (0.15.0)
+ faraday (>= 0.17.3, < 2.0)
+ jwt (>= 1.4, < 3.0)
+ memoist (~> 0.16)
+ multi_json (~> 1.11)
+ os (>= 0.9, < 2.0)
+ signet (~> 0.14)
+ highline (1.7.10)
+ http-cookie (1.0.3)
+ domain_name (~> 0.5)
+ httpclient (2.8.3)
+ jmespath (1.4.0)
+ json (2.5.1)
+ jwt (2.2.2)
+ memoist (0.16.2)
+ mini_magick (4.11.0)
+ mini_mime (1.0.2)
+ multi_json (1.15.0)
+ multipart-post (2.0.0)
+ nanaimo (0.3.0)
+ naturally (2.2.1)
+ os (1.1.1)
+ plist (3.6.0)
+ public_suffix (4.0.6)
+ rake (13.0.3)
+ representable (3.0.4)
+ declarative (< 0.1.0)
+ declarative-option (< 0.2.0)
+ uber (< 0.2.0)
+ retriable (3.1.2)
+ rexml (3.2.4)
+ rouge (2.0.7)
+ ruby2_keywords (0.0.4)
+ rubyzip (2.3.0)
+ security (0.1.3)
+ signet (0.14.0)
+ addressable (~> 2.3)
+ faraday (>= 0.17.3, < 2.0)
+ jwt (>= 1.5, < 3.0)
+ multi_json (~> 1.10)
+ simctl (1.6.8)
+ CFPropertyList
+ naturally
+ slack-notifier (2.3.2)
+ terminal-notifier (2.0.0)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
+ tty-cursor (0.7.1)
+ tty-screen (0.8.1)
+ tty-spinner (0.9.3)
+ tty-cursor (~> 0.7)
+ uber (0.1.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.7)
+ unicode-display_width (1.7.0)
+ webrick (1.7.0)
+ word_wrap (1.0.0)
+ xcode-install (2.6.8)
+ claide (>= 0.9.1, < 1.1.0)
+ fastlane (>= 2.1.0, < 3.0.0)
+ xcodeproj (1.19.0)
+ CFPropertyList (>= 2.3.3, < 4.0)
+ atomos (~> 0.1.3)
+ claide (>= 1.0.2, < 2.0)
+ colored2 (~> 3.1)
+ nanaimo (~> 0.3.0)
+ xcpretty (0.3.0)
+ rouge (~> 2.0.7)
+ xcpretty-travis-formatter (1.0.1)
+ xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ xcode-install
+
+BUNDLED WITH
+ 1.17.2
diff --git a/pkgs/development/tools/xcode-install/default.nix b/pkgs/development/tools/xcode-install/default.nix
new file mode 100644
index 000000000000..677217b5c810
--- /dev/null
+++ b/pkgs/development/tools/xcode-install/default.nix
@@ -0,0 +1,17 @@
+{ lib
+, bundlerApp
+}:
+
+bundlerApp {
+ pname = "xcode-install";
+ gemdir = ./.;
+ exes = [ "xcversion" ];
+
+ meta = with lib; {
+ description = "Install and update your Xcodes automatically";
+ homepage = "https://github.com/xcpretty/xcode-install";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ q3k ];
+ license = with licenses; [ mit ];
+ };
+}
diff --git a/pkgs/development/tools/xcode-install/gemset.nix b/pkgs/development/tools/xcode-install/gemset.nix
new file mode 100644
index 000000000000..c6355de34a2f
--- /dev/null
+++ b/pkgs/development/tools/xcode-install/gemset.nix
@@ -0,0 +1,833 @@
+{
+ addressable = {
+ dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ type = "gem";
+ };
+ version = "2.7.0";
+ };
+ artifactory = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls";
+ type = "gem";
+ };
+ version = "3.0.15";
+ };
+ atomos = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx";
+ type = "gem";
+ };
+ version = "0.1.3";
+ };
+ aws-eventstream = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-partitions = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vz0djj8w3ns0sz5gvkla5jml8xzx6skbcfj255m81fyww1x6ws8";
+ type = "gem";
+ };
+ version = "1.419.0";
+ };
+ aws-sdk-core = {
+ dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4";
+ type = "gem";
+ };
+ version = "3.111.2";
+ };
+ aws-sdk-kms = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm";
+ type = "gem";
+ };
+ version = "1.41.0";
+ };
+ aws-sdk-s3 = {
+ dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7";
+ type = "gem";
+ };
+ version = "1.87.0";
+ };
+ aws-sigv4 = {
+ dependencies = ["aws-eventstream"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5";
+ type = "gem";
+ };
+ version = "1.2.2";
+ };
+ babosa = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16dwqn33kmxkqkv51cwiikdkbrdjfsymlnc0rgbjwilmym8a9phq";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
+ CFPropertyList = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
+ type = "gem";
+ };
+ version = "3.0.3";
+ };
+ claide = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ colored = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+ type = "gem";
+ };
+ version = "1.2";
+ };
+ colored2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
+ type = "gem";
+ };
+ version = "3.1.2";
+ };
+ commander-fastlane = {
+ dependencies = ["highline"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65";
+ type = "gem";
+ };
+ version = "4.4.6";
+ };
+ declarative = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0";
+ type = "gem";
+ };
+ version = "0.0.20";
+ };
+ declarative-option = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ digest-crc = {
+ dependencies = ["rake"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a";
+ type = "gem";
+ };
+ version = "0.6.3";
+ };
+ domain_name = {
+ dependencies = ["unf"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
+ type = "gem";
+ };
+ version = "0.5.20190701";
+ };
+ dotenv = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
+ type = "gem";
+ };
+ version = "2.7.6";
+ };
+ emoji_regex = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s";
+ type = "gem";
+ };
+ version = "3.2.1";
+ };
+ excon = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r";
+ type = "gem";
+ };
+ version = "0.78.1";
+ };
+ faraday = {
+ dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ faraday-cookie_jar = {
+ dependencies = ["faraday" "http-cookie"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk";
+ type = "gem";
+ };
+ version = "0.0.7";
+ };
+ faraday-net_http = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ faraday_middleware = {
+ dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ fastimage = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
+ fastlane = {
+ dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0crr42qdgy9l409pffpfs7nq8ha18lp1nxngny2dc9hiq1xx4r5d";
+ type = "gem";
+ };
+ version = "2.172.0";
+ };
+ gh_inspector = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
+ type = "gem";
+ };
+ version = "1.1.3";
+ };
+ google-api-client = {
+ dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1";
+ type = "gem";
+ };
+ version = "0.38.0";
+ };
+ google-apis-core = {
+ dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet" "webrick"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "184pqw7z7s8mc1r5gj8f76xvp8z650xq50vdfj5gjwsbmzd99z2f";
+ type = "gem";
+ };
+ version = "0.2.1";
+ };
+ google-apis-iamcredentials_v1 = {
+ dependencies = ["google-apis-core"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xjlzq2fxpwvp9b6ajs8cpyjv8vs2d2npg9v23yj181hj2fnn82c";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ google-apis-storage_v1 = {
+ dependencies = ["google-apis-core"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0axycds5q20fqm6vqxa5r922021p0f8jhwvlgw8r1vq600ljribi";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ google-cloud-core = {
+ dependencies = ["google-cloud-env" "google-cloud-errors"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ google-cloud-env = {
+ dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ google-cloud-errors = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ google-cloud-storage = {
+ dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17axi5gmy0g04801v11lww5mvqzffqdc3w6k1j7f95v90hy4yn6m";
+ type = "gem";
+ };
+ version = "1.30.0";
+ };
+ googleauth = {
+ dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pwm0mzb5zffhk6yw4v3n1yj8qr6jla6f78vsv4g0bxh9z0ikc2z";
+ type = "gem";
+ };
+ version = "0.15.0";
+ };
+ highline = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
+ type = "gem";
+ };
+ version = "1.7.10";
+ };
+ http-cookie = {
+ dependencies = ["domain_name"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ httpclient = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+ type = "gem";
+ };
+ version = "2.8.3";
+ };
+ jmespath = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
+ type = "gem";
+ };
+ version = "2.5.1";
+ };
+ jwt = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n";
+ type = "gem";
+ };
+ version = "2.2.2";
+ };
+ memoist = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
+ type = "gem";
+ };
+ version = "0.16.2";
+ };
+ mini_magick = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs";
+ type = "gem";
+ };
+ version = "4.11.0";
+ };
+ mini_mime = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
+ type = "gem";
+ };
+ version = "1.0.2";
+ };
+ multi_json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+ type = "gem";
+ };
+ version = "1.15.0";
+ };
+ multipart-post = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ nanaimo = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
+ naturally = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
+ os = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
+ type = "gem";
+ };
+ version = "1.1.1";
+ };
+ plist = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ public_suffix = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+ type = "gem";
+ };
+ version = "4.0.6";
+ };
+ rake = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
+ type = "gem";
+ };
+ version = "13.0.3";
+ };
+ representable = {
+ dependencies = ["declarative" "declarative-option" "uber"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
+ type = "gem";
+ };
+ version = "3.0.4";
+ };
+ retriable = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
+ type = "gem";
+ };
+ version = "3.1.2";
+ };
+ rexml = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
+ type = "gem";
+ };
+ version = "3.2.4";
+ };
+ rouge = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
+ type = "gem";
+ };
+ version = "2.0.7";
+ };
+ ruby2_keywords = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
+ type = "gem";
+ };
+ version = "0.0.4";
+ };
+ rubyzip = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
+ security = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa";
+ type = "gem";
+ };
+ version = "0.1.3";
+ };
+ signet = {
+ dependencies = ["addressable" "faraday" "jwt" "multi_json"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp";
+ type = "gem";
+ };
+ version = "0.14.0";
+ };
+ simctl = {
+ dependencies = ["CFPropertyList" "naturally"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x";
+ type = "gem";
+ };
+ version = "1.6.8";
+ };
+ slack-notifier = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv";
+ type = "gem";
+ };
+ version = "2.3.2";
+ };
+ terminal-notifier = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ terminal-table = {
+ dependencies = ["unicode-display_width"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ tty-cursor = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
+ type = "gem";
+ };
+ version = "0.7.1";
+ };
+ tty-screen = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235";
+ type = "gem";
+ };
+ version = "0.8.1";
+ };
+ tty-spinner = {
+ dependencies = ["tty-cursor"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf";
+ type = "gem";
+ };
+ version = "0.9.3";
+ };
+ uber = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ unf = {
+ dependencies = ["unf_ext"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
+ unf_ext = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
+ type = "gem";
+ };
+ version = "0.0.7.7";
+ };
+ unicode-display_width = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
+ webrick = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
+ word_wrap = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1iyc5bc7dbgsd8j3yk1i99ral39f23l6wapi0083fbl19hid8mpm";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ xcode-install = {
+ dependencies = ["claide" "fastlane"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yhslanqw8r0mhls2hira05c8xjzzr7mnz1ab9p5qwg4z45ddjj8";
+ type = "gem";
+ };
+ version = "2.6.8";
+ };
+ xcodeproj = {
+ dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
+ type = "gem";
+ };
+ version = "1.19.0";
+ };
+ xcpretty = {
+ dependencies = ["rouge"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
+ xcpretty-travis-formatter = {
+ dependencies = ["xcpretty"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14rg4f70klrs910n7rsgfa4dn8s2qyny55194ax2qyyb2wpk7k5a";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+}
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index b2d0581c0541..9ea5dcc55fad 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "yq-go";
- version = "4.6.1";
+ version = "4.6.2";
src = fetchFromGitHub {
owner = "mikefarah";
rev = "v${version}";
repo = "yq";
- sha256 = "sha256-pP00y9auYeuz0NSA+QrnGybW5T7TfGFFw/FMPu/JXjM=";
+ sha256 = "sha256-Hv1o1MzkpapmeIsZJ4peyG5kSHt0EXjTA+gE0iq1XF8=";
};
- vendorSha256 = "sha256-66ccHSKpl6yB/NVhZ1X0dv4wnGCJAMvZhpKu2vF+QT4=";
+ vendorSha256 = "sha256-vpvIl1lfaziuoHs+oDEIztufH1somphiBAn6qTaQaZw=";
doCheck = false;
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 013b365bce8d..8e45b0b337aa 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -1,52 +1,49 @@
-{ lib, stdenv
-, fetchurl
+{ stdenv
+, lib
+, callPackage
, fetchFromGitHub
, rust
, rustPlatform
, installShellFiles
+, libobjc
, Security
, CoreServices
+, Metal
+, Foundation
+, librusty_v8 ? callPackage ./librusty_v8.nix { }
}:
-let
- deps = import ./deps.nix { };
- arch = rust.toRustTarget stdenv.hostPlatform;
- rustyV8Lib = with deps.rustyV8Lib; fetchurl {
- url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch}.a";
- sha256 = sha256s."${stdenv.hostPlatform.system}";
- meta = { inherit version; };
- };
-in
+
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.6.3";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "1wmkx458fpsfw57ysawxc0ghxag8v051hiyswm7nnb7gckrm6j8z";
- fetchSubmodules = true;
+ sha256 = "sha256-fZuhI+ZvYsFz2gDpHkRRqmmHRyEiEO+vWfqKYdeNtaU=";
};
- cargoSha256 = "08vzsp53019gmxkn8lpa6l84w3fvbrnr11lzrfgf99nmii6l2hq5";
+ cargoSha256 = "sha256-us0Kzst7iq+H/WBAlSBQJSpnirsl4zImse2bFREoW4I=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
- buildInputs = lib.optionals stdenv.isDarwin [ Security CoreServices ];
+ buildInputs = lib.optionals stdenv.isDarwin [ libobjc Security CoreServices Metal Foundation ];
# The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
# To avoid this we pre-download the file and place it in the locations it will require it in advance
- preBuild = ''
- _rusty_v8_setup() {
- for v in "$@"; do
- dir="target/$v/gn_out/obj"
- mkdir -p "$dir" && cp "${rustyV8Lib}" "$dir/librusty_v8.a"
- done
- }
+ preBuild =
+ let arch = rust.toRustTarget stdenv.hostPlatform; in
+ ''
+ _librusty_v8_setup() {
+ for v in "$@"; do
+ install -D ${librusty_v8} "target/$v/gn_out/obj/librusty_v8.a"
+ done
+ }
- # Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed
- _rusty_v8_setup "debug" "release" "${arch}/release"
- '';
+ # Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed
+ _librusty_v8_setup "debug" "release" "${arch}/release"
+ '';
# Tests have some inconsistencies between runs with output integration tests
# Skipping until resolved
@@ -54,7 +51,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
# remove test plugin and test server
- rm -rf $out/lib $out/bin/test_server
+ rm -r $out/lib $out/bin/test_server $out/bin/denort
installShellCompletion --cmd deno \
--bash <($out/bin/deno completions bash) \
@@ -62,11 +59,19 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/deno completions zsh)
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+ $out/bin/deno --help
+ $out/bin/deno --version | grep "deno ${version}"
+ runHook postInstallCheck
+ '';
+
passthru.updateScript = ./update/update.ts;
meta = with lib; {
homepage = "https://deno.land/";
- changelog = "${src.meta.homepage}/releases/tag/v${version}";
+ changelog = "https://github.com/denoland/deno/releases/tag/v${version}";
description = "A secure runtime for JavaScript and TypeScript";
longDescription = ''
Deno aims to be a productive and secure scripting environment for the modern programmer.
@@ -79,6 +84,6 @@ rustPlatform.buildRustPackage rec {
'';
license = licenses.mit;
maintainers = with maintainers; [ jk ];
- platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}
diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix
deleted file mode 100644
index 4426c600df75..000000000000
--- a/pkgs/development/web/deno/deps.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# auto-generated file -- DO NOT EDIT!
-{}:
-rec {
- rustyV8Lib = {
- version = "0.15.0";
- sha256s = {
- x86_64-linux = "1j789pvqh44vsffzl5wg3pp3awrlixjrhbnjx2klsml7jv0lp0mq";
- aarch64-linux = "13srja4vc275ygm806hcsr8mxjnd9qkzaqs58lxnp0702qs5xls6";
- x86_64-darwin = "0aij9yb5i1r3pz0pyl51qdbgfspfdngwbk1qgkp4gxzl3cbnysx1";
- };
- };
-}
diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix
new file mode 100644
index 000000000000..41c06fbf7ce0
--- /dev/null
+++ b/pkgs/development/web/deno/librusty_v8.nix
@@ -0,0 +1,21 @@
+# auto-generated file -- DO NOT EDIT!
+{ rust, stdenv, fetchurl }:
+
+let
+ arch = rust.toRustTarget stdenv.hostPlatform;
+ fetch_librusty_v8 = args: fetchurl {
+ name = "librusty_v8-${args.version}";
+ url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a";
+ sha256 = args.shas.${stdenv.hostPlatform.system};
+ meta = { inherit (args) version; };
+ };
+in
+fetch_librusty_v8 {
+ version = "0.21.0";
+ shas = {
+ x86_64-linux = "sha256-oxGCM6jlqafjAfTtFwARxBv/8tiUaD9A2TlLyj/3LlQ=";
+ aarch64-linux = "sha256-yeDcrxEp3qeE6/NWEc1v7VoHjlgppIOkcHTNVksXNsM=";
+ x86_64-darwin = "sha256-QqdBa59xPxM8eDRzvPxvv9HFVgp2rt+5jiwIOgsi8JE=";
+ aarch64-darwin = "sha256-aq2Kjn8QSDMhNg8pEbXkJCHUKmDTNnitq42SDDVyRd4=";
+ };
+}
diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/development/web/deno/update/common.ts
index d8956b21d163..1b4e3509ea7c 100644
--- a/pkgs/development/web/deno/update/common.ts
+++ b/pkgs/development/web/deno/update/common.ts
@@ -3,12 +3,15 @@ interface GHRelease {
}
const decode = (buffer: Uint8Array) => new TextDecoder("utf-8").decode(buffer);
-const run = async (command: string, args: string[]) => {
- const cmd = Deno.run(
- { cmd: [command, ...args], stdout: "piped", stderr: "piped" },
- );
+const decodeTrim = (b: Uint8Array) => decode(b).trimEnd();
+export const run = async (command: string, args: string[]) => {
+ const cmd = Deno.run({
+ cmd: [command, ...args],
+ stdout: "piped",
+ stderr: "piped",
+ });
if (!(await cmd.status()).success) {
- const error = await cmd.stderrOutput().then((b) => decode(b).trimEnd());
+ const error = await cmd.stderrOutput().then(decodeTrim);
// Known error we can ignore
if (error.includes("'allow-unsafe-native-code-during-evaluation'")) {
// Extract the target sha256 out of the error
@@ -23,26 +26,16 @@ const run = async (command: string, args: string[]) => {
}
throw new Error(error);
}
- return cmd.output().then((b) => decode(b).trimEnd());
+ return cmd.output().then(decodeTrim);
};
// Exports
export const versionRegExp = /\d+\.\d+\.\d+/;
-export const sha256RegExp = /[a-z0-9]{52}/;
-
-export async function commit(
- name: string,
- oldVer: string,
- newVer: string,
- files: string[],
-) {
- await run("git", ["add", ...files]);
- await run("git", ["commit", "-m", `${name}: ${oldVer} -> ${newVer}`]);
-}
+export const sha256RegExp = /[a-z0-9]{52}|sha256-.{44}/;
export const getExistingVersion = async (filePath: string) =>
- read(filePath).then((s) =>
- s.match(genValueRegExp("version", versionRegExp))?.shift() || ""
+ read(filePath).then(
+ (s) => s.match(genValueRegExp("version", versionRegExp))?.shift() || "",
);
export const getLatestVersion = (owner: string, repo: string) =>
@@ -58,8 +51,5 @@ export const genValueRegExp = (key: string, regex: RegExp) =>
export const logger = (name: string) =>
(...a: any) => console.log(`[${name}]`, ...a);
-export const nixPrefetch = (args: string[]) => run("nix-prefetch", args);
-export const nixPrefetchURL = (args: string[]) => run("nix-prefetch-url", args);
-
export const read = Deno.readTextFile;
export const write = Deno.writeTextFile;
diff --git a/pkgs/development/web/deno/update/deps.ts b/pkgs/development/web/deno/update/deps.ts
deleted file mode 100644
index beedeade3a86..000000000000
--- a/pkgs/development/web/deno/update/deps.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {
- getExistingVersion,
- genValueRegExp,
- logger,
- nixPrefetchURL,
- versionRegExp,
- write,
-} from "./common.ts";
-
-const log = logger("deps");
-
-export interface Architecture {
- nix: string;
- rust: string;
-}
-interface PrefetchResult {
- arch: Architecture;
- sha256: string;
-}
-
-const getRustyV8Version = async (
- owner: string,
- repo: string,
- version: string,
-) =>
- fetch(
- `https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`,
- )
- .then((res) => res.text())
- .then((txt) =>
- txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift()
- );
-
-const archShaTasks = (version: string, arches: Architecture[]) =>
- arches.map(async (arch: Architecture): Promise => {
- log("Fetching:", arch.nix);
- const sha256 = await nixPrefetchURL(
- [`https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a`],
- );
- log("Done: ", arch.nix);
- return { arch, sha256 };
- });
-
-const templateDeps = (version: string, deps: PrefetchResult[]) =>
- `# auto-generated file -- DO NOT EDIT!
-{}:
-rec {
- rustyV8Lib = {
- version = "${version}";
- sha256s = {
-${deps.map((d) => ` ${d.arch.nix} = "${d.sha256}";`).join("\n")}
- };
- };
-}
-`;
-
-export async function updateDeps(
- filePath: string,
- owner: string,
- repo: string,
- denoVersion: string,
- arches: Architecture[],
-) {
- log("Starting deps update");
- // 0.0.0
- const version = await getRustyV8Version(owner, repo, denoVersion);
- if (typeof version !== "string") {
- throw "no rusty_v8 version";
- }
- log("rusty_v8 version:", version);
- const existingVersion = await getExistingVersion(filePath);
- if (version === existingVersion) {
- log("Version already matches latest, skipping...");
- return;
- }
- const archShaResults = await Promise.all(archShaTasks(version, arches));
- await write(filePath, templateDeps(version, archShaResults));
- log("Finished deps update");
-}
diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts
new file mode 100644
index 000000000000..dee3277c5812
--- /dev/null
+++ b/pkgs/development/web/deno/update/librusty_v8.ts
@@ -0,0 +1,92 @@
+import {
+ genValueRegExp,
+ getExistingVersion,
+ logger,
+ run,
+ versionRegExp,
+ write,
+} from "./common.ts";
+
+const log = logger("librusty_v8");
+
+export interface Architecture {
+ nix: string;
+ rust: string;
+}
+interface PrefetchResult {
+ arch: Architecture;
+ sha256: string;
+}
+
+const getLibrustyV8Version = async (
+ owner: string,
+ repo: string,
+ version: string,
+) =>
+ fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`)
+ .then((res) => res.text())
+ .then((txt) =>
+ txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift()
+ );
+
+const fetchArchShaTasks = (version: string, arches: Architecture[]) =>
+ arches.map(
+ async (arch: Architecture): Promise => {
+ log("Fetching:", arch.nix);
+ const sha256 = await run("nix-prefetch", [
+ `
+{ fetchurl }:
+fetchurl {
+ url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a";
+}
+`,
+ ]);
+ log("Done: ", arch.nix);
+ return { arch, sha256 };
+ },
+ );
+
+const templateDeps = (version: string, deps: PrefetchResult[]) =>
+ `# auto-generated file -- DO NOT EDIT!
+{ rust, stdenv, fetchurl }:
+
+let
+ arch = rust.toRustTarget stdenv.hostPlatform;
+ fetch_librusty_v8 = args: fetchurl {
+ name = "librusty_v8-\${args.version}";
+ url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${arch}.a";
+ sha256 = args.shas.\${stdenv.hostPlatform.system};
+ meta = { inherit (args) version; };
+ };
+in
+fetch_librusty_v8 {
+ version = "${version}";
+ shas = {
+${deps.map(({ arch, sha256 }) => ` ${arch.nix} = "${sha256}";`).join("\n")}
+ };
+}
+`;
+
+export async function updateLibrustyV8(
+ filePath: string,
+ owner: string,
+ repo: string,
+ denoVersion: string,
+ arches: Architecture[],
+) {
+ log("Starting librusty_v8 update");
+ // 0.0.0
+ const version = await getLibrustyV8Version(owner, repo, denoVersion);
+ if (typeof version !== "string") {
+ throw "no librusty_v8 version";
+ }
+ log("librusty_v8 version:", version);
+ const existingVersion = await getExistingVersion(filePath);
+ if (version === existingVersion) {
+ log("Version already matches latest, skipping...");
+ return;
+ }
+ const archShaResults = await Promise.all(fetchArchShaTasks(version, arches));
+ await write(filePath, templateDeps(version, archShaResults));
+ log("Finished deps update");
+}
diff --git a/pkgs/development/web/deno/update/src.ts b/pkgs/development/web/deno/update/src.ts
index fae15acd0d2c..3bfae27c21c3 100644
--- a/pkgs/development/web/deno/update/src.ts
+++ b/pkgs/development/web/deno/update/src.ts
@@ -1,8 +1,8 @@
import {
genValueRegExp,
logger,
- nixPrefetch,
read,
+ run,
sha256RegExp,
versionRegExp,
write,
@@ -16,10 +16,11 @@ interface Replacer {
const log = logger("src");
const prefetchSha256 = (nixpkgs: string, version: string) =>
- nixPrefetch(["-f", nixpkgs, "deno.src", "--rev", version]);
+ run("nix-prefetch", ["-f", nixpkgs, "deno.src", "--rev", version]);
const prefetchCargoSha256 = (nixpkgs: string) =>
- nixPrefetch(
- [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { outputHash = sha256; })`],
+ run(
+ "nix-prefetch",
+ [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { inherit sha256; })`],
);
const replace = (str: string, replacers: Replacer[]) =>
@@ -53,7 +54,6 @@ export async function updateSrc(
[
genVerReplacer("version", trimVersion),
genShaReplacer("sha256", sha256),
- genShaReplacer("cargoSha256", ""), // Empty ready for prefetchCargoSha256
],
);
log("Fetching cargoSha256 for:", sha256);
diff --git a/pkgs/development/web/deno/update/update.ts b/pkgs/development/web/deno/update/update.ts
index 18d451480137..27e1d86ee861 100755
--- a/pkgs/development/web/deno/update/update.ts
+++ b/pkgs/development/web/deno/update/update.ts
@@ -2,13 +2,8 @@
/*
#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch
*/
-import {
- commit,
- getExistingVersion,
- getLatestVersion,
- logger,
-} from "./common.ts";
-import { Architecture, updateDeps } from "./deps.ts";
+import { getExistingVersion, getLatestVersion, logger } from "./common.ts";
+import { Architecture, updateLibrustyV8 } from "./librusty_v8.ts";
import { updateSrc } from "./src.ts";
const log = logger("update");
@@ -19,11 +14,12 @@ const owner = "denoland";
const repo = "deno";
const denoDir = `${nixpkgs}/pkgs/development/web/${repo}`;
const src = `${denoDir}/default.nix`;
-const deps = `${denoDir}/deps.nix`;
+const librusty_v8 = `${denoDir}/librusty_v8.nix`;
const architectures: Architecture[] = [
{ nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" },
{ nix: "aarch64-linux", rust: "aarch64-unknown-linux-gnu" },
{ nix: "x86_64-darwin", rust: "x86_64-apple-darwin" },
+ { nix: "aarch64-darwin", rust: "aarch64-apple-darwin" },
];
log("Updating deno");
@@ -41,10 +37,7 @@ if (trimVersion === existingVersion) {
const tasks = [
updateSrc(src, nixpkgs, version),
- updateDeps(deps, owner, repo, version, architectures),
+ updateLibrustyV8(librusty_v8, owner, repo, version, architectures),
];
await Promise.all(tasks);
log("Updating deno complete");
-log("Commiting");
-await commit(repo, existingVersion, trimVersion, [src, deps]);
-log("Done");
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 944520b47e2f..2a888b8056d0 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
dontBuild = true;
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index b3a9ac0ce715..345b7c15426d 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 = "2020.5.2";
+ version = "2021.1.1";
src = fetchurl {
url =
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
- sha256 = "03j76a0dj3ak5h6malwxqf7cdc2ycwgyr6993bhiq75yhxhblhc4";
+ sha256 = "sha256-GPOeLSbKiaJR5ppzyJMllzM+2gSddZN7+P5ttkocuDg=";
};
nativeBuildInputs =
diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix
index f564d5bcccb2..194bb25cb02a 100644
--- a/pkgs/development/web/nodejs/v15.nix
+++ b/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "15.11.0";
- sha256 = "1lfjm0jgzbr0a874c04pddbjnvjcdyx5vyaakdhp0fa222i92w0s";
+ version = "15.12.0";
+ sha256 = "0c8smzc7gbr7yg4y4z68976wk5741bspggag9h9laykq4i8bxfsy";
}
diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix
index ca211ccf2d9b..b8a9f94a23f0 100644
--- a/pkgs/development/web/twitter-bootstrap/default.nix
+++ b/pkgs/development/web/twitter-bootstrap/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-CiEUUa0mCrUSp+XCoWNs8plJxhWHZZD+K+UBJSDu1CM=";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
dontBuild = true;
installPhase = ''
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 1bebf922c48d..5cb28b3f3bd6 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
- sha256 = "04x7729hk6zw1xj3n4s4lvaviijsnbjf5rhzvjxlr5fygvg4l6z1";
+ sha256 = "0b53jzl64i49rk3n3c3x0hibwbl7vih2xym8jq5s56klg61qdxa1";
};
installPhase = ''
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 1ba975aa8854..bb3b7c0138af 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -1,29 +1,45 @@
-{ stdenv, lib, perl, fetchurl, python2
-, pkg-config, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
+{ stdenv, lib, perl, fetchurl, python2, fmt, libidn
+, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
-, gloox, nvidia-texture-tools
-, withEditor ? true, wxGTK ? null
+, gloox, nvidia-texture-tools, zeroad-data
+, withEditor ? true, wxGTK
}:
-assert withEditor -> wxGTK != null;
+# You can find more instructions on how to build 0ad here:
+# https://trac.wildfiregames.com/wiki/BuildInstructions
+let
+ # the game requires a special version 78.6.0 of spidermonkey, otherwise
+ # we get compilation errors. We override the src attribute of spidermonkey_78
+ # in order to reuse that declartion, while giving it a different source input.
+ spidermonkey_78_6 = spidermonkey_78.overrideAttrs(old: rec {
+ version = "78.6.0";
+ src = fetchurl {
+ url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
+ sha256 = "0lyg65v380j8i2lrylwz8a5ya80822l8vcnlx3dfqpd3s6zzjsay";
+ };
+ patches = (old.patches or []) ++ [
+ ./spidermonkey-cargo-toml.patch
+ ];
+ });
+in
stdenv.mkDerivation rec {
pname = "0ad";
- version = "0.0.23b";
+ version = "0.0.24b";
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
- sha256 = "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1";
+ sha256 = "1a1py45hkh2cswi09vbf9chikgxdv9xplsmg6sv6xhdznv4j6p1j";
};
nativeBuildInputs = [ python2 perl pkg-config ];
buildInputs = [
- spidermonkey_38 boost icu libxml2 libpng libjpeg
- zlib curl libogg libvorbis enet miniupnpc openal
+ spidermonkey_78_6 boost icu libxml2 libpng libjpeg
+ zlib curl libogg libvorbis enet miniupnpc openal libidn
libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox
- nvidia-texture-tools libsodium
+ nvidia-texture-tools libsodium fmt
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = toString [
@@ -31,35 +47,22 @@ stdenv.mkDerivation rec {
"-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11"
"-I${SDL2}/include/SDL2"
- ];
-
- patches = [
- ./rootdir_env.patch
- # Fixes build with spidermonkey-38.8.0, includes the minor version check:
- # https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b
- (fetchurl {
- url = "https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch";
- sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa";
- })
+ "-I${fmt.dev}/include"
];
configurePhase = ''
# Delete shipped libraries which we don't need.
rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
- # Workaround invalid pkg-config name for mozjs
- mkdir pkg-config
- ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc
- PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH"
-
# Update Makefiles
pushd build/workspaces
./update-workspaces.sh \
--with-system-nvtt \
- --with-system-mozjs38 \
+ --with-system-mozjs \
${lib.optionalString withEditor "--enable-atlas"} \
--bindir="$out"/bin \
--libdir="$out"/lib/0ad \
+ --datadir="$out"/share/0ad/data \
--without-tests \
-j $NIX_BUILD_CORES
popd
@@ -82,6 +85,11 @@ stdenv.mkDerivation rec {
# Copy l10n data.
install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*
+ # Link in game data from package
+ ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config
+ ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods
+ ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools
+
# Copy libraries.
install -Dm644 -t $out/lib/0ad binaries/system/*.so
diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/games/0ad/rootdir_env.patch
deleted file mode 100644
index c001473e5104..000000000000
--- a/pkgs/games/0ad/rootdir_env.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru3 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp
---- 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 2015-02-14 04:45:13.000000000 +0300
-+++ 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp 2016-11-03 16:23:47.241514876 +0300
-@@ -155,32 +155,8 @@
-
- /*static*/ OsPath Paths::Root(const OsPath& argv0)
- {
--#if OS_ANDROID
-- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus
--#else
--
-- // get full path to executable
-- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation
-- if(pathname.empty()) // failed, use argv[0] instead
-- {
-- errno = 0;
-- pathname = wrealpath(argv0);
-- if(pathname.empty())
-- WARN_IF_ERR(StatusFromErrno());
-- }
--
-- // make sure it's valid
-- if(!FileExists(pathname))
-- {
-- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8());
-- WARN_IF_ERR(StatusFromErrno());
-- }
--
-- for(size_t i = 0; i < 2; i++) // remove "system/name.exe"
-- pathname = pathname.Parent();
-- return pathname;
--
--#endif
-+ UNUSED2(argv0);
-+ return getenv("ZEROAD_ROOTDIR");
- }
-
- /*static*/ OsPath Paths::RootData(const OsPath& argv0)
diff --git a/pkgs/games/0ad/spidermonkey-cargo-toml.patch b/pkgs/games/0ad/spidermonkey-cargo-toml.patch
new file mode 100644
index 000000000000..4cb8c3735dbd
--- /dev/null
+++ b/pkgs/games/0ad/spidermonkey-cargo-toml.patch
@@ -0,0 +1,15 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 6f6199ab26..c3f92db9d8 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -68,8 +68,8 @@ panic = "abort"
+ libudev-sys = { path = "dom/webauthn/libudev-sys" }
+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
++nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1" }
++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
+ # failure's backtrace feature might break our builds, see bug 1608157.
+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix
index 092e0e4eac27..7cc2ea6220ee 100644
--- a/pkgs/games/20kly/default.nix
+++ b/pkgs/games/20kly/default.nix
@@ -1,12 +1,12 @@
{ lib
, fetchurl
-, python }:
+, python2 }:
-python.pkgs.buildPythonApplication rec {
+python2.pkgs.buildPythonApplication rec {
pname = "20kly";
version = "1.4";
format = "other";
- disabled = !(python.isPy2 or false);
+ disabled = !(python2.isPy2 or false);
src = fetchurl {
url = "http://jwhitham.org.uk/20kly/lightyears-${version}.tar.bz2";
@@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
"LIGHTYEARS_DIR = \"$out/share\""
'';
- propagatedBuildInputs = with python.pkgs; [ pygame ];
+ propagatedBuildInputs = with python2.pkgs; [ pygame ];
buildPhase = "python -O -m compileall .";
diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix
index ddf3c62307d3..e14629dce8fc 100644
--- a/pkgs/games/angband/default.nix
+++ b/pkgs/games/angband/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "angband";
- version = "4.2.1";
+ version = "4.2.2";
src = fetchFromGitHub {
owner = "angband";
repo = "angband";
rev = version;
- sha256 = "174fphiywwb4yb3kqavwaysx7c97an2n8wjbm4p4d41i1svjsryz";
+ sha256 = "sha256-z1HTt3+lWIr2F9YZFdw47lkYVgYl17qbb/OJ9YyYQa8=";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix
index 4702991c2907..c817b5d36b5b 100644
--- a/pkgs/games/cbonsai/default.nix
+++ b/pkgs/games/cbonsai/default.nix
@@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }:
stdenv.mkDerivation rec {
- version = "1.0.0";
+ version = "1.0.4";
pname = "cbonsai";
src = fetchFromGitLab {
owner = "jallbrit";
repo = pname;
rev = "v${version}";
- sha256 = "1jc34j627pnyjgs8hjxqaa89j24gyf0rq9w61mkhgg0kria62as7";
+ sha256 = "sha256-5yyvisExf4Minyr1ApJQ2SoctfjhdU6kEbgBGgHDtCg=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/games/chromium-bsu/default.nix b/pkgs/games/chromium-bsu/default.nix
new file mode 100644
index 000000000000..1ab2fb8722b0
--- /dev/null
+++ b/pkgs/games/chromium-bsu/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, stdenv
+, fetchurl
+, SDL2
+, SDL2_image
+, SDL2_mixer
+, fontconfig
+, freealut
+, freeglut
+, ftgl
+, gettext
+, glpng
+, libGL
+, libGLU
+, openal
+, pkg-config
+, quesoglc
+}:
+
+stdenv.mkDerivation rec {
+ pname = "chromium-bsu";
+ version = "0.9.16.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/chromium-bsu/Chromium%20B.S.U.%20source%20code/${pname}-${version}.tar.gz";
+ hash = "sha256-ocFBo00ZpZYHroEWahmGTrjITPhrFVRi/tMabVbhYko=";
+ };
+
+ nativeBuildInputs = [
+ gettext
+ pkg-config
+ ];
+ buildInputs = [
+ SDL2
+ SDL2_image
+ SDL2_mixer
+ fontconfig
+ freealut
+ freeglut
+ ftgl
+ glpng
+ libGL
+ libGLU
+ openal
+ quesoglc
+ ];
+
+ # Autodetection is somewhat buggy; this is to avoid SLD1 to be loaded
+ configureFlags = [
+ "--disable-sdlimage"
+ "--disable-sdlmixer"
+ ];
+
+
+ postInstall = ''
+ install -D misc/chromium-bsu.png $out/share/pixmaps/chromium-bsu.png
+ install -D misc/chromium-bsu.desktop $out/share/applications/chromium-bsu.desktop
+ '';
+
+ meta = with lib; {
+ homepage = "http://chromium-bsu.sourceforge.net/";
+ description = "A fast paced, arcade-style, top-scrolling space shooter";
+ license = licenses.artistic1;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
+ };
+}
+# TODO [ AndersonTorres ]: joystick; gothic uralic font
diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix
index 26a0ba748ba4..9f25a1d50afa 100644
--- a/pkgs/games/ckan/default.nix
+++ b/pkgs/games/ckan/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ckan";
- version = "1.29.2";
+ version = "1.30.0";
src = fetchurl {
url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
- sha256 = "10vd61mw2y7vmbnp6nd7b2sq22ixqd7zmd278z210w4njmvqn97h";
+ sha256 = "sha256-wih5NRzeOy4WMXQ3yV9W/m2x7B2C5T0F78TbpsngigQ=";
};
dontUnpack = true;
diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix
index 1328488dde3a..b5b53aa3c413 100644
--- a/pkgs/games/crafty/default.nix
+++ b/pkgs/games/crafty/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
mkdir "craftysrc"
diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix
index 432600e879f4..04c0868510fe 100644
--- a/pkgs/games/crispy-doom/default.nix
+++ b/pkgs/games/crispy-doom/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }:
+{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python2 }:
stdenv.mkDerivation rec {
pname = "crispy-doom";
- version = "5.10.0";
+ version = "5.10.1";
src = fetchFromGitHub {
owner = "fabiangreffrath";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "sha256-hRdd5ZrcVBU7tn1juvrLdbenULzu6OsXefG0oLjjFIg=";
+ sha256 = "sha256-5doytVxemqaXWXiqDSQUEAe71xmY0pOLASj/NJNyM5g=";
};
postPatch = ''
@@ -16,10 +16,12 @@ stdenv.mkDerivation rec {
for script in $(grep -lr '^#!/usr/bin/env python$'); do patchShebangs $script; done
'';
- nativeBuildInputs = [ autoreconfHook pkg-config python ];
+ nativeBuildInputs = [ autoreconfHook pkg-config python2 ];
buildInputs = [ SDL2 SDL2_mixer SDL2_net ];
enableParallelBuilding = true;
+ strictDeps = true;
+
meta = {
homepage = "http://fabiangreffrath.github.io/crispy-doom";
description = "A limit-removing enhanced-resolution Doom source port based on Chocolate Doom";
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index 48826ca91609..bee2c28e5308 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation rec {
outputs = [ "lib" "art" "out" ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $lib/hack/{plugins,lua} $art/data/art
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index e16e62f82fb4..40d7300e9c5a 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-tools" ];
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ SDL2 libogg libvorbis zlib unzip ];
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ SDL2 libogg libvorbis zlib ];
enableParallelBuilding = true;
diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
index b38069355eea..1f8b20102261 100644
--- a/pkgs/games/factorio/versions.json
+++ b/pkgs/games/factorio/versions.json
@@ -10,12 +10,12 @@
"version": "1.1.27"
},
"stable": {
- "name": "factorio_alpha_x64-1.1.26.tar.xz",
+ "name": "factorio_alpha_x64-1.1.27.tar.xz",
"needsAuth": true,
- "sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2",
+ "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.26/alpha/linux64",
- "version": "1.1.26"
+ "url": "https://factorio.com/get-download/1.1.27/alpha/linux64",
+ "version": "1.1.27"
}
},
"demo": {
@@ -28,12 +28,12 @@
"version": "1.1.27"
},
"stable": {
- "name": "factorio_demo_x64-1.1.26.tar.xz",
+ "name": "factorio_demo_x64-1.1.27.tar.xz",
"needsAuth": false,
- "sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x",
+ "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.26/demo/linux64",
- "version": "1.1.26"
+ "url": "https://factorio.com/get-download/1.1.27/demo/linux64",
+ "version": "1.1.27"
}
},
"headless": {
@@ -46,12 +46,12 @@
"version": "1.1.27"
},
"stable": {
- "name": "factorio_headless_x64-1.1.26.tar.xz",
+ "name": "factorio_headless_x64-1.1.27.tar.xz",
"needsAuth": false,
- "sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj",
+ "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.26/headless/linux64",
- "version": "1.1.26"
+ "url": "https://factorio.com/get-download/1.1.27/headless/linux64",
+ "version": "1.1.27"
}
}
}
diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix
index 727945ff2b46..ab208dfa003c 100644
--- a/pkgs/games/gimx/default.nix
+++ b/pkgs/games/gimx/default.nix
@@ -5,8 +5,8 @@ let
gimx-config = fetchFromGitHub {
owner = "matlo";
repo = "GIMX-configurations";
- rev = "f31bba7d3be57519540be290cd69ba6a8dc4e4d4";
- sha256 = "0wpxx2qxyiiblz2qrl5swg00ls1aq7i5vzlk0qlnqdq8ss8jssax";
+ rev = "c20300f24d32651d369e2b27614b62f4b856e4a0";
+ sha256 = "02wcjk8da188x7y0jf3p0arjdh9zbb0lla3fxdb28b1xyybfvx5p";
};
in stdenv.mkDerivation rec {
@@ -51,15 +51,15 @@ in stdenv.mkDerivation rec {
mkdir -p $out/share
cp -r ./loader/firmware $out/share/firmware
cp -r ${gimx-config}/Linux $out/share/config
- patch ${gimx-config}/Linux/Dualshock4.xml ${./ds4.patch} -o $out/share/DS4_noff.xml
+ patch ${gimx-config}/Linux/Dualshock4.xml ${./noff.patch} -o $out/share/ds4.xml
makeWrapper $out/bin/gimx $out/bin/gimx-with-confs \
- --set GIMXCONF $out/share
+ --set GIMXCONF $out/share/config
makeWrapper $out/bin/gimx $out/bin/gimx-test-ds4 \
--set GIMXCONF $out/share \
--add-flags "--nograb" --add-flags "--curses" \
- --add-flags "-p /dev/ttyUSB0" --add-flags "-c DS4_noff.xml"
+ --add-flags "-p /dev/ttyUSB0" --add-flags "-c ds4.xml"
'';
meta = with lib; {
diff --git a/pkgs/games/gimx/ds4.patch b/pkgs/games/gimx/noff.patch
similarity index 100%
rename from pkgs/games/gimx/ds4.patch
rename to pkgs/games/gimx/noff.patch
diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix
index fa901c14f819..c7b37b31c355 100644
--- a/pkgs/games/gogui/default.nix
+++ b/pkgs/games/gogui/default.nix
@@ -5,8 +5,7 @@ let
in stdenv.mkDerivation {
pname = "gogui";
inherit version;
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
src = fetchurl {
url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";
sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j";
diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix
index 283aa70f8d0d..50b6caee6214 100644
--- a/pkgs/games/katago/default.nix
+++ b/pkgs/games/katago/default.nix
@@ -6,7 +6,6 @@
, cudnn
, eigen
, fetchFromGitHub
-, fetchpatch
, gperftools
, lib
, libzip
@@ -34,14 +33,14 @@ let
in env.mkDerivation rec {
pname = "katago";
- version = "1.8.0";
- githash = "8ffda1fe05c69c67342365013b11225d443445e8";
+ version = "1.8.1";
+ githash = "73bc3e38b3490cbe00179c9c37f5385dfd60c6bc";
src = fetchFromGitHub {
owner = "lightvector";
repo = "katago";
rev = "v${version}";
- sha256 = "18r75xjj6vv2gbl92k9aa5bd0cxf09zl1vxlji148y0xbvgv6p8c";
+ sha256 = "sha256-Rj6fgj1ZQgYhz6TrZk5b8dCMsCPk5N3qN3kgqV+UEDc=";
};
fakegit = writeShellScriptBin "git" "echo ${githash}";
@@ -96,10 +95,13 @@ in env.mkDerivation rec {
'';
installPhase = ''
+ runHook preInstall
mkdir -p $out/bin; cp katago $out/bin;
'' + lib.optionalString enableCuda ''
wrapProgram $out/bin/katago \
--prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
+ '' + ''
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix
index c91cc486118f..59bb30d627f7 100644
--- a/pkgs/games/keen4/default.nix
+++ b/pkgs/games/keen4/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1";
};
- buildInputs = [unzip];
+ nativeBuildInputs = [ unzip ];
inherit dosbox;
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 5a1f42ee130b..bedf78102b66 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -5,12 +5,12 @@ let
libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
in mkDerivation rec {
pname = "multimc";
- version = "unstable-2021-01-17";
+ version = "0.6.12";
src = fetchFromGitHub {
owner = "MultiMC";
repo = "MultiMC5";
- rev = "02887536f773643313f15442fc82cebf616da54a";
- sha256 = "1aykvavcv415lq488hx4ig2a79g5a561jg92gw14fb964r43782i";
+ rev = version;
+ sha256 = "h2T023vrqemWhHiA2/gFleuUhIOucjwTgoExliFiYig=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file makeWrapper ];
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix
index 60085d5c85b3..84d8a6200015 100644
--- a/pkgs/games/nexuiz/default.nix
+++ b/pkgs/games/nexuiz/default.nix
@@ -21,9 +21,8 @@ in stdenv.mkDerivation {
sha256 = "0010jrxc68qqinkvdh1qn2b8z3sa5v1kcd8d1m4llp3pr6y7xqm5";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- # required for both
- unzip
# glx
libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib
# sdl
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 912d0da59a06..e210efade03a 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -5,20 +5,20 @@
}:
let
- version = "0.3.2";
+ version = "0.3.3";
openrct2-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "OpenRCT2";
rev = "v${version}";
- sha256 = "1fd32wniiy6qz2046ppqfj2sb3rf2qf086rf9v1bdhyj254d0b1z";
+ sha256 = "01nanpbz5ycdhkyd46fjfvj18sw729l4vk7xg12600f9rjngjk76";
};
objects-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "objects";
- rev = "v1.0.18";
- sha256 = "1v9424kxdppg8vszv0vyq91lzljkrjc3nmk58wbwlpcwj6dip07s";
+ rev = "v1.0.21";
+ sha256 = "0r2vp2y67jc1mpfl4j83sx5khvvaddx7xs26ppkigmr2d1xpxgr7";
};
title-sequences-src = fetchFromGitHub {
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 5bffe2a49054..a700f2bc4fde 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
- version = "2021.226.0";
+ version = "2021.320.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
- sha256 = "sK7FFyOb3JdsqIqvDNexhg3ZPNRpCE4hH0BADYeFHoU=";
+ sha256 = "jFroWbNvJRD+r5w6BPj8QBnHJ9uXJZdx4kzmu5gmVSY=";
};
patches = [ ./bypass-tamper-detection.patch ];
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index a1bbc6d0519e..7b13fa41570b 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -19,6 +19,11 @@
version = "4.3.0.1";
sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv";
})
+ (fetchNuGet {
+ name = "HidSharpCore";
+ version = "1.2.1.1";
+ sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll";
+ })
(fetchNuGet {
name = "Humanizer";
version = "2.8.26";
@@ -299,6 +304,11 @@
version = "5.0.2";
sha256 = "0qy4wamhcpxi9aqwq9kivhsj4rvhbch2wfwv11610psygb5457vk";
})
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.Connections.Abstractions";
+ version = "5.0.3";
+ sha256 = "1p4vzsx4q1lx93m2v1iy2z1i2dg2q5s2f6gznw5afbn5rqqqbsff";
+ })
(fetchNuGet {
name = "Microsoft.AspNetCore.Http.Connections.Client";
version = "5.0.2";
@@ -314,6 +324,11 @@
version = "5.0.2";
sha256 = "1rprpj1aw9z501rpb9415maqcqnk6pirbdl8yv5n9wpqgcnjizk8";
})
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.Http.Features";
+ version = "5.0.3";
+ sha256 = "0c6c5wpwkprf7a7mp1h10bvi2gg94lkpr3lznzpry3zjb5g7mk84";
+ })
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Client";
version = "5.0.2";
@@ -329,6 +344,11 @@
version = "5.0.2";
sha256 = "1sbwp00hq0ng891wdj6yhah8hr9hw34zvqr1xzs86g3gpmssgcj5";
})
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.SignalR.Common";
+ version = "5.0.3";
+ sha256 = "1g19vkc3g76r2fpjy7c1fkbvbihk9pfmx4wfsgpjflvydmvhqf9m";
+ })
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Protocols.Json";
version = "5.0.2";
@@ -336,8 +356,8 @@
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack";
- version = "5.0.2";
- sha256 = "1f0mjw0swiaxk4iqf7n598d51w40lwdbap4nlc0sv0vw3nklnlzp";
+ version = "5.0.3";
+ sha256 = "0wf53knadwxyww85wc6m82paj0wdgsq4kbg7a3v95r6vbh4pav45";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson";
@@ -411,18 +431,13 @@
})
(fetchNuGet {
name = "Microsoft.CSharp";
- version = "4.0.1";
- sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj";
- })
- (fetchNuGet {
- name = "Microsoft.CSharp";
- version = "4.5.0";
- sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l";
+ version = "4.7.0";
+ sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j";
})
(fetchNuGet {
name = "Microsoft.Data.Sqlite.Core";
- version = "2.2.6";
- sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k";
+ version = "5.0.4";
+ sha256 = "0cpcw1mgxm47s6bn181iswrd41c7jyqxv1zwk0xw0hag0jy80xwm";
})
(fetchNuGet {
name = "Microsoft.Diagnostics.NETCore.Client";
@@ -436,84 +451,64 @@
})
(fetchNuGet {
name = "Microsoft.DotNet.PlatformAbstractions";
- version = "2.1.0";
- sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy";
+ version = "3.1.6";
+ sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore";
- version = "2.2.6";
- sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5";
+ version = "5.0.4";
+ sha256 = "17r5knq984j6mgbv7w4lyl12ma15pii09zmvf7zw651k46a7lmdz";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Abstractions";
- version = "2.2.6";
- sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3";
+ version = "5.0.4";
+ sha256 = "0ilj2625nmr8l9al7xk1q1kxcx5p52wlsh8x3qvs8kf2dgvvckn6";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Analyzers";
- version = "2.2.6";
- sha256 = "10f2lxxmh0xrdjvnam31fqfnjkaick23mpfvahj3ca5l07bph0rc";
+ version = "5.0.4";
+ sha256 = "193c63kqgrdiy0wwsbd5hc9b7cjmngiy6rbam24cilafm68nhiif";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Design";
- version = "2.2.6";
- sha256 = "0kjjkh1yfb56wnkmciqzfn9vymqfjap364y5amia0lmqmhfz8g7f";
+ version = "5.0.4";
+ sha256 = "1xb50lrdyrxa6yi2a8k71znqw2cpjr6qpwx7z5wa5fabdjlywdxh";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Relational";
- version = "2.2.6";
- sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z";
+ version = "5.0.4";
+ sha256 = "0by7is7h3i3w4a1bsffls81dyklp2k4jlysjv1wh3l2wp76c42xa";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Sqlite";
- version = "2.2.6";
- sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam";
+ version = "5.0.4";
+ sha256 = "0pf55yqjlrjmh8hdcd55awxykhqwzzi5cc447232sa0fdn8a2yh8";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Sqlite.Core";
- version = "2.2.6";
- sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630";
+ version = "5.0.4";
+ sha256 = "0ma6y292hgh7bgaancmvvyv0fl6hibjbcbfhn35h01dg6bnz00wr";
})
(fetchNuGet {
name = "Microsoft.Extensions.Caching.Abstractions";
- version = "2.2.0";
- sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52";
+ version = "5.0.0";
+ sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb";
})
(fetchNuGet {
name = "Microsoft.Extensions.Caching.Memory";
- version = "2.2.0";
- sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv";
- })
- (fetchNuGet {
- name = "Microsoft.Extensions.Configuration";
- version = "2.2.0";
- sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl";
+ version = "5.0.0";
+ sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca";
})
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Abstractions";
- version = "2.2.0";
- sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674";
- })
- (fetchNuGet {
- name = "Microsoft.Extensions.Configuration.Binder";
- version = "2.2.0";
- sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j";
- })
- (fetchNuGet {
- name = "Microsoft.Extensions.DependencyInjection";
- version = "2.2.0";
- sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck";
+ version = "5.0.0";
+ sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k";
})
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection";
version = "5.0.1";
sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk";
})
- (fetchNuGet {
- name = "Microsoft.Extensions.DependencyInjection.Abstractions";
- version = "2.2.0";
- sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5";
- })
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection.Abstractions";
version = "5.0.0";
@@ -521,24 +516,14 @@
})
(fetchNuGet {
name = "Microsoft.Extensions.DependencyModel";
- version = "2.1.0";
- sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd";
- })
- (fetchNuGet {
- name = "Microsoft.Extensions.Logging";
- version = "2.2.0";
- sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm";
+ version = "5.0.0";
+ sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x";
})
(fetchNuGet {
name = "Microsoft.Extensions.Logging";
version = "5.0.0";
sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3";
})
- (fetchNuGet {
- name = "Microsoft.Extensions.Logging.Abstractions";
- version = "2.2.0";
- sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl";
- })
(fetchNuGet {
name = "Microsoft.Extensions.Logging.Abstractions";
version = "5.0.0";
@@ -546,24 +531,14 @@
})
(fetchNuGet {
name = "Microsoft.Extensions.ObjectPool";
- version = "5.0.2";
- sha256 = "0asbw0l5syfgk2qb26czggvdix43d6043kl25ihdqdlhghcyy806";
- })
- (fetchNuGet {
- name = "Microsoft.Extensions.Options";
- version = "2.2.0";
- sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0";
+ version = "5.0.3";
+ sha256 = "1slfc4ncl83dl2g1xm95qb04bkyir26zhvz26lkph1jff0ycx2wb";
})
(fetchNuGet {
name = "Microsoft.Extensions.Options";
version = "5.0.0";
sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay";
})
- (fetchNuGet {
- name = "Microsoft.Extensions.Primitives";
- version = "2.2.0";
- sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c";
- })
(fetchNuGet {
name = "Microsoft.Extensions.Primitives";
version = "5.0.0";
@@ -594,21 +569,11 @@
version = "5.0.0";
sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc";
})
- (fetchNuGet {
- name = "Microsoft.NETCore.Targets";
- version = "3.1.0";
- sha256 = "04cc2wl90p7g9zscnxgyj55vzl7srrrjwadl2dxgicfb2x2499ca";
- })
(fetchNuGet {
name = "Microsoft.NETCore.Targets";
version = "5.0.0";
sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6";
})
- (fetchNuGet {
- name = "Microsoft.Win32.Primitives";
- version = "4.0.1";
- sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7";
- })
(fetchNuGet {
name = "Microsoft.Win32.Primitives";
version = "4.3.0";
@@ -624,11 +589,6 @@
version = "0.9.6.1";
sha256 = "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf";
})
- (fetchNuGet {
- name = "NETStandard.Library";
- version = "1.6.0";
- sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k";
- })
(fetchNuGet {
name = "NETStandard.Library";
version = "1.6.1";
@@ -649,11 +609,6 @@
version = "12.0.3";
sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x";
})
- (fetchNuGet {
- name = "Newtonsoft.Json";
- version = "9.0.1";
- sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r";
- })
(fetchNuGet {
name = "NuGet.Common";
version = "5.8.0";
@@ -704,10 +659,20 @@
version = "3.13.1";
sha256 = "07156gr0yl9rqhyj44cp1xz9jpngbl5kb7ci3qfy9fcp01dczmm9";
})
+ (fetchNuGet {
+ name = "OpenTabletDriver";
+ version = "0.5.2.1";
+ sha256 = "0czbgxjkc5ryrnn9hl68wp464p4xp0883517iq87d1f7qb32gppl";
+ })
+ (fetchNuGet {
+ name = "OpenTabletDriver.Plugin";
+ version = "0.5.2.1";
+ sha256 = "199yasnq5dsb5c37vl8vry8lf536gpgclsk402sxdw9lz11xmmqd";
+ })
(fetchNuGet {
name = "ppy.osu.Framework";
- version = "2021.226.0";
- sha256 = "0875lcd28vmx4f40k8m957lcpg0ilkzm3da12j94xaqk88mx4j7c";
+ version = "2021.317.0";
+ sha256 = "1nych95lrxs2hb3bcnw9h0f843k9lrn1f4hwdnaf5q3p8ny1pmph";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@@ -734,11 +699,6 @@
version = "1.9.0.5";
sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl";
})
- (fetchNuGet {
- name = "Remotion.Linq";
- version = "2.2.0";
- sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf";
- })
(fetchNuGet {
name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
@@ -754,41 +714,21 @@
version = "4.3.0";
sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa";
})
- (fetchNuGet {
- name = "runtime.native.System";
- version = "4.0.0";
- sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
- })
(fetchNuGet {
name = "runtime.native.System";
version = "4.3.0";
sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
})
- (fetchNuGet {
- name = "runtime.native.System.IO.Compression";
- version = "4.1.0";
- sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk";
- })
(fetchNuGet {
name = "runtime.native.System.IO.Compression";
version = "4.3.0";
sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d";
})
- (fetchNuGet {
- name = "runtime.native.System.Net.Http";
- version = "4.0.1";
- sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6";
- })
(fetchNuGet {
name = "runtime.native.System.Net.Http";
version = "4.3.0";
sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk";
})
- (fetchNuGet {
- name = "runtime.native.System.Security.Cryptography";
- version = "4.0.0";
- sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9";
- })
(fetchNuGet {
name = "runtime.native.System.Security.Cryptography.Apple";
version = "4.3.0";
@@ -841,8 +781,8 @@
})
(fetchNuGet {
name = "Sentry";
- version = "3.0.1";
- sha256 = "1nmqwprp2xv9d8llfncyw94nfws9nwb7zj0sqrd6lv1mfgaxraql";
+ version = "3.0.7";
+ sha256 = "1wlfia0ihyx2jd07faz4jqbldxq9bx4hv787xkfk1469h7f2vvwk";
})
(fetchNuGet {
name = "SharpCompress";
@@ -851,8 +791,8 @@
})
(fetchNuGet {
name = "SharpCompress";
- version = "0.27.1";
- sha256 = "1lhljszs94i1ssl831ik1a51n2pshf27nsjm78acnw1y1qnkm5pd";
+ version = "0.28.1";
+ sha256 = "1h7gx7apafdd0jnv12fppca9b6cpq205kjkcipclxp1lli0i7qvw";
})
(fetchNuGet {
name = "SharpFNT";
@@ -861,8 +801,8 @@
})
(fetchNuGet {
name = "SixLabors.ImageSharp";
- version = "1.0.2";
- sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj";
+ version = "1.0.3";
+ sha256 = "1y43zvhjgi9rhylc8451784hhdi5b551hf7fsa6187b83wgxc47g";
})
(fetchNuGet {
name = "Splat";
@@ -870,55 +810,40 @@
sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf";
})
(fetchNuGet {
- name = "SQLitePCLRaw.bundle_green";
- version = "1.1.12";
- sha256 = "0jbyd25ag15fyn9nawjikv0v5ylk2zh5pxgr6gm4kpbpqys86sq9";
+ name = "SQLitePCLRaw.bundle_e_sqlite3";
+ version = "2.0.4";
+ sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm";
})
(fetchNuGet {
name = "SQLitePCLRaw.core";
- version = "1.1.12";
- sha256 = "03gflsn2wl6v0a8zvh6y5xdhx0xxmfrn6jfldiy829x3fx74zgdl";
+ version = "2.0.4";
+ sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1";
})
(fetchNuGet {
- name = "SQLitePCLRaw.lib.e_sqlite3.linux";
- version = "1.1.12";
- sha256 = "10mlq914d3zggdjf4bv27w6jx0gqqjf6f91y5ri6pbvaqyhi28h5";
+ name = "SQLitePCLRaw.lib.e_sqlite3";
+ version = "2.0.4";
+ sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c";
})
(fetchNuGet {
- name = "SQLitePCLRaw.lib.e_sqlite3.osx";
- version = "1.1.12";
- sha256 = "1hixg6n9sqllfrcihj145lh1l38inv827808difvazd4zr3mi0z1";
+ name = "SQLitePCLRaw.provider.dynamic_cdecl";
+ version = "2.0.4";
+ sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j";
})
(fetchNuGet {
- name = "SQLitePCLRaw.lib.e_sqlite3.v110_xp";
- version = "1.1.12";
- sha256 = "107sivk5p38dg1kyvqrxgp67dj89s8l6brf9l52k6s4vrn4hrrk7";
- })
- (fetchNuGet {
- name = "SQLitePCLRaw.provider.e_sqlite3.netstandard11";
- version = "1.1.12";
- sha256 = "0qr2d7ka6f5c7bybdhiyq7nl90c9575szmi0nfpknd9c0w024if4";
+ name = "SQLitePCLRaw.provider.e_sqlite3";
+ version = "2.0.4";
+ sha256 = "1vm8w8xvqi11sihdz5s6y4w7ghq4pp5f2ksixdhlbycvs6m4h7i7";
})
(fetchNuGet {
name = "StbiSharp";
version = "1.0.13";
sha256 = "0yaspwlh4x93d7xnqj5w5pxlwzlv9lixvksyvdh176krfa4mjw3q";
})
- (fetchNuGet {
- name = "System.AppContext";
- version = "4.1.0";
- sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz";
- })
(fetchNuGet {
name = "System.AppContext";
version = "4.3.0";
sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya";
})
- (fetchNuGet {
- name = "System.Buffers";
- version = "4.0.0";
- sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr";
- })
(fetchNuGet {
name = "System.Buffers";
version = "4.3.0";
@@ -944,11 +869,6 @@
version = "4.3.0";
sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
})
- (fetchNuGet {
- name = "System.Collections.Concurrent";
- version = "4.0.12";
- sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc";
- })
(fetchNuGet {
name = "System.Collections.Concurrent";
version = "4.3.0";
@@ -969,11 +889,6 @@
version = "5.0.0";
sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r";
})
- (fetchNuGet {
- name = "System.ComponentModel.Annotations";
- version = "4.5.0";
- sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p";
- })
(fetchNuGet {
name = "System.ComponentModel.Annotations";
version = "5.0.0";
@@ -1009,11 +924,6 @@
version = "1.0.31";
sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63";
})
- (fetchNuGet {
- name = "System.Console";
- version = "4.0.0";
- sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf";
- })
(fetchNuGet {
name = "System.Console";
version = "4.3.0";
@@ -1029,51 +939,31 @@
version = "4.3.0";
sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y";
})
- (fetchNuGet {
- name = "System.Diagnostics.DiagnosticSource";
- version = "4.0.0";
- sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m";
- })
(fetchNuGet {
name = "System.Diagnostics.DiagnosticSource";
version = "4.3.0";
sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq";
})
- (fetchNuGet {
- name = "System.Diagnostics.DiagnosticSource";
- version = "4.5.0";
- sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj";
- })
(fetchNuGet {
name = "System.Diagnostics.DiagnosticSource";
version = "5.0.0";
sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga";
})
(fetchNuGet {
- name = "System.Diagnostics.Tools";
- version = "4.0.1";
- sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x";
+ name = "System.Diagnostics.DiagnosticSource";
+ version = "5.0.1";
+ sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs";
})
(fetchNuGet {
name = "System.Diagnostics.Tools";
version = "4.3.0";
sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1";
})
- (fetchNuGet {
- name = "System.Diagnostics.Tracing";
- version = "4.1.0";
- sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394";
- })
(fetchNuGet {
name = "System.Diagnostics.Tracing";
version = "4.3.0";
sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4";
})
- (fetchNuGet {
- name = "System.Dynamic.Runtime";
- version = "4.0.11";
- sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
- })
(fetchNuGet {
name = "System.Globalization";
version = "4.0.11";
@@ -1084,31 +974,16 @@
version = "4.3.0";
sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
})
- (fetchNuGet {
- name = "System.Globalization.Calendars";
- version = "4.0.1";
- sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh";
- })
(fetchNuGet {
name = "System.Globalization.Calendars";
version = "4.3.0";
sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq";
})
- (fetchNuGet {
- name = "System.Globalization.Extensions";
- version = "4.0.1";
- sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc";
- })
(fetchNuGet {
name = "System.Globalization.Extensions";
version = "4.3.0";
sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls";
})
- (fetchNuGet {
- name = "System.Interactive.Async";
- version = "3.2.0";
- sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d";
- })
(fetchNuGet {
name = "System.IO";
version = "4.1.0";
@@ -1119,41 +994,21 @@
version = "4.3.0";
sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
})
- (fetchNuGet {
- name = "System.IO.Compression";
- version = "4.1.0";
- sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
- })
(fetchNuGet {
name = "System.IO.Compression";
version = "4.3.0";
sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz";
})
- (fetchNuGet {
- name = "System.IO.Compression.ZipFile";
- version = "4.0.1";
- sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82";
- })
(fetchNuGet {
name = "System.IO.Compression.ZipFile";
version = "4.3.0";
sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar";
})
- (fetchNuGet {
- name = "System.IO.FileSystem";
- version = "4.0.1";
- sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
- })
(fetchNuGet {
name = "System.IO.FileSystem";
version = "4.3.0";
sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
})
- (fetchNuGet {
- name = "System.IO.FileSystem.Primitives";
- version = "4.0.1";
- sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612";
- })
(fetchNuGet {
name = "System.IO.FileSystem.Primitives";
version = "4.3.0";
@@ -1179,26 +1034,11 @@
version = "4.3.0";
sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
})
- (fetchNuGet {
- name = "System.Linq.Expressions";
- version = "4.1.0";
- sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
- })
(fetchNuGet {
name = "System.Linq.Expressions";
version = "4.3.0";
sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
})
- (fetchNuGet {
- name = "System.Linq.Queryable";
- version = "4.0.1";
- sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw";
- })
- (fetchNuGet {
- name = "System.Memory";
- version = "4.5.1";
- sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c";
- })
(fetchNuGet {
name = "System.Memory";
version = "4.5.3";
@@ -1209,31 +1049,16 @@
version = "4.5.4";
sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y";
})
- (fetchNuGet {
- name = "System.Net.Http";
- version = "4.1.0";
- sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb";
- })
(fetchNuGet {
name = "System.Net.Http";
version = "4.3.0";
sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j";
})
- (fetchNuGet {
- name = "System.Net.Primitives";
- version = "4.0.11";
- sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r";
- })
(fetchNuGet {
name = "System.Net.Primitives";
version = "4.3.0";
sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii";
})
- (fetchNuGet {
- name = "System.Net.Sockets";
- version = "4.1.0";
- sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls";
- })
(fetchNuGet {
name = "System.Net.Sockets";
version = "4.3.0";
@@ -1249,11 +1074,6 @@
version = "4.5.0";
sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59";
})
- (fetchNuGet {
- name = "System.ObjectModel";
- version = "4.0.12";
- sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj";
- })
(fetchNuGet {
name = "System.ObjectModel";
version = "4.3.0";
@@ -1269,11 +1089,6 @@
version = "4.3.0";
sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
})
- (fetchNuGet {
- name = "System.Reflection.Emit";
- version = "4.0.1";
- sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
- })
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.3.0";
@@ -1284,21 +1099,11 @@
version = "4.6.0";
sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw";
})
- (fetchNuGet {
- name = "System.Reflection.Emit.ILGeneration";
- version = "4.0.1";
- sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0";
- })
(fetchNuGet {
name = "System.Reflection.Emit.ILGeneration";
version = "4.3.0";
sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q";
})
- (fetchNuGet {
- name = "System.Reflection.Emit.Lightweight";
- version = "4.0.1";
- sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr";
- })
(fetchNuGet {
name = "System.Reflection.Emit.Lightweight";
version = "4.3.0";
@@ -1309,11 +1114,6 @@
version = "4.6.0";
sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp";
})
- (fetchNuGet {
- name = "System.Reflection.Extensions";
- version = "4.0.1";
- sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn";
- })
(fetchNuGet {
name = "System.Reflection.Extensions";
version = "4.3.0";
@@ -1339,11 +1139,6 @@
version = "4.3.0";
sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
})
- (fetchNuGet {
- name = "System.Reflection.TypeExtensions";
- version = "4.1.0";
- sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7";
- })
(fetchNuGet {
name = "System.Reflection.TypeExtensions";
version = "4.3.0";
@@ -1369,11 +1164,6 @@
version = "4.3.0";
sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
})
- (fetchNuGet {
- name = "System.Runtime.CompilerServices.Unsafe";
- version = "4.5.1";
- sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf";
- })
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "4.5.2";
@@ -1424,51 +1214,26 @@
version = "4.3.0";
sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
})
- (fetchNuGet {
- name = "System.Runtime.InteropServices.RuntimeInformation";
- version = "4.0.0";
- sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6";
- })
(fetchNuGet {
name = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.3.0";
sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii";
})
- (fetchNuGet {
- name = "System.Runtime.Numerics";
- version = "4.0.1";
- sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn";
- })
(fetchNuGet {
name = "System.Runtime.Numerics";
version = "4.3.0";
sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
})
- (fetchNuGet {
- name = "System.Runtime.Serialization.Primitives";
- version = "4.1.1";
- sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
- })
(fetchNuGet {
name = "System.Security.AccessControl";
version = "5.0.0";
sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r";
})
- (fetchNuGet {
- name = "System.Security.Cryptography.Algorithms";
- version = "4.2.0";
- sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85";
- })
(fetchNuGet {
name = "System.Security.Cryptography.Algorithms";
version = "4.3.0";
sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml";
})
- (fetchNuGet {
- name = "System.Security.Cryptography.Cng";
- version = "4.2.0";
- sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc";
- })
(fetchNuGet {
name = "System.Security.Cryptography.Cng";
version = "4.3.0";
@@ -1479,31 +1244,16 @@
version = "5.0.0-preview.3.20214.6";
sha256 = "050xx94ki5zmclplfns1v463wlf97ha2knwnxp08vqkgy0bdg1mv";
})
- (fetchNuGet {
- name = "System.Security.Cryptography.Csp";
- version = "4.0.0";
- sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q";
- })
(fetchNuGet {
name = "System.Security.Cryptography.Csp";
version = "4.3.0";
sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1";
})
- (fetchNuGet {
- name = "System.Security.Cryptography.Encoding";
- version = "4.0.0";
- sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4";
- })
(fetchNuGet {
name = "System.Security.Cryptography.Encoding";
version = "4.3.0";
sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32";
})
- (fetchNuGet {
- name = "System.Security.Cryptography.OpenSsl";
- version = "4.0.0";
- sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q";
- })
(fetchNuGet {
name = "System.Security.Cryptography.OpenSsl";
version = "4.3.0";
@@ -1514,11 +1264,6 @@
version = "5.0.0-preview.3.20214.6";
sha256 = "1q38rzpzhzpc8l75m06g6swq23qbl22ijzd9k76jfq08px3wq09k";
})
- (fetchNuGet {
- name = "System.Security.Cryptography.Primitives";
- version = "4.0.0";
- sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh";
- })
(fetchNuGet {
name = "System.Security.Cryptography.Primitives";
version = "4.3.0";
@@ -1529,11 +1274,6 @@
version = "4.4.0";
sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6";
})
- (fetchNuGet {
- name = "System.Security.Cryptography.X509Certificates";
- version = "4.1.0";
- sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh";
- })
(fetchNuGet {
name = "System.Security.Cryptography.X509Certificates";
version = "4.3.0";
@@ -1564,11 +1304,6 @@
version = "5.0.0";
sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0";
})
- (fetchNuGet {
- name = "System.Text.Encoding.Extensions";
- version = "4.0.11";
- sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs";
- })
(fetchNuGet {
name = "System.Text.Encoding.Extensions";
version = "4.3.0";
@@ -1589,11 +1324,6 @@
version = "5.0.1";
sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3";
})
- (fetchNuGet {
- name = "System.Text.RegularExpressions";
- version = "4.1.0";
- sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7";
- })
(fetchNuGet {
name = "System.Text.RegularExpressions";
version = "4.3.0";
@@ -1624,11 +1354,6 @@
version = "4.3.0";
sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
})
- (fetchNuGet {
- name = "System.Threading.Tasks.Extensions";
- version = "4.0.0";
- sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr";
- })
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.3.0";
@@ -1649,31 +1374,16 @@
version = "4.0.0";
sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc";
})
- (fetchNuGet {
- name = "System.Threading.Timer";
- version = "4.0.1";
- sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6";
- })
(fetchNuGet {
name = "System.Threading.Timer";
version = "4.3.0";
sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56";
})
- (fetchNuGet {
- name = "System.Xml.ReaderWriter";
- version = "4.0.11";
- sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5";
- })
(fetchNuGet {
name = "System.Xml.ReaderWriter";
version = "4.3.0";
sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1";
})
- (fetchNuGet {
- name = "System.Xml.XDocument";
- version = "4.0.11";
- sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18";
- })
(fetchNuGet {
name = "System.Xml.XDocument";
version = "4.3.0";
diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix
index 656bde2ac743..deb59eb23775 100644
--- a/pkgs/games/pentobi/default.nix
+++ b/pkgs/games/pentobi/default.nix
@@ -3,14 +3,14 @@
}:
mkDerivation rec {
- version = "18.4";
+ version = "18.5";
pname = "pentobi";
src = fetchFromGitHub {
owner = "enz";
repo = "pentobi";
rev = "v${version}";
- sha256 = "1wawy6s3i4pcc6n6kfspn5b4g957ds0728mgwzw19agp5yyid73b";
+ sha256 = "sha256-iVgG2Ee1nJWpuquX2ntFHAJrPA0u9YnutmOC+cMrgZg=";
};
nativeBuildInputs = [ cmake docbook_xsl qttools ];
diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix
index a966731725d3..f45dd3948626 100644
--- a/pkgs/games/r2mod_cli/default.nix
+++ b/pkgs/games/r2mod_cli/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/foldex/r2mod_cli";
license = licenses.gpl3Only;
maintainers = [ maintainers.reedrw ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 01dd1f0c04f3..72c8a49939d3 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin
'';
- nativeBuildInputs = [ cmake pkg-config ];
+ nativeBuildInputs = [ cmake pkg-config unzip ];
buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost
- libuuid openal ogre ois curl gtk2 mygui unzip angelscript
+ libuuid openal ogre ois curl gtk2 mygui angelscript
ogrepaged mysocketw libxcb ];
meta = with lib; {
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 942c93ec043f..fc2654fd8e9b 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -115,8 +115,8 @@ let
sourceRoot = ".";
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ];
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ zlib libpng bzip2 SDL SDL_mixer ];
configurePhase = let
# Configuration as per the readme.txt and config.template
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index fe16a8a0403a..fef1a0f09288 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -60,5 +60,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ phreedom qknight domenkozar sorki ];
platforms = platforms.linux;
+ # error: 'snprintf' was not declared in this scope
+ broken = true;
};
}
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index 6692f9bd9b2e..3600b2f1442a 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -143,10 +143,10 @@ in buildFHSUserEnv rec {
vulkan-loader
expat
wayland
- xlibs.libxcb
- xlibs.libXdamage
- xlibs.libxshmfence
- xlibs.libXxf86vm
+ xorg.libxcb
+ xorg.libXdamage
+ xorg.libxshmfence
+ xorg.libXxf86vm
llvm_11.lib
libelf
] ++ (if (!nativeOnly) then [
diff --git a/pkgs/games/steam/fonts.nix b/pkgs/games/steam/fonts.nix
index 44dde01a8a83..9cf68f2c29b0 100644
--- a/pkgs/games/steam/fonts.nix
+++ b/pkgs/games/steam/fonts.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1cgygmwich5f1jhhbmbkkpnzasjl8gy36xln76n6r2gjh6awqfx0";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
sourceRoot = ".";
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index 43c1512c6505..2c5932cf7faf 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -2,7 +2,7 @@
let
traceLog = "/tmp/steam-trace-dependencies.log";
- version = "1.0.0.68";
+ version = "1.0.0.69";
in stdenv.mkDerivation {
pname = "steam-original";
@@ -10,7 +10,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
- sha256 = "sha256-ZeiCYjxnH0Ath5bB20QHmE8R3wU4/3RiAw2NUhrrKNM=";
+ sha256 = "sha256-b5g4AUprE/lTunJs59IDlGu5O/1dB0kBvCFq0Eqyx2c=";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix
index 94fb9d063b32..de430d296222 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/pkgs/games/terraria-server/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "18hcy7jfizyyp0h66rga8z948xg3nyk32rzl7hgv7ar1w43airhh";
};
- buildInputs = [ file unzip ];
- nativeBuildInputs = [ autoPatchelfHook ];
+ buildInputs = [ file ];
+ nativeBuildInputs = [ autoPatchelfHook unzip ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix
index a4bf47b5e362..e07697f7c0e1 100644
--- a/pkgs/games/tremulous/default.nix
+++ b/pkgs/games/tremulous/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz";
sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql";
};
- buildInputs = [ unzip libGLU libGL libX11 SDL openal ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libGLU libGL libX11 SDL openal ];
unpackPhase = ''
unzip $src1
cd tremulous
diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix
index 1632f7c41db8..c280d03edb6e 100644
--- a/pkgs/games/unciv/default.nix
+++ b/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
- version = "3.12.14";
+ version = "3.13.10";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
- sha256 = "sha256-FE6oPtEerjVusK3fpxLwcpvKjIAQl6oCrBj8GIkuVwU=";
+ sha256 = "sha256-5UT/STcU+/17wjc/guOXgkD6UCtn97EQkVRgnTliFjg=";
};
dontUnpack = true;
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 10553d483a50..dfbad29fa9e0 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ unzip SDL libGL libGLU openal curl libXxf86vm ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ SDL libGL libGLU openal curl libXxf86vm ];
sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}";
configurePhase = ''
diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index cc9e9bd98562..e1fc19fa05b2 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "VASSAL";
- version = "3.4.12";
+ version = "3.5.3";
src = fetchzip {
url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
- sha256 = "0xn403fxz6ay5lv8whyfdq611kvxj5q309bj317yw5cxbb08w1yb";
+ sha256 = "sha256-r48k4Un623uYsYcdF5UAH6w/uIdgWz8WQ75BiwrApkA=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix
index 27a270fcf8f3..a9938cfcbc04 100644
--- a/pkgs/games/worldofgoo/default.nix
+++ b/pkgs/games/worldofgoo/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
sha256 = "175e4b0499a765f1564942da4bd65029f8aae1de8231749c56bec672187d53ee";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
sourceRoot = pname;
phases = [ "unpackPhase installPhase" ];
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 54ec25c8cf79..fb6cb93f7f24 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -62,7 +62,8 @@ let
sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay";
};
- buildInputs = [ unzip libjpeg zlib libvorbis curl ]
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libjpeg zlib libvorbis curl ]
++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ]
++ lib.optional withSDL [ SDL2.dev ];
diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix
index edee0db26179..1925d6417175 100644
--- a/pkgs/games/zaz/default.nix
+++ b/pkgs/games/zaz/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "zaz";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "15q3kxzl71m50byw37dshfsx5wp240ywah19ccmqmqarcldcqcp3";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+ sha256 = "1r3bmwny05zzmdalxm5ah2rray0nnsg1w00r30p47q6x2lpwj8ml";
};
nativeBuildInputs = [
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index 6c48caf8756a..c358e599924a 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
sourceRoot=`pwd`/src
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ];
+ nativeBuildInputs = [ makeWrapper unrar unzip ];
+ buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ];
NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index 754c0f4d1d0e..0d6ec276b5f4 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -1,4 +1,5 @@
-{lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux, zlib }:
+{ lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups
+, ghostscript, pkgsi686Linux, zlib }:
let
@@ -20,7 +21,7 @@ in
stdenv.mkDerivation {
pname = "canon-cups-ufr2";
- version = version;
+ inherit version;
src = src_canon;
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix
index 35d81b3da006..e61d3ace5f15 100644
--- a/pkgs/misc/cups/drivers/hll2340dw/default.nix
+++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix
@@ -1,4 +1,6 @@
-{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which}:
+{ lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file
+, a2ps, coreutils, perl, gnugrep, which
+}:
let
version = "3.2.0-1";
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index ae8749f0326b..29ebfa173296 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -13,7 +13,6 @@
, rpm
, cpio
, getopt
-, patchelf
, autoPatchelfHook
, gcc
}:
@@ -99,6 +98,35 @@ let plugins = {
};
meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; };
};
+ v600 = stdenv.mkDerivation rec {
+ pname = "iscan-gt-x820-bundle";
+ version = "2.30.4";
+
+ nativeBuildInputs = [ autoPatchelfHook rpm ];
+ src = fetchurl {
+ urls = [
+ "https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
+ "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
+ ];
+ sha256 = "1vlba7dsgpk35nn3n7is8nwds3yzlk38q43mppjzwsz2d2n7sr33";
+ };
+ installPhase = ''
+ cd plugins
+ ${rpm}/bin/rpm2cpio iscan-plugin-gt-x820-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+ mkdir $out
+ cp -r usr/share $out
+ cp -r usr/lib64 $out/lib
+ mv $out/share/iscan $out/share/esci
+ mv $out/lib/iscan $out/lib/esci
+ '';
+ passthru = {
+ registrationCommand = ''
+ $registry --add interpreter usb 0x04b8 0x013a "$plugin/lib/esci/libesintA1 $plugin/share/esci/esfwA1.bin"
+ '';
+ hw = "Perfection V600 Photo";
+ };
+ meta = common_meta // { description = "iscan esci x820 plugin for " + passthru.hw; };
+ };
x770 = stdenv.mkDerivation rec {
pname = "iscan-gt-x770-bundle";
version = "2.30.4";
@@ -266,14 +294,14 @@ let fwdir = symlinkJoin {
in
let iscan-data = stdenv.mkDerivation rec {
pname = "iscan-data";
- version = "1.39.1-2";
+ version = "1.39.2-1";
src = fetchurl {
urls = [
"http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz"
"https://web.archive.org/web/http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz"
];
- sha256 = "04zrvbnxf1k6zinrd13hwnbzscc3qhmwlvx3k2jhjys2lginw7w4";
+ sha256 = "092qhlnjjgz11ifx6mng7mz20i44gc0nlccrbmw18xr5hipbqqka";
};
buildInputs = [
@@ -295,17 +323,16 @@ stdenv.mkDerivation rec {
sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config libtool makeWrapper ];
buildInputs = [
gtk2
libxml2
- libtool
libusb-compat-0_1
sane-backends
- makeWrapper
];
patches = [
+ # Patch for compatibility with libpng versions greater than 10499
(fetchpatch {
urls = [
"https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch?h=b6e4c805d53b49da79a0f64ef16bb82d6d800fcf"
@@ -313,7 +340,9 @@ stdenv.mkDerivation rec {
];
sha256 = "04y70qjd220dpyh771fiq50lha16pms98mfigwjczdfmx6kpj1jd";
})
+ # Patch iscan to search appropriate folders for firmware files
./firmware_location.patch
+ # Patch deprecated use of sscanf code to use a more modern C99 compatible version
./sscanf.patch
];
patchFlags = [ "-p0" ];
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix
index deea3bd25f50..e25deb4c7795 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/pkgs/misc/drivers/foo2zjs/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1rmw4jmxn2lqp124mapvnic0ma8ipyvisx2vj848mvad5g5w9x3z";
};
- buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ foomatic-filters bc ghostscript systemd vim ];
patches = [ ./no-hardcode-fw.diff ];
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index 163b81922c2b..53f1009cfad5 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook unzip ];
- buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ];
+ buildInputs = [ zlib SDL readline libGLU libGL libX11 ];
configureFlags = [
"--target=default"
diff --git a/pkgs/misc/emulators/cen64/default.nix b/pkgs/misc/emulators/cen64/default.nix
index 0153ed11cd2d..ddf455473378 100644
--- a/pkgs/misc/emulators/cen64/default.nix
+++ b/pkgs/misc/emulators/cen64/default.nix
@@ -2,21 +2,22 @@
stdenv.mkDerivation rec {
pname = "cen64";
- version = "unstable-2020-02-20";
+ version = "unstable-2021-03-12";
src = fetchFromGitHub {
owner = "n64dev";
repo = "cen64";
- rev = "6f9f5784bf0a720522c4ecb0915e20229c126aed";
- sha256 = "08q0a3b2ilb95zlz4cw681gwz45n2wrb2gp2z414cf0bhn90vz0s";
+ rev = "1b31ca9b3c3bb783391ab9773bd26c50db2056a8";
+ sha256 = "0x1fz3z4ffl5xssiyxnmbhpjlf0k0fxsqn4f2ikrn17742dx4c0z";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libGL libiconv openal libX11 ];
installPhase = ''
- mkdir -p $out/bin
- mv cen64 $out/bin
+ runHook preInstall
+ install -D {,$out/bin/}${pname}
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix
index d1b18f12a844..70e5d94def6f 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/pkgs/misc/emulators/nestopia/default.nix
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
libGLU libGL
libarchive
libao
- unzip
xdg-utils
gnome3.adwaita-icon-theme
];
@@ -37,6 +36,7 @@ stdenv.mkDerivation rec {
pkg-config
makeWrapper
wrapGAppsHook
+ unzip
];
installPhase = ''
diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix
index 6b2098401699..ee91a010df77 100644
--- a/pkgs/misc/emulators/sameboy/default.nix
+++ b/pkgs/misc/emulators/sameboy/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sameboy";
- version = "0.14.1";
+ version = "0.14.2";
src = fetchFromGitHub {
owner = "LIJI32";
repo = "SameBoy";
rev = "v${version}";
- sha256 = "0h42cixbf0m2qiwrqzygh0x166h9ikxa5dzi3jbqld2dygk932n7";
+ sha256 = "sha256-VGyB0Em9VFU1Z1K2XfbS9wGs6gZ8/eH/FiaFAKnFdaA=";
};
enableParallelBuilding = true;
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index 6698d0a5b488..3b5cb487f77a 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
preConfigure = "cd gtk";
meta = with lib; {
- homepage = "http://www.snes9x.com";
+ homepage = "https://www.snes9x.com";
description = "Super Nintendo Entertainment System (SNES) emulator";
longDescription = ''
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
includes some real gems that were only ever released in Japan.
'';
- license = licenses.lgpl2;
+ # see https://github.com/snes9xgit/snes9x/blob/master/LICENSE for exact details
+ license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ qknight ];
platforms = platforms.linux;
};
diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix
index d2252563d0a5..bde706e23040 100644
--- a/pkgs/misc/emulators/tilem/default.nix
+++ b/pkgs/misc/emulators/tilem/default.nix
@@ -3,7 +3,7 @@
, lib
, pkg-config
, glib
-, gnome2
+, gtk2
, libticonv
, libtifiles2
, libticables2
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw";
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ];
+ buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ];
NIX_CFLAGS_COMPILE = [ "-lm" ];
meta = with lib; {
homepage = "http://lpg.ticalc.org/prj_tilem/";
diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix
index 98f368132a91..2b645817a7e5 100644
--- a/pkgs/misc/flashfocus/default.nix
+++ b/pkgs/misc/flashfocus/default.nix
@@ -1,17 +1,27 @@
-{ lib, buildPythonApplication, fetchPypi, xcffib, pyyaml, click, i3ipc, marshmallow, cffi, xpybutil, pytestrunner }:
+{ lib, python3 }:
-
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "flashfocus";
version = "2.2.2";
- src = fetchPypi {
+ src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "1z20d596rnc7cs0rrd221gjn14dmbr11djv94y9p4v7rr788sswv";
};
- nativeBuildInputs = [ pytestrunner ];
- propagatedBuildInputs = [ i3ipc xcffib click cffi xpybutil marshmallow pyyaml ];
+ nativeBuildInputs = with python3.pkgs; [
+ pytestrunner
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ i3ipc
+ xcffib
+ click
+ cffi
+ xpybutil
+ marshmallow
+ pyyaml
+ ];
# Tests require access to a X session
doCheck = false;
diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix
index ec0dd0b1fd52..352dd038fb5a 100644
--- a/pkgs/misc/mnemonicode/default.nix
+++ b/pkgs/misc/mnemonicode/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
back to data on the other side.
'';
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = [ maintainers.cstrahan ];
};
}
diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix
index 4dd2626b5684..66b7321c780d 100644
--- a/pkgs/misc/riscv-pk/default.nix
+++ b/pkgs/misc/riscv-pk/default.nix
@@ -1,15 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let
- rev = "e5846a2bc707eaa58dc8ab6a8d20a090c6ee8570";
- sha256 = "1clynpp70fnbgsjgxx7xi0vrdrj1v0h8zpv0x26i324kp2gwylf4";
- revCount = "438";
- shortRev = "e5846a2";
-in stdenv.mkDerivation {
- name = "riscv-pk-0.1pre${revCount}_${shortRev}";
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }:
+
+stdenv.mkDerivation rec {
+ pname = "riscv-pk";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "riscv";
repo = "riscv-pk";
- inherit rev sha256;
+ rev = "v${version}";
+ sha256 = "1cc0rz4q3a1zw8756b8yysw8lb5g4xbjajh5lvqbjix41hbdx6xz";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/misc/scimark/default.nix b/pkgs/misc/scimark/default.nix
new file mode 100644
index 000000000000..7558c676ba52
--- /dev/null
+++ b/pkgs/misc/scimark/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, stdenv
+, fetchurl
+, unzip
+}:
+
+stdenv.mkDerivation rec {
+ pname = "scimark";
+ version = "4c";
+
+ src = fetchurl {
+ url = "https://math.nist.gov/scimark2/${pname}${version}.zip";
+ hash = "sha256-kcg5vKYp0B7+bC/CmFMO/tMwxf9q6nvuFv0vRSy3MbE=";
+ };
+
+ nativeBuildInputs = [
+ unzip
+ ];
+
+ dontConfigure = true;
+
+ installPhase = ''
+ install -d $out/bin/
+ install scimark4 $out/bin/
+ '';
+
+ meta = with lib; {
+ homepage = "https://math.nist.gov/scimark2/index.html";
+ description = "Scientific and numerical computing benchmark (ANSI C version)";
+ license = licenses.publicDomain;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.all;
+ };
+}
+# TODO [ AndersonTorres ]: Java version
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index b59ed85f6bc2..17b22ce07234 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
, libXdmcp, libXt }:
stdenv.mkDerivation rec {
- name = "xlockmore-5.65";
+ name = "xlockmore-5.66";
src = fetchurl {
url = "http://sillycycle.com/xlock/${name}.tar.xz";
- sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d";
+ sha256 = "sha256-WXalw2YoKNFFIskOBvKN3PyOV3iP3gjri3pw6e87q3E=";
curlOpts = "--user-agent 'Mozilla/5.0'";
};
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 21e2d4516cbe..15a129246e18 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,11 +1,7 @@
{ lib, stdenv
, fetchFromGitHub
, autoreconfHook
-, ccnet
, curl
-, fuse
-, glib
-, intltool
, libevent
, libsearpc
, libuuid
@@ -13,7 +9,6 @@
, python3
, sqlite
, vala
-, which
}:
stdenv.mkDerivation rec {
diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix
index c82b96b82f95..966a451c060c 100644
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/pkgs/misc/source-and-tags/default.nix
@@ -15,7 +15,7 @@
phases = "unpackPhase buildPhase";
inherit src srcDir tagSuffix;
name = "${name}-source-with-tags";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
# using separate tag directory so that you don't have to glob that much files when starting your editor
# is this a good choice?
buildPhase =
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 8cb02185f17d..6529ac4bfbb0 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -49,6 +49,10 @@ let
}));
in rec {
+ inherit mkTmuxPlugin;
+
+ mkDerivation = throw "tmuxPlugins.mkDerivation is deprecated, use tmuxPlugins.mkTmuxPlugin instead"; # added 2021-03-14
+
battery = mkTmuxPlugin {
pluginName = "battery";
version = "unstable-2019-07-04";
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index da4f37d28a0a..82014f6c698c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-03-07";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "c21d6afd2fb799013e3894d393bf976d9da31e65";
- sha256 = "1f4s6zq0270mpczwz7chi763rxnm2qk3gjfylwmr8r2ny6f5is1w";
+ rev = "b1f95dc4fb15efb1d5238845c99548f2906e2ba3";
+ sha256 = "0sx2k1wqv0cl3a489cqz1mf0bvr8xsjbqax8pgw1d0c4kdz17py6";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -149,12 +149,12 @@ let
async-vim = buildVimPluginFrom2Nix {
pname = "async-vim";
- version = "2020-12-30";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "async.vim";
- rev = "236debf1a68d69a74f1f6647c273b0477e1ec1bf";
- sha256 = "12xz71182shfj8l300j7wnngxm5zkx2g1c2d4l6dvbk5z1dbzlj6";
+ rev = "0fb846e1eb3c2bf04d52a57f41088afb3395212e";
+ sha256 = "1glzg0i53wkm383y1vbddbyp1ivlsx2hivjchiw60sr9gccn8f8l";
};
meta.homepage = "https://github.com/prabirshrestha/async.vim/";
};
@@ -209,12 +209,12 @@ let
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
- version = "2021-03-08";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
- rev = "2bb1fcd8828df1de5c79821b6b01ba929af355f0";
- sha256 = "0xlzq51izzbhsl3jlqj3f719ixcqi7r7y8m8n6291yp1xpmidfwm";
+ rev = "aa1c0b161a82ecf876ca3fc2894e9000225f4adf";
+ sha256 = "13cinglppisp20mki1g23iz3kp5l9bq1yj89yip80y5kzb0aqsbj";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@@ -257,12 +257,12 @@ let
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
- version = "2021-03-07";
+ version = "2021-03-18";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "85432f426b7473bb7a4de9f698f91848737b0fd8";
- sha256 = "16ql06swg4flr933bp2qm8g5iy2sjgh650k18pzghc0qc9k517xd";
+ rev = "eb24bdceff4f73b8081e2c801752105265f4b1b3";
+ sha256 = "18rcikrlcdyg6gfbhaqnqf1p0pyfym9a0mxh430slhzzjhr2a7gh";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-03-10";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "36bc8699c7fe94d8c184bc2d17382752557bd22e";
- sha256 = "0swcw4cfhshfb6rmq93r5lmr338gn0ci7wmhabvmpxzhwwm28xvr";
+ rev = "e52b59c999bb713ea6ee4d7e88c40f9c8ca76567";
+ sha256 = "0pccr6rqgk1m291pa8505y246p00fkvdzkgb9hz63qnab29h08l0";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -485,36 +485,36 @@ let
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
- version = "2021-03-01";
+ version = "2021-03-18";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
- rev = "62206b3cf8e06137919e8cbdcb52c474fe1dbd95";
- sha256 = "0y1j2qmncp0n2piiayfbfk39rj0nivjx0wfjh9wnq0s1y2ijcg91";
+ rev = "123ef20cd2e5fa85df29912d545c2699844cd9b9";
+ sha256 = "1bdqvmi1g8vziqkslwhbsjlnxk24vkc0c24hzn71zxlpnw1i3axz";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
- version = "2021-02-27";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
- rev = "3c8ca6127af51768cad8ff1074db5a9713d7fe13";
- sha256 = "17988plg3zrfnfzp4pr292qbk5zi8qgjldkhqsv5w9w38a02gxqj";
+ rev = "8f27377229c5d2dcee9ae9cda8dea0fad4a5ac3b";
+ sha256 = "0ri0rlz4fwxli6ssz69zyifrdwhc8yx4p996rw8d2m76nm7hflv0";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2021-03-10";
+ version = "2021-03-19";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "946e8393cd9189f97a50084c2a040966dce0f0cb";
- sha256 = "0d74lk85hkjb0w4fzvsp4gljl224ci749g2l25a1kd6kihyf7f82";
+ rev = "ed79b7745d31c2981feb9922e8a4ec2f7be5f376";
+ sha256 = "0ncxa7xjgkdjha7jyqfd3s7lmm459lg9achmid0qjwx0r0cavzdb";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -545,12 +545,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-03-09";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "ab4f3f5797754334def047466a998b92f3076db9";
- sha256 = "1wr0v1kgv9km5rfc9g49897043gk3hraf07z8i937144z34qasf1";
+ rev = "67fb4d138f34c12c6b44d87be66ede26d51b95c2";
+ sha256 = "0nnh0gnc6g0a67na3zar6zvpc3i2qlna3l783hhy3832ih79v9s9";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -593,12 +593,12 @@ let
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
- version = "2021-03-04";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
- rev = "7c14a8c0da5127c38f0c5b1b7061491c3cfb5ea3";
- sha256 = "128331ipqjqicb5j8jifmg268faxfd4lwy4b20h5hy9macfyvys6";
+ rev = "a7ce436b211a7ac1f47cfd440370653e33c2a1d5";
+ sha256 = "1yfcbh9q35w1ckdv8isbwjwlgnjnjmqm8yc7bcbfirkx9pjlsw2z";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/wincent/command-t/";
@@ -630,12 +630,12 @@ let
compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine";
- version = "2021-03-03";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "tzachar";
repo = "compe-tabnine";
- rev = "0739a2587e8d12fd746964578ba5c579fec1560a";
- sha256 = "11fjpvzng735b7zyaia6dhshca9j22gx65k6r85j0698pwrk9wz6";
+ rev = "ae0d64e63e80bf3c4f3e88d2e6d3f837332e0a81";
+ sha256 = "152ydvfdp0ny95y6n17wsds4kj19fsbkrzd2whc1zbqi5qzsn0ww";
};
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
};
@@ -702,12 +702,12 @@ let
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
- version = "2021-02-27";
+ version = "2021-03-17";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
- rev = "4dc7c745618a24799af44797c51af7cc308e42a4";
- sha256 = "1p0bck7gh1alybfz14s0yaawx056mfqjc8hba1wappch4jp07si6";
+ rev = "a2298d12aaa2065f4a395f017ee1f3d392db283c";
+ sha256 = "0ifmv5n0mvvlasa56kr6bwnlm7p1y59kxmvpbdw42cp3az9mcrhj";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@@ -738,12 +738,12 @@ let
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2021-03-09";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "3b61d0755a4523a131096c97fb016b102e7b1672";
- sha256 = "1df1zq117vf6w7d9y0l9cdicsw1qw3d497xnckk3c0r0kv8w6hkc";
+ rev = "7365334fe6326c5b8d8d98cad3f0da583414ebf7";
+ sha256 = "0ilqqf9ghwi7zj01y1arbvdds79hkkq0hj8r639g7q2gc3j4vfi9";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -786,12 +786,12 @@ let
csv-vim = buildVimPluginFrom2Nix {
pname = "csv-vim";
- version = "2021-02-18";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
- rev = "73c8eeca4c89768e4c53bb7a83cc3741bdcb5c7d";
- sha256 = "0hdcq8acylp8i3gh0agxjr3v34q6c4qmdwnpx1v31y3cy0j8k7v3";
+ rev = "24da62f64e6025be12ad60b16489b561f228e619";
+ sha256 = "0x5z46rzhwrdr1fzq69c6bpn3dnjjj9a64s97wn220n4xwrz1y54";
};
meta.homepage = "https://github.com/chrisbra/csv.vim/";
};
@@ -858,12 +858,12 @@ let
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "6849ecf77a6075e55946c642f07a562fcdcdd579";
- sha256 = "0pyvscibc7ydn294kffwp80gfwk5rk4v63haih79c7acq52xmm0l";
+ rev = "563c8c1885044ad3fbb5339ad5a10439d9899e51";
+ sha256 = "0xp6dpdz45lfqx0s6xhxkgxwnbbdwiaybjvb0qfyh2pziirxdrxm";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@@ -894,12 +894,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2021-03-09";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "fc76104d2b7204c016bd8e1750a06150800c4735";
- sha256 = "1ch1g39r2iyd8ma11kfi6fqy0cp0ybqv0laqs1pxphlw2z575jrj";
+ rev = "e5a757e2dc2f3409f5ccc4e4df384df93b0ef09d";
+ sha256 = "1qfwpwb7r94hnjidggn1fwcshikac8j0ckf1qb0fppfx1akyf78q";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -942,24 +942,24 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2021-03-03";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "db2d82cfbd85d8b6caafbd967a27f4d1c6ea5fa6";
- sha256 = "173nmv0d729hk9xbz9jdk9h9zlm9dhz89pgda7vggrp9dp8d1z5v";
+ rev = "4c8eb502feb8e9601cbcd82ea937aa620a6626b4";
+ sha256 = "1hgcdl29rn0ag12k663qfx9z3drl94xi0n50jcisk5z4y8xpi6r4";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
- version = "2021-02-22";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
- rev = "d66c706c9788aa47399485a3ec29a2a76711a188";
- sha256 = "09bj5442xln6a98ncnq1lxkyrl8c973p9sfd02zl1a3f16sms415";
+ rev = "f0f28abb21dba278c041f6cb6c71585d9e3bed00";
+ sha256 = "05q8zm3hmc2rbw7hq0ri0f4jgqjh399dfrm5lpi2jmwf9hkqy0yc";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@@ -1184,12 +1184,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "aa32b3d2e8f4240c7908f098f89359d20063c691";
- sha256 = "1048kb3sxmsbd9xk4s1nxvhgkrfixvpragbj6sm00sy4hx5qfq4j";
+ rev = "b05a60c81572994eb9b4e1aa5c1c5dba98e10349";
+ sha256 = "02dfns6ay9vi580nazzqfj858g0bhi3dwpd5kgg03gk38ybmxvgz";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -1256,12 +1256,12 @@ let
dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim";
- version = "2021-03-08";
+ version = "2021-03-18";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
- rev = "561c21a96249e7411b409817c00d472a26337b8d";
- sha256 = "0nb1s9c6av6jkvc3gc239llzsa34n50nfqf6swvvbazn7j29sz7c";
+ rev = "ab37ffc5aeb1693002f30254b3b9992965f45d5d";
+ sha256 = "0affiaa2ng43r3rj2yzxs50fiilsk5vqkgjah2zqa159lb2058ra";
};
meta.homepage = "https://github.com/dracula/vim/";
};
@@ -1317,24 +1317,24 @@ let
embark-vim = buildVimPluginFrom2Nix {
pname = "embark-vim";
- version = "2021-02-23";
+ version = "2021-03-12";
src = fetchFromGitHub {
owner = "embark-theme";
repo = "vim";
- rev = "d9ea898794c486e2517823f24b9577ce4c488364";
- sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw";
+ rev = "fda8867d405a93938f154fb9d70e4f4a4e6ef8c8";
+ sha256 = "09kvk3wjmpvssv8j5iba2dngnfkv178gkr620pa3k1imb0m9f0bq";
};
meta.homepage = "https://github.com/embark-theme/vim/";
};
emmet-vim = buildVimPluginFrom2Nix {
pname = "emmet-vim";
- version = "2020-10-21";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "mattn";
repo = "emmet-vim";
- rev = "60930a968d26fc7abf4f8fd5c3926bdcda2dd787";
- sha256 = "1sf0518rq9idj0sbyplh7y9a481i3y57wwkvdakqvngbpm4bf6ms";
+ rev = "1f5daf6810d205844c039a4c9efa89317e62259d";
+ sha256 = "0250dp2jcxrhx333i6mk99q7ygwa8ac055id9qafdx331v9wxcil";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/mattn/emmet-vim/";
@@ -1366,12 +1366,12 @@ let
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
- version = "2021-02-01";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
- rev = "e2efdb0d0827f7ec417583b25142f19714ece2ea";
- sha256 = "1s4i9rv1kcpry1zldpml908xv1r5hn0darip701y14njbmk9fff8";
+ rev = "f6be01e8642dc8ccc7ed1f37b23f4b0dfa2c6f8c";
+ sha256 = "1w4ld5dvy0jxgjvp6yf8qibc4x82hn490vfg0hpln67nr6mhq1iw";
};
meta.homepage = "https://github.com/fenetikm/falcon/";
};
@@ -1414,12 +1414,12 @@ let
fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim";
- version = "2021-02-28";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
- rev = "c09eb24de7a647a2b4878f8dc86b3d3565b3e8af";
- sha256 = "0mqrrb899bgf13r2klkqh4ycz167fx98kjnrhdg2jhq8gg85i0ih";
+ rev = "3f9f1957699346f240a9e71eee83fcb67c8fc0e5";
+ sha256 = "1wkxih5glkpvjy6ka42y0x1di2iqm1y7rc93av4gfqhhskryfv0h";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@@ -1535,24 +1535,24 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2021-03-06";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "711fb41e39e2ad3abec1ec9720782acbac6fb6b4";
- sha256 = "1jfjj20arsikk8alaa7jrp7aakkpakpnjbkk4ri0s95f8ix09wcm";
+ rev = "caf7754b2636eabdf1bc11d30daccc5de66951ef";
+ sha256 = "1743br19x41rycc1iqh2jiwaa2z80bi2zcd0lr9n17dc733ww5n2";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim";
- version = "2021-03-10";
+ version = "2021-03-19";
src = fetchFromGitHub {
owner = "glepnir";
repo = "galaxyline.nvim";
- rev = "a6c2cbc2218cb2e59fd3353fb827da82b84a248a";
- sha256 = "1vj4f61x5p1zg8cr4a7a90xij810v6zkbzdwpkbksfmyrxfkvqs8";
+ rev = "19488f58e7fce74d7f773402005b2014b6d3c9f1";
+ sha256 = "16lk7gqhz1bhhszwybpa6805yina38h52nqza17gvz17aqkc6zy3";
};
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
};
@@ -1605,14 +1605,26 @@ let
meta.homepage = "https://github.com/eagletmt/ghcmod-vim/";
};
+ git-blame-nvim = buildVimPluginFrom2Nix {
+ pname = "git-blame-nvim";
+ version = "2021-03-18";
+ src = fetchFromGitHub {
+ owner = "f-person";
+ repo = "git-blame.nvim";
+ rev = "c6515f6de67f50448a0f865b39c3c459b40856f5";
+ sha256 = "1cm6x58qm5jzgncrpwixcvs7cfdv02gf13zz1v4gxicxlllrh70f";
+ };
+ meta.homepage = "https://github.com/f-person/git-blame.nvim/";
+ };
+
git-messenger-vim = buildVimPluginFrom2Nix {
pname = "git-messenger-vim";
- version = "2021-02-28";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "rhysd";
repo = "git-messenger.vim";
- rev = "b79422434a419b97c5817d9ff645216952152443";
- sha256 = "0xwz4kw5mwqrh6s9vyzzx4fdl7335n9qjxzhm1c41hh1j2ikwqa9";
+ rev = "6fe62ce47491953487dac540964a4cfb037be7f3";
+ sha256 = "0g8gaprkrqs69rplmbf6nc03km6qcapipyc13rghb7fyksad51nr";
};
meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
};
@@ -1631,12 +1643,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-03-10";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "6f282d9e99e04780d645e0133c4376486bd16c23";
- sha256 = "0jy682lmafxpippsrd63r46dda5a96vrd1filj1b5xqniqwk4mrz";
+ rev = "2e371a3b89a85ea74afcd2f2926b23919a96e1c8";
+ sha256 = "0bw2sc02w8ln9sj86p0iwfcwi51n4xyxkby9ib37y3mdiz623vig";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1655,12 +1667,12 @@ let
glow-nvim = buildVimPluginFrom2Nix {
pname = "glow-nvim";
- version = "2020-12-12";
+ version = "2021-03-17";
src = fetchFromGitHub {
owner = "npxbr";
repo = "glow.nvim";
- rev = "fcd055b797553ffaa03061cb7e81b02a4626c6a6";
- sha256 = "0kbwgw5q9i6irzdy656j4xbqfv5r1p8cd3xdfjszxymnnzrivy49";
+ rev = "ba97852b0279ed44d0e06c8bcac17aef2a18ad80";
+ sha256 = "02ajb5y5zj5h8dyzzyl55b6izh6bxlmqy48nasig1n68rpdwc0ni";
};
meta.homepage = "https://github.com/npxbr/glow.nvim/";
};
@@ -1715,12 +1727,12 @@ let
gruvbox-community = buildVimPluginFrom2Nix {
pname = "gruvbox-community";
- version = "2021-03-02";
+ version = "2021-03-17";
src = fetchFromGitHub {
owner = "gruvbox-community";
repo = "gruvbox";
- rev = "197103a55543b1398c194369306cff896bfd3fc1";
- sha256 = "18ng4qk4wi56bq64hc7sw3dx299cnjcg0zghk9r39dpi5fv68d8h";
+ rev = "8a36e8dae3e31fa5edfb5ae91fb1c2d36b05979e";
+ sha256 = "0yq8bvpqlnj57pl2j4jwwpihpwmq0lym1q5sigvkp0yghlwliqxx";
};
meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
};
@@ -1799,12 +1811,12 @@ let
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop-nvim";
- version = "2021-03-06";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
- rev = "b3224bc6231a6a3543390cdfab4e4226dbfe40a7";
- sha256 = "165csrpk2mq685i13kyf7w935al1qwgqd2myyn2gnznbfpbnlcw1";
+ rev = "a0e9e229bbd0e493511fb9d27d917f55c5e4191a";
+ sha256 = "090waig8fqq1s9z66ykr64ns3g9yb6qy32jf5fwamx43m9xcws2s";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@@ -2003,12 +2015,12 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
- version = "2021-02-26";
+ version = "2021-03-17";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
- rev = "088469a8eeffe421d522e953c4b49de486a0cbce";
- sha256 = "0vwz33ffawazdk6dsmd6m2fiygi9sn7xn601bzfcgf73z1sc41gh";
+ rev = "8763462331600951f2d9e729c4d8e26b6049c804";
+ sha256 = "0rfrqsgpy501k0cy01br2rrlrsxls73yrhfhnsiafdi3dw6x9anj";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/davidhalter/jedi-vim/";
@@ -2064,12 +2076,12 @@ let
kotlin-vim = buildVimPluginFrom2Nix {
pname = "kotlin-vim";
- version = "2021-03-08";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "udalov";
repo = "kotlin-vim";
- rev = "4188c157147fa1f3104edac7f52b41c8f18c6d8b";
- sha256 = "18kb56lwn3xl0xq4h34hr3z3ja1phbjpaxk6281d38wkj8randk8";
+ rev = "4e94ec5d3c821daaeac40c4d243cb55d07924fd2";
+ sha256 = "1vj3pcxn1byggbfqv2k5m09cwpbsphivdbzpw8qs111hda0cv61s";
};
meta.homepage = "https://github.com/udalov/kotlin-vim/";
};
@@ -2208,12 +2220,12 @@ let
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
- version = "2021-03-10";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
- rev = "0618a099fa7895c5d25b80cc1bea948ebdc64a96";
- sha256 = "1k2kz3475f15n1y7dkac45fw4mbr33fgbf2j7vmlshb4796j5fw3";
+ rev = "4b59e0470c4b9b359a4f6229c420686d6d8ea65f";
+ sha256 = "0fbzkmargimal2xyjsyrc6kmw6gdl61hcf17arqp9wv3yn18k637";
};
meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
};
@@ -2232,24 +2244,24 @@ let
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
- version = "2021-02-28";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
- rev = "9cec4e2329324366801e1272305be907d141d77c";
- sha256 = "1xz36jrm3iql6xgznycwf8mxlaw05f788k4p9xbvcrh3i0zck1za";
+ rev = "f1feb5b3b9d1b13ccedae475e9346392e17895a4";
+ sha256 = "1wki7q6w6ld1lx792f62s8k72ikcdl6il3ybsxxlajmnj5mixvkg";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
- version = "2021-01-11";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "itchyny";
repo = "lightline.vim";
- rev = "8e013f32f524157bf14ccaa87d97be3d3a7201e2";
- sha256 = "0yl5r1dv91wzkgflh37fd52dinwsm4rcf4kfizn4xg5lbzdafkmn";
+ rev = "8a712365f9708044667589d9fffd87a4825d29f6";
+ sha256 = "1622qd5lizfv65m5iy3r0bl3zy8phh4anyx93kj631p836s8y6cq";
};
meta.homepage = "https://github.com/itchyny/lightline.vim/";
};
@@ -2268,24 +2280,24 @@ let
lispdocs-nvim = buildVimPluginFrom2Nix {
pname = "lispdocs-nvim";
- version = "2021-02-22";
+ version = "2021-03-19";
src = fetchFromGitHub {
owner = "tami5";
repo = "lispdocs.nvim";
- rev = "2410236d448aa8f407f6a203d90282c34d48b52a";
- sha256 = "0kkg7nbnqj1v46bqq73l58m743p0p7jcbgpscjb16n9ab0n8jqns";
+ rev = "ff82d3668497e4520e195748d295cbe9513086b7";
+ sha256 = "03698f1lydnql9xi0a1iggpqv3001yn390z9j1hvpwmra3k7lnpg";
};
meta.homepage = "https://github.com/tami5/lispdocs.nvim/";
};
lsp-status-nvim = buildVimPluginFrom2Nix {
pname = "lsp-status-nvim";
- version = "2021-02-14";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "lsp-status.nvim";
- rev = "925acdab0886fe5f0752561ea49e95b9f02e09c7";
- sha256 = "0rd3gqgz573ll11wnw1r182siamc3cxqqf3cyhqznkiq7bw2g9xh";
+ rev = "0aaf6a68e8668c1baa724c0d31679ad12f27cd47";
+ sha256 = "08dlfm3f9qa4p77zznmgjrmx09yngpcfzmxmyc5z3gp51b6bbixb";
};
meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/";
};
@@ -2316,24 +2328,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
- version = "2021-03-10";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "80c29017e9897280273473956009cc641a0b3709";
- sha256 = "1n08g56qiqq150hkihbwdnij5p1gipfddxh49vh8gs6jq7xk2vc5";
+ rev = "855a8d816fa4fcd4cc378b32585474bf407812eb";
+ sha256 = "1f440mmc6j2ybp86vaxwc0icvxl3l00i3vbr12knbcf2p3aigkm9";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
- version = "2021-03-06";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
- rev = "332f488e2499d0f7a09276adcdd50995b348f7de";
- sha256 = "184csjlaizgd1fi7f3w6j67qvy1cg9sqiy5zjd1qy010bfl1cl46";
+ rev = "62c22d0f05c79a1bc890b15c1a1a5a0215936e2f";
+ sha256 = "1j3f4i48bi54ck14sv8vnknz68v21jggf1gw8p7vq77h08il7gbi";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@@ -2400,12 +2412,12 @@ let
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
- version = "2021-03-05";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "df3bef57602e9633151c9c4a0ab2b48f1c0d5abc";
- sha256 = "1v4k8nhss8asg2p5jdxkjaqg3z7w1byzxi62vl4k1wkzmp5afpnf";
+ rev = "31e22971ba5f5f3e5955fa8e2247b6cd22c3f7b1";
+ sha256 = "19hg4nnwdr6mj9wyrcapg91vm2bzvcsfbvjkirdsxp2v3ca83w2i";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -2712,12 +2724,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2021-03-03";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "974f8c51385710a1422e841372848308ca7e615b";
- sha256 = "1n0y4gsjbh4yc5b1smckzx7gy4kzavdp7dpaic03adf23akndm1i";
+ rev = "84768d4ab4df212c7fe96785a007382218e0fc56";
+ sha256 = "0z86l7bwr6s3rmamhjyy5hg51f75ca2laki3pwpczfhllxbnwax5";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -2856,12 +2868,12 @@ let
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
- version = "2021-03-01";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdtree";
- rev = "f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2";
- sha256 = "1lm4dqp8rxr5sl6faxyncz5jibkgzjwjxadvgcja81wnm71sr0xa";
+ rev = "81f3eaba295b3fceb2d032db57e5eae99ae480f8";
+ sha256 = "0zws0b20n8ak2s3hffsb0rrwdjh8sx3sgrilmmmvr0d2ivsfqwlb";
};
meta.homepage = "https://github.com/preservim/nerdtree/";
};
@@ -2890,6 +2902,18 @@ let
meta.homepage = "https://github.com/fiatjaf/neuron.vim/";
};
+ nginx-vim = buildVimPluginFrom2Nix {
+ pname = "nginx-vim";
+ version = "2021-02-25";
+ src = fetchFromGitHub {
+ owner = "chr4";
+ repo = "nginx.vim";
+ rev = "7b8e3ef48d8e60fe64bb1a85be52e66dd412c84d";
+ sha256 = "00n3kx4gczryx968n0l7hqdxg6i4vfi3n3m4bdl5d3rwpbwdy6zy";
+ };
+ meta.homepage = "https://github.com/chr4/nginx.vim/";
+ };
+
nim-vim = buildVimPluginFrom2Nix {
pname = "nim-vim";
version = "2020-10-16";
@@ -2914,6 +2938,18 @@ let
meta.homepage = "https://github.com/tjdevries/nlua.nvim/";
};
+ nnn-vim = buildVimPluginFrom2Nix {
+ pname = "nnn-vim";
+ version = "2021-03-22";
+ src = fetchFromGitHub {
+ owner = "mcchrish";
+ repo = "nnn.vim";
+ rev = "6408b859f9fac3880d82109d25874fb6656026d9";
+ sha256 = "0r5s89882hj54qyi5rcwmf8g54jkjmap5c2rd2mhfjs3j4dfny72";
+ };
+ meta.homepage = "https://github.com/mcchrish/nnn.vim/";
+ };
+
nord-vim = buildVimPluginFrom2Nix {
pname = "nord-vim";
version = "2020-07-06";
@@ -2940,12 +2976,12 @@ let
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
- version = "2021-03-10";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
- rev = "497d8f8ddc4e7ed339c8afbbfe80fb6a57743297";
- sha256 = "012vnr7s7y3vv3n3fk10yxm7khwxnn7mjrkiixhrjq3lp4cai7xi";
+ rev = "18b21cd97d8675d0a37ea7a0de1b767c51418f19";
+ sha256 = "18gzdax70hcjs7ckfq6c4b0kplh9q5fsay9hwz5kyqym28ndrvx3";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@@ -2964,28 +3000,40 @@ let
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-02-08";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "1596756a90114cbe25d0f383825a1ae2145b459b";
- sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd";
+ rev = "b8272f539017ffb6de6a05247e7c333b3721279b";
+ sha256 = "11ng14pb14l0hsv27r24wwkjkw2l77kvd114pij3k5dl8b9zdgv2";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2021-03-08";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "0e772b3ffb16ad1b712fe72c95b3b2bddc2c7ade";
- sha256 = "051nly6h78cmx79nppxi86jchdjn90l3q96fx4g99pkgivsbswad";
+ rev = "ba1acb0440e3ddc96b1835ce89d910bae216e98b";
+ sha256 = "1kx5a5zngk8bw7qsklmhzvwqpc0nnhfcj9wasp28dayh3f35m5s0";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
+ nvim-bufferline-lua = buildVimPluginFrom2Nix {
+ pname = "nvim-bufferline-lua";
+ version = "2021-03-22";
+ src = fetchFromGitHub {
+ owner = "akinsho";
+ repo = "nvim-bufferline.lua";
+ rev = "437aa7cacc8eb6b7840e298f55666f4a6dea20e7";
+ sha256 = "15df8l8mx9cbm5mirn511d965nlxh5gj17d0b6rffxjlzc5ciai3";
+ };
+ meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
+ };
+
nvim-cm-racer = buildVimPluginFrom2Nix {
pname = "nvim-cm-racer";
version = "2017-07-27";
@@ -2998,14 +3046,26 @@ let
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
};
+ nvim-colorizer-lua = buildVimPluginFrom2Nix {
+ pname = "nvim-colorizer-lua";
+ version = "2020-06-11";
+ src = fetchFromGitHub {
+ owner = "norcalli";
+ repo = "nvim-colorizer.lua";
+ rev = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6";
+ sha256 = "0gvqdfkqf6k9q46r0vcc3nqa6w45gsvp8j4kya1bvi24vhifg2p9";
+ };
+ meta.homepage = "https://github.com/norcalli/nvim-colorizer.lua/";
+ };
+
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-03-09";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "25170751944b64bb7b65af1e35772361485bc936";
- sha256 = "0vaw5g4iflc0k1xy51rhgn1kb4qzxdd92r5nhnwvbc3fr6xkn464";
+ rev = "a39284243014c1414134b99ee2f7ae1fdd070273";
+ sha256 = "0648gz8rc6l79hg3xqkr0049fn762v7rcyvq50ya81ljrs2jl004";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3024,24 +3084,24 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2021-03-04";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "9d2a8bf00b26c2acafdf921f3c81ee2283e5daff";
- sha256 = "1qma3cnh7hm81qpx1x8zx5qbqjh4m0c7n7x7622vs4c0698j9nqc";
+ rev = "cd0afafc788f9d4d9df5fef5d348841906b295d6";
+ sha256 = "1zh35qjxmkf37khagn8722byzjq2pns20cbmc821hfqdkj6q3pc8";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
nvim-dap-virtual-text = buildVimPluginFrom2Nix {
pname = "nvim-dap-virtual-text";
- version = "2021-01-31";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "nvim-dap-virtual-text";
- rev = "3da747bbbaf3291838d984a26a423cc704794eca";
- sha256 = "1lmcjclvdhd4jq0lsgrzv7y7ry9yiqh6bsinwrla5fbh63rfwkzc";
+ rev = "b26acb69a5a4940f9eb3fd6f4bca8e1cc16fa5ce";
+ sha256 = "16dkgmcfdx1n72khlwrcykwwpcjzz2mdh7dc53vb4j0pbmqmnna2";
};
meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
};
@@ -3072,12 +3132,12 @@ let
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
- version = "2021-03-03";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
- rev = "3ce138f52ba5fb8731899bcee0323594bf0aa7a0";
- sha256 = "042x1s1xqv81ym1jblhpm6ak8nf6s9pax6g340nac639x34zm7bh";
+ rev = "fdce47e0bd9669e2424cc2a0112ecb47ba571d13";
+ sha256 = "1dn9wr23dizhs7byrim9zd3yi22g629jc2aqfx0q1v1i2i9g107v";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@@ -3096,36 +3156,36 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-03-05";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "8ff60d5e91fe2a4c1dedc6685ef7722e8e7bce78";
- sha256 = "1gaw6pcvgw31dkdpni708l3kcyw3fv3fk05fn3cgs0sdn4xzmnkj";
+ rev = "b29410eff3459fc415048cd5569ad03d5e959296";
+ sha256 = "060ig6w3lhfp4lb83hmk7v33mfk6k5hs8ifpx5fvxk0v5g0cd9g1";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
- version = "2021-02-18";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "kosayoda";
repo = "nvim-lightbulb";
- rev = "37d427ae1635da7800f7f09f831b35df1185ac38";
- sha256 = "012hd5xpcmmvgxrk6m7m28q288v485w7nzvnayfl4s3dk4jzq8rp";
+ rev = "9c3b264ae2da1d984f0482d5a0dfa43f567fa064";
+ sha256 = "0yjxmnn3a7fw0fjwfqk284zshlw8v7wp8pn16d5m40rvbkk2ipzr";
};
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
};
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-03-10";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "11a581d1860a7ad2b6c1ee1e0ebbb000e81b9950";
- sha256 = "0khbp05sgz07sazgkmv4pwrnnisswkagx4gwkw9slawm4qb1k93j";
+ rev = "f9785053a4ef4aaa2d0aac958bc09a1a289d2fbf";
+ sha256 = "182ys6zrwjw1jqs6rjqz3lbv51jw0ija5jmrpj4rs7psin7mcx0j";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3142,26 +3202,38 @@ let
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
};
+ nvim-nonicons = buildVimPluginFrom2Nix {
+ pname = "nvim-nonicons";
+ version = "2021-03-18";
+ src = fetchFromGitHub {
+ owner = "yamatsum";
+ repo = "nvim-nonicons";
+ rev = "f136ab905ac99c9bd20a8bc4c470eb33768c54a0";
+ sha256 = "1590gszcra3pagva6zplib35fqlgj26masjq3i6qgq85kpx5s55j";
+ };
+ meta.homepage = "https://github.com/yamatsum/nvim-nonicons/";
+ };
+
nvim-peekup = buildVimPluginFrom2Nix {
pname = "nvim-peekup";
- version = "2021-03-06";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "nvim-peekup";
- rev = "b88638d1067364965c214860cc2e5048caa617f7";
- sha256 = "17hc37f7gm1wbrj6mzq3walb1a5km901viq0nx8n93r957sj98dd";
+ rev = "11b7719ab73a7d69b081b129927c6dc8638518c6";
+ sha256 = "1y9ff1plfd592jdy4v0m9ivkg293fjmz5ssaf20hmx4x5rlz871l";
};
meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
};
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-03-09";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "16c7c64872d4e6634cd5cf2d7db63474b2e8beda";
- sha256 = "15ig6x9xdl4gz9yvnhhxic106h03xxm95sd6kgmjpdpvibnv448n";
+ rev = "902f24503ab7a754be2a1c483de1cd3428bd85ec";
+ sha256 = "0b31lpzdx1z88fm60p7d5gs442h4apm2n9h098n4j0ghcs5ppvnf";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -3178,86 +3250,98 @@ let
meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/";
};
+ nvim-toggleterm-lua = buildVimPluginFrom2Nix {
+ pname = "nvim-toggleterm-lua";
+ version = "2021-03-23";
+ src = fetchFromGitHub {
+ owner = "akinsho";
+ repo = "nvim-toggleterm.lua";
+ rev = "84980bd3f549821fe58d1821fdc1e7c54d1ebf3a";
+ sha256 = "09dcajyfbimfzgxj57c988rqr6y6ah4p97j04gyvg1mrvlj95dg4";
+ };
+ meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
+ };
+
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-03-09";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "31ef294d05e1feeb5eb9e8ff3895d09cc93d95e4";
- sha256 = "0vcgvwcibqq5j59nw09z2mc0gb79nyhiwnxny81h0m56mn2v9a6r";
+ rev = "e0b9882a8a8ecce8b58076091217d3643f215da3";
+ sha256 = "1i8mqa45gg0lagcd4q5qwp97zlynkdw42ajw0wh8r92i5bs9crd8";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-03-10";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "3b8c2ea492917fcb3c0e88ad6682dbd355cc0644";
- sha256 = "083ysgl1xwlfm2ri54m4qr17rvm6a5al95ybzzff6av699v632rb";
+ rev = "88ac3d23653a27973be8ff60e500848cacfcf968";
+ sha256 = "1diy0j045kcr38nwi641ccq89bzahfacicny2zphyrml1ff7hgff";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2021-03-10";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "romgrk";
repo = "nvim-treesitter-context";
- rev = "ff4955b250eebc320d32d6459297117004c68d3e";
- sha256 = "0qmhk6mdx00cf0vnz57n512ddifh08js7paxg9qsha374xqwq715";
+ rev = "91869ed307084836e45abcf63a4fc0aee66a2d6e";
+ sha256 = "0z8fxqhnmwldhjdx7z6yzlngisc8zjfsr9n76iz9c20brrazsp9k";
};
meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
};
nvim-treesitter-refactor = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-refactor";
- version = "2021-03-02";
+ version = "2021-03-17";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-refactor";
- rev = "c87b8ecd7ae2d337499df9f2e70400250c921ca9";
- sha256 = "17z9p6vkpw264cbrh9napkqkqazlp90yv0qz7j6w6ac4z5mgv0mp";
+ rev = "edf1790d9cd365785d4f86848c079704aa7e4854";
+ sha256 = "12rp2mj7va5qf55jzca0rgy1xrwkyf7p3zd3xw262m9lqm4hjqqc";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/";
};
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2021-03-05";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "ffe8dbb0f6ab22ed746ef753535a849e3147d914";
- sha256 = "0bq3416v9wijcx1jw5nqvjgn8md9fr4hgnm7pnf16dyrpvmihf4m";
+ rev = "29b9e29cef885293ba02a590ba1f6618df8c3018";
+ sha256 = "0gnpkdglm2y35n6ffmb0mj70j7ka94x8y2xl46z5d3312iimi30c";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2021-02-12";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "3557b7baa9e773fff378235851cb3caac96fd4b9";
- sha256 = "14bz6xwwdypwxfxdxhmbwl0w04ys18l08s1dx40mm5l1627wh465";
+ rev = "8714eade54870231b1df247453a5535a40b0a7b4";
+ sha256 = "192376c6nbx5kgj96wvpmds7ird8hfk4v8ayg1gay18vljyszxj9";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
- version = "2021-02-17";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
- rev = "b840a1f0fc35019998e6f09dfdd8dbb241764458";
- sha256 = "1q3a5ivlvk7ni5b9jxhymdrdssnxhisb6cq07rdwrh1kmfzv90yz";
+ rev = "6e32d113d848c76ddbcc824038244657f170a97a";
+ sha256 = "02m8bsq7172sm9vkq3shh87xv4c3jxkgvhwhd3vv0na86kl9sqd6";
};
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
};
@@ -3312,12 +3396,12 @@ let
one-nvim = buildVimPluginFrom2Nix {
pname = "one-nvim";
- version = "2021-02-17";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "Th3Whit3Wolf";
repo = "one-nvim";
- rev = "60970d279f5f2a82b1857601c63e6a51f9fd04de";
- sha256 = "1kmjq4kjlflhagasr3n2l47mmv739rwz9bqbzyyv5skxdkkp95lw";
+ rev = "b1461ea89c940bdc5ed142327e1cd85ed2c0e877";
+ sha256 = "1w5avzyrcbg60prx3239iazcjvh2mk7lk6k256a1iyxb6dnkpbas";
};
meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
};
@@ -3348,12 +3432,12 @@ let
open-browser-github-vim = buildVimPluginFrom2Nix {
pname = "open-browser-github-vim";
- version = "2020-11-11";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "tyru";
repo = "open-browser-github.vim";
- rev = "ee132b0f8ea180f996a2e34c5e977d23c615b47a";
- sha256 = "17da42h05840vv8n4sj0im4rc18g2drb9sh0grjlpnz86mc8fqj0";
+ rev = "ac7c034e300f36d591ef234dcd5eb5cd5c07c74f";
+ sha256 = "0n62h0gjakdc3bnpysny0rndhqhq7g5c97pgr42wz599wnr1pily";
};
meta.homepage = "https://github.com/tyru/open-browser-github.vim/";
};
@@ -3372,12 +3456,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-03-08";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "6a169bec7d15d24c1d680fb75aa24a2921829442";
- sha256 = "01z192y61vls455hjp6im87mzbngyhpn78mpf80c445anpwpb0xf";
+ rev = "df33faeef884d55ca8f97479ea55b8d9bd2ffb3f";
+ sha256 = "1pizzzmb551c2pr0srw27ya8a4awfgq14k2dswmk8i8vra54vsj6";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -3456,24 +3540,24 @@ let
playground = buildVimPluginFrom2Nix {
pname = "playground";
- version = "2021-02-17";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "playground";
- rev = "444eab728ecaf337629a45a733535e94a3efc04a";
- sha256 = "0r10fmk90wdc9hj3kdfkb93vvw1kdxwkl20f9zs3rfs5vs7p9i97";
+ rev = "d96cef521d22afd1a409449a890f20f50b436ee1";
+ sha256 = "1j1iqzi9q8fnl02hvazl8szg84iz8dqy0n52ngh1lvl78s9qa393";
};
meta.homepage = "https://github.com/nvim-treesitter/playground/";
};
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-03-10";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "8f2babdd1bb76c2df0a1ef307bb9fe8477d13727";
- sha256 = "14c57pxhq4da8svi11rbzsg3rygcnly7cwjzzhpg2a9id1xxsppq";
+ rev = "2768ba75b32389a460273fab6f45575237b97bc2";
+ sha256 = "14l47j8j5idm170vk92j72ndmkkn0gqjp709yb1b731nsnz9wcjh";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -3492,12 +3576,12 @@ let
popfix = buildVimPluginFrom2Nix {
pname = "popfix";
- version = "2021-02-08";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "RishabhRD";
repo = "popfix";
- rev = "efcd82cbae750aa743619bfae7453fbec9366b87";
- sha256 = "0041c9xnnhw24ablwqw9p9vlcmbfrp9l9r6i4ayh8id666ylsln9";
+ rev = "f3571e676739208871bd38f9fa0fddf554b6a7a8";
+ sha256 = "19hvwxcqca8l6dvlaccfvqc8755bpr0z0hi7l9qiw6rm458bhchi";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/RishabhRD/popfix/";
@@ -3683,6 +3767,18 @@ let
meta.homepage = "https://github.com/chrisbra/Recover.vim/";
};
+ registers-nvim = buildVimPluginFrom2Nix {
+ pname = "registers-nvim";
+ version = "2021-03-21";
+ src = fetchFromGitHub {
+ owner = "tversteeg";
+ repo = "registers.nvim";
+ rev = "ba84c085ca868515520310073d922132fd811a24";
+ sha256 = "02qadqyppn7w2ssc7m7zqr5s9iknhj0fbg88w2mdn7s4kcf8jyim";
+ };
+ meta.homepage = "https://github.com/tversteeg/registers.nvim/";
+ };
+
Rename = buildVimPluginFrom2Nix {
pname = "Rename";
version = "2011-08-31";
@@ -3731,6 +3827,18 @@ let
meta.homepage = "https://github.com/mfukar/robotframework-vim/";
};
+ rspec-vim = buildVimPluginFrom2Nix {
+ pname = "rspec-vim";
+ version = "2020-08-20";
+ src = fetchFromGitHub {
+ owner = "keith";
+ repo = "rspec.vim";
+ rev = "e49d306de952c2195233b83f9ca9fa94e19affe4";
+ sha256 = "0445abk039qlhk5s9jm5hawfksds5dgshb1lspvfkz8slk6m076z";
+ };
+ meta.homepage = "https://github.com/keith/rspec.vim/";
+ };
+
rtorrent-syntax-file = buildVimPluginFrom2Nix {
pname = "rtorrent-syntax-file";
version = "2016-03-19";
@@ -3841,12 +3949,12 @@ let
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
- version = "2021-03-02";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
- rev = "3a3210c8f1c4edf884a853631e641ea7c309cea0";
- sha256 = "04x1jfshk2j4mr7l9bybpk2q64ilgh1yf20qjw1fzdh5l395dv6q";
+ rev = "171d6a39eb46973b229aaf1d88691e40d45f64ad";
+ sha256 = "097f0il1dcn2kshsngvklgwlhac86cjwxxagqvcz3yiaa1qpzhlp";
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
};
@@ -3913,12 +4021,12 @@ let
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2021-02-28";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "86298232f4f5ab418d5d9d18a336d7ab8b167b68";
- sha256 = "060k664gm4857nfmxaj0v6sz50mb3y9v8489jnv1bhqplzqf8gmy";
+ rev = "78f1b14ad18b043eb888a173f4c431dbf79462d8";
+ sha256 = "0spnpzr874ad9jpawcgydfm242wq55ychcky14f1qa09svsrdiv0";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@@ -3937,12 +4045,12 @@ let
SpaceCamp = buildVimPluginFrom2Nix {
pname = "SpaceCamp";
- version = "2020-05-14";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "jaredgorski";
repo = "SpaceCamp";
- rev = "23c7a3948cd1861150346762a002dc7fa196c616";
- sha256 = "1sbc9ivczkyfylhk1n4sm2sqzp8vddw03k0xb6z8k475n5vm8mvq";
+ rev = "ce034929763903937396cf6b2c9912eb209e6b39";
+ sha256 = "07a1441gccilbhnk99lz66nvaiv14vdn34ink3jjd27d2mkf3skb";
};
meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
};
@@ -4118,12 +4226,12 @@ let
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
- version = "2021-01-04";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "vim-syntastic";
repo = "syntastic";
- rev = "d97a664b9adbd1a0a9cba6c1c3baf071a1059d1e";
- sha256 = "1azranlzdm1w98ifmczp1zx1w66yrpdi9h3k05v126rwaqkd6bsj";
+ rev = "f2ddb480c5afa1c0f155d78e6fc7853fd20f0420";
+ sha256 = "05ca80alkhnxj1klyy729y81g9ng2n841djxgd7zjg8cpkk94kw3";
};
meta.homepage = "https://github.com/vim-syntastic/syntastic/";
};
@@ -4166,12 +4274,12 @@ let
tagbar = buildVimPluginFrom2Nix {
pname = "tagbar";
- version = "2021-02-18";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "preservim";
repo = "tagbar";
- rev = "51ff7a05404e2f5c83799dd6c38134ed4aaca85c";
- sha256 = "0i7qzn3vlvjjd5qvf230r7aaqz84rn30zkn643fdvpni7pxfywdv";
+ rev = "f6012cb65da4bda46b0779a36840df36ad01483e";
+ sha256 = "08vb3ffm1f47q5gxyqmmfv75x12001qpkqml7v612wnnfpclcqf5";
};
meta.homepage = "https://github.com/preservim/tagbar/";
};
@@ -4214,12 +4322,12 @@ let
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim";
- version = "2021-02-22";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
- rev = "8b584bd88fbbeac0ce5c52af1ce7c1fecb7155b6";
- sha256 = "0a6sz6gx1qnr0ka9510mchca3b94553liw8ng386h60kh6lbc1k5";
+ rev = "926fbde059d6a7cefcccdd92b40fa866e073ba41";
+ sha256 = "100zi9ncz2b6hb5y9hxcsj5ra81kq8j2b4y8ck56y4yg96yi03pd";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@@ -4251,12 +4359,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-03-10";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "add7ee394350f268684cff03d844f32f255fec47";
- sha256 = "0rfrgfx9xm02cy4dy40n4j90561ymw1pyqzzw4fawpajm3hmxcfv";
+ rev = "a7fa60411efbfddc0674d65346a5311e33f6deb1";
+ sha256 = "0g8rp6qx3n43ipycav5jrhzbd5p3kp9cmcn277yn81y3f76sarij";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -4335,12 +4443,12 @@ let
todo-txt-vim = buildVimPluginFrom2Nix {
pname = "todo-txt-vim";
- version = "2016-11-10";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "freitass";
repo = "todo.txt-vim";
- rev = "6845221d45bd62e604c2024bc511a56e79d1118b";
- sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v";
+ rev = "ed9d639de2e34eafb82f2682010ab361966ee40f";
+ sha256 = "1vw4vhbgxnlkl5m5y55xk81vrknw35s01dw21s815i8clp38zr7i";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/freitass/todo.txt-vim/";
@@ -4432,12 +4540,12 @@ let
undotree = buildVimPluginFrom2Nix {
pname = "undotree";
- version = "2021-03-05";
+ version = "2021-03-18";
src = fetchFromGitHub {
owner = "mbbill";
repo = "undotree";
- rev = "1dce5c869f2cec23b6bcc0b40330e358ada9f37d";
- sha256 = "198bvd54m8dvhj0jwfzkws35fw18cc075023c8hirplbsgyj6msm";
+ rev = "da7aeb3dc307a2995b6b761fe94cad61da9845e0";
+ sha256 = "1mg9r7kc4jpbmh8b0wcax82a80r0qjl2yq61cc55x7i91wssrj60";
};
meta.homepage = "https://github.com/mbbill/undotree/";
};
@@ -4516,12 +4624,12 @@ let
vim-abolish = buildVimPluginFrom2Nix {
pname = "vim-abolish";
- version = "2020-10-30";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-abolish";
- rev = "68bc80c88617672fd41da7a6ace87d29cd3fe1e3";
- sha256 = "1cgaf8nhprm8sligmq4km2p374a2x08fg3isl1k0mac1iz9vz1z8";
+ rev = "3f0c8faadf0c5b68bcf40785c1c42e3731bfa522";
+ sha256 = "1w9zim2v1av3f43z8q7zh0ia8dgjxjwnvmzd4j3y25vy25avn0lb";
};
meta.homepage = "https://github.com/tpope/vim-abolish/";
};
@@ -4864,12 +4972,12 @@ let
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
- version = "2021-02-10";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "Chiel92";
repo = "vim-autoformat";
- rev = "2a6f931987c1cc5e5bc0c4c44f21ac9bd4c72f3b";
- sha256 = "17w0cjzppx9zxrqxaa975xazcnps4v1b93bmy19dccvc7z1gipby";
+ rev = "e9104aeece94652b064a15ae220bd4926a715dbd";
+ sha256 = "1kvnmzs1wbqaiswsjra13f06m8dpdn62h8zqrnr9vv13rm8a2326";
};
meta.homepage = "https://github.com/Chiel92/vim-autoformat/";
};
@@ -5044,12 +5152,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-03-10";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "c558950fa5e1aaa9fe4652b37380fffb762fdd09";
- sha256 = "0z0k1596a2wj1ynr4jbh0s53drrkmx1r4ff0ji7scx1jihxpfjqp";
+ rev = "fc5060933e9f35a107d1646c90d4e1216301ab48";
+ sha256 = "0g36p0wqrvm6v4ga64z84jri5c8n5hq6y7f5yig7kszk01wvc6hh";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -5092,12 +5200,12 @@ let
vim-closetag = buildVimPluginFrom2Nix {
pname = "vim-closetag";
- version = "2020-10-09";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "alvan";
repo = "vim-closetag";
- rev = "bd6bbc33c7e178673aa1dd17a5d249bbd4e3a6a6";
- sha256 = "0nqzjma6mqg19cxq0ck2lym51ajb1x97z497zf9pbp47hkg5875j";
+ rev = "c0779ef575d5c239162f4ca3506cfb4a95d45a58";
+ sha256 = "1mkn6d7m23ak06pl8i328hd9x6qx5fzrg8ijz32lgd4a56k98n6i";
};
meta.homepage = "https://github.com/alvan/vim-closetag/";
};
@@ -5176,16 +5284,28 @@ let
vim-commentary = buildVimPluginFrom2Nix {
pname = "vim-commentary";
- version = "2019-11-18";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-commentary";
- rev = "f8238d70f873969fb41bf6a6b07ca63a4c0b82b1";
- sha256 = "09d81q9na7pvvrmxxqy09ffdzsx5v5dikinb704c9wm4ys2bidr9";
+ rev = "349340debb34f6302931f0eb7139b2c11dfdf427";
+ sha256 = "01lpfcn2hmvxddcf97f4qx5vksxj1hwrxb0c8ri59z9lb9z2hgjd";
};
meta.homepage = "https://github.com/tpope/vim-commentary/";
};
+ vim-concourse = buildVimPluginFrom2Nix {
+ pname = "vim-concourse";
+ version = "2016-11-21";
+ src = fetchFromGitHub {
+ owner = "luan";
+ repo = "vim-concourse";
+ rev = "7f61ca5d291fddd6d7ff04b03bf347f04bfe4344";
+ sha256 = "0ilf7r0lwx8f7shqxbs9av3gsnary8nbh3xhrfzwsivh8psi7qf6";
+ };
+ meta.homepage = "https://github.com/luan/vim-concourse/";
+ };
+
vim-cool = buildVimPluginFrom2Nix {
pname = "vim-cool";
version = "2020-04-18";
@@ -5284,12 +5404,12 @@ let
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
- version = "2021-03-10";
+ version = "2021-03-17";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
- rev = "c1f00249cb47dae2457ae8b748284620b622e642";
- sha256 = "0s4srsnxqw0g5k75cqcy709x7jqipsfsvhsic2cj0b0y8m49wqzz";
+ rev = "8d9dd450941b98df3f333923b807f799b8088f63";
+ sha256 = "1m0dlvz3ah54wwc5ahhjv4ynxp7crxl3092fspyzgr5fl2p94ida";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@@ -5380,12 +5500,12 @@ let
vim-dispatch = buildVimPluginFrom2Nix {
pname = "vim-dispatch";
- version = "2020-04-19";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dispatch";
- rev = "fe6a34322829e466a7e8ce710a6ac5eabddff9fd";
- sha256 = "1m0dfm8r3d8zph6i4ln3jqfzs8hxbkq9rvxpij1m2vvk2hgy2nf5";
+ rev = "895c8fa958018fa3366f0e70a18cfeb73a204588";
+ sha256 = "10q8xgbds6r34ka004qvzd3nkkqv8sas5ca7vx0jwvyhglijy644";
};
meta.homepage = "https://github.com/tpope/vim-dispatch/";
};
@@ -5620,12 +5740,12 @@ let
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
- version = "2020-10-30";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fireplace";
- rev = "433ff6468d8ee0be5cbcf5bbd940f9ce2acf0f79";
- sha256 = "1mjiwzl631v4yxgfbvgc66rxbyn3w1shy7836ksd2xnbd0m6kx8h";
+ rev = "e04a615e72ec2e216116b5c6514ac4d86b21ffc3";
+ sha256 = "1q17xlwprkvx27fbb9xg1zh5nyx8gif3pp6p8vd3r6zhzqqdl469";
};
meta.homepage = "https://github.com/tpope/vim-fireplace/";
};
@@ -5680,16 +5800,28 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2021-03-07";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "7b0eb92e72a6d6aef3c31faa868e2d2a4af81951";
- sha256 = "08sf9idvrjqf6bvi5p98w8fj2r7c1czkvsyfjch77bwr20gdf2wy";
+ rev = "ae7eea5c5c6c082fe66410e72306b5b1bcb693dd";
+ sha256 = "1lvaww22rj9jnd8b8fjcaclvj8n6vqc390l3z5d7ivm6fc5h1k1j";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
+ vim-flog = buildVimPluginFrom2Nix {
+ pname = "vim-flog";
+ version = "2021-03-07";
+ src = fetchFromGitHub {
+ owner = "rbong";
+ repo = "vim-flog";
+ rev = "904b964eb0f878e44f47d39898e72fc0b939756b";
+ sha256 = "07x8xafcvpg6dgxlvmf46gh7a9xvnrxj7i326q73g3yfh5xpma6c";
+ };
+ meta.homepage = "https://github.com/rbong/vim-flog/";
+ };
+
vim-flutter = buildVimPluginFrom2Nix {
pname = "vim-flutter";
version = "2020-09-14";
@@ -5728,12 +5860,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-03-10";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "753318ef83b685f32c6bda5ae5b65b7b239a29a7";
- sha256 = "0g3l1hb4nqwaz5hhagr6hy4nwv1n1qcwbak27s5sx9fbnsp6npaa";
+ rev = "7de9b5a04b9ab63bba381d3cc2c48331ba8e4e7f";
+ sha256 = "0d33gzblnz4gzd6grfmyb5rfp59jcj86n95ajwn9q2d4snk45h4n";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -5776,12 +5908,12 @@ let
vim-git = buildVimPluginFrom2Nix {
pname = "vim-git";
- version = "2020-07-13";
+ version = "2021-03-18";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-git";
- rev = "4be54a3e2e300a94f6f7dfa7a6ee9e81245c9886";
- sha256 = "1061l9igdywfbqgwpf2f25yby78phb512hjbyzvqz5l1p7dw1xyd";
+ rev = "e9058ebb9b9563ec77bc96fb19b2138f6512beef";
+ sha256 = "17wpar2ais3cx1jaak9l8fck7fks2yczn7flcvgfcwvjxd9vyxgq";
};
meta.homepage = "https://github.com/tpope/vim-git/";
};
@@ -5800,12 +5932,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2021-02-22";
+ version = "2021-03-19";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "1283ec1670d1f4fce37213c5d66924088b2e730c";
- sha256 = "1h5jh38ihbyy95cm57ppb6m871010pk521ygss2drcriwnx4agd2";
+ rev = "24cc47789557827209add5881c226243711475ce";
+ sha256 = "0fk8691wkhb7mb5ssmydipb61kh3hjnl31ngqbrbifzsqlkvibid";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -5848,12 +5980,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-03-10";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "95c79dcdcbc7e8e9165fa7f4a6bf17c08a6bab05";
- sha256 = "0110jifwa485l42cjjf3bbrwiahwm1ddijh4jlybchghrx2b64r2";
+ rev = "00c5f2dad170131c0c850dbf331d63ddf515116d";
+ sha256 = "07ckmqxl25hzv10iarj6xdhg65q8450zriqc9wd6c2hlldj45ys3";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -5872,12 +6004,12 @@ let
vim-graphql = buildVimPluginFrom2Nix {
pname = "vim-graphql";
- version = "2021-02-03";
+ version = "2021-03-19";
src = fetchFromGitHub {
owner = "jparise";
repo = "vim-graphql";
- rev = "553d125f7b0e56743e80e2439f5cd7f27771a8e3";
- sha256 = "0nfp411zxjda5k7mh9400rjipqg6liizdkfqcc887zicaw3pylkm";
+ rev = "de5753e3fbd89f2939a43cfc2c6a2313ff129a21";
+ sha256 = "15qy6adhgfwjh6jrw9902hl67qzhdi72kqgzdk5shgfyndzar25g";
};
meta.homepage = "https://github.com/jparise/vim-graphql/";
};
@@ -5968,12 +6100,12 @@ let
vim-hcl = buildVimPluginFrom2Nix {
pname = "vim-hcl";
- version = "2021-02-16";
+ version = "2021-03-17";
src = fetchFromGitHub {
owner = "jvirtanen";
repo = "vim-hcl";
- rev = "047a8643ce346d819ffbd1686fe3ac1a54e42a1e";
- sha256 = "1brwjgxxh8f1q2859lqgdn9jk8h3iip989yirii350kwqvv1wjk6";
+ rev = "d50f93204b606b4ff40a9522be0e8dbf6055b815";
+ sha256 = "0sdaldmdrgha5ij02flsqrc77ijjifdvl8b6pdw24xrpd9j5cwhs";
};
meta.homepage = "https://github.com/jvirtanen/vim-hcl/";
};
@@ -6221,12 +6353,12 @@ let
vim-javacomplete2 = buildVimPluginFrom2Nix {
pname = "vim-javacomplete2";
- version = "2021-01-31";
+ version = "2021-03-18";
src = fetchFromGitHub {
owner = "artur-shaik";
repo = "vim-javacomplete2";
- rev = "fb39c1e6ab815270b9d1ba07f7d34059710b5035";
- sha256 = "1n541shva0c7frihgv0ngg3vqm3d549wbqa15n2n6j1cfpsasbyd";
+ rev = "b01e32ec3d005423d5e6043b18b563086a623dc8";
+ sha256 = "0d9a6ynir9hgl9yp0mh0ng935llj4z9jkd9rvpddskcvq7h5590c";
};
meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/";
};
@@ -6366,12 +6498,12 @@ let
vim-lastplace = buildVimPluginFrom2Nix {
pname = "vim-lastplace";
- version = "2020-01-20";
+ version = "2021-03-20";
src = fetchFromGitHub {
owner = "farmergreg";
repo = "vim-lastplace";
- rev = "48ba343c8c1ca3039224727096aae214f51327d1";
- sha256 = "0m8skd86p2cr0wz8rghj4is3fgnlh7vrw7can916li35i3hajid2";
+ rev = "af91003c4852e94abc508a3c67bb92958c56fcbe";
+ sha256 = "0bjzdli80pmcxp0rfhxkdmwnlq5s61ih7a3h2fybgqrphz87sazm";
};
meta.homepage = "https://github.com/farmergreg/vim-lastplace/";
};
@@ -6498,36 +6630,36 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2021-02-28";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "801572d71ad05683a4ef57c1d35305f566c09bf5";
- sha256 = "02qj2svrdhhazyr8id0crw1qk0030pivdna28xnm9l7v24g7h9hl";
+ rev = "2f0cbbfb8ea8997b408e447a2bc9554a3de33617";
+ sha256 = "1y3r5a5mcjf8dp0pkmhgnbay10hh48w1b3wd795wwbm6nx4izjjq";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-03-06";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "eb237a2cedf2c69a44543d2ffaee25470c53e29b";
- sha256 = "1aldjq32cpbd2gkxqvf6gqskyr4br9835vsap4sgjc2fgigmiyla";
+ rev = "b8e75ef927b48848f3f21b7033aa68c9c88e9392";
+ sha256 = "0c3b7r7vkxcfgznwylj5psbkvrph5qqsifawrxjdjgx2imc7arva";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
vim-lsp-cxx-highlight = buildVimPluginFrom2Nix {
pname = "vim-lsp-cxx-highlight";
- version = "2020-12-23";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "jackguo380";
repo = "vim-lsp-cxx-highlight";
- rev = "f42db17e0917e6011a1d3581c3a8f29efab8ed93";
- sha256 = "0n67ap7zi888xin7c7ag8sk7hjrzg36mlpg42rqfgx66k6dm0455";
+ rev = "00818f0d8b7c87d3a1ecd81cc4ff1ab782355c2b";
+ sha256 = "1pjricwcqsbw466anwcndhj97g6qbblk95jaa8yg3a2fs8gdz8iz";
};
meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/";
};
@@ -6595,12 +6727,12 @@ let
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2021-03-03";
+ version = "2021-03-17";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "4f5619fd1ad2b1aa36536b332b058ef6a3387a85";
- sha256 = "0420fmdjbyi037ghs2g49zzxcpfb2vf6dnn3dk4xivl2af2jrr43";
+ rev = "e477123fcc47cc419d04beee6695d8558272ca8c";
+ sha256 = "0j37dx8ka7qb9wpdx5kqnf6rwmrhpcla1838v97f0dfhljxd4w27";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -6691,12 +6823,12 @@ let
vim-mucomplete = buildVimPluginFrom2Nix {
pname = "vim-mucomplete";
- version = "2020-11-15";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-mucomplete";
- rev = "80b13cbc30d258a4474b053fcdc6baaf199320a1";
- sha256 = "054g80n09mmxxlh8xaic29bn8bgn3clvv732rymljdyvbj1mlhwd";
+ rev = "83cd9b3775438faafc3475f9f9d5fbb8da4dfa5b";
+ sha256 = "1l8rdmy9i81zq2ck0zvlsmqs7hfqpcxa0b8psf5nw72mwhbvv1np";
};
meta.homepage = "https://github.com/lifepillar/vim-mucomplete/";
};
@@ -6715,12 +6847,12 @@ let
vim-mundo = buildVimPluginFrom2Nix {
pname = "vim-mundo";
- version = "2020-12-29";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "simnalamburt";
repo = "vim-mundo";
- rev = "4f8628caebe393ac1b84564e965f894d89a7582d";
- sha256 = "0hmww1xln0rvvi8hy7sv9arjwlp40ks0b07irzqpm5xi93hgyq2n";
+ rev = "c6dcea90166750bb5ed40321749966b1a8020a1a";
+ sha256 = "1bd9xab96m2j6zcp6bh7k958wj95m8w40hczmn2qzpq3cvpy8nb0";
};
meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
};
@@ -6823,12 +6955,12 @@ let
vim-obsession = buildVimPluginFrom2Nix {
pname = "vim-obsession";
- version = "2020-01-19";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-obsession";
- rev = "96a3f837c112cb64e0a9857b69f6d6a71041155e";
- sha256 = "11h7jyg7fhjmq3pmpc93nrsxm175ra14407rs3558h8p04snc159";
+ rev = "82c9ac5e130c92a46e043dd9cd9e5b48d15e286d";
+ sha256 = "0lfcba8sk25l5yp3agh6pwniddf8jx627ikpr8i2z9ary2fqsj98";
};
meta.homepage = "https://github.com/tpope/vim-obsession/";
};
@@ -6919,12 +7051,12 @@ let
vim-oscyank = buildVimPluginFrom2Nix {
pname = "vim-oscyank";
- version = "2021-02-08";
+ version = "2021-03-18";
src = fetchFromGitHub {
owner = "ojroques";
repo = "vim-oscyank";
- rev = "fdbac11f36172d6e47e212385d2f4482e472f815";
- sha256 = "1mbs8v8k7698qnck5n38lqaz8sl07d1p31c84injb460l6jfv1s7";
+ rev = "a4270c71344c146959f166cad14e9f56bd2611e0";
+ sha256 = "027idhv524qqp54scfdb6zbwjwalff80aji6w5q9c02k8hvnc2v7";
};
meta.homepage = "https://github.com/ojroques/vim-oscyank/";
};
@@ -6967,12 +7099,12 @@ let
vim-pandoc = buildVimPluginFrom2Nix {
pname = "vim-pandoc";
- version = "2021-03-01";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc";
- rev = "94b6a23b4c0fb3268408a38badd480d974b0919f";
- sha256 = "1dv33anir1pfnnbvj9alf4g13q58hdppry0hspy1d5kqsr5wfpix";
+ rev = "0d4b68eb7f63e43f963a119d60a3e29c2bb822e0";
+ sha256 = "0p7m75f7vqdm0nvg0p3nbzqnsd7wdvbsf3y2mzirdl7c0pbvphqp";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
};
@@ -7159,24 +7291,24 @@ let
vim-projectionist = buildVimPluginFrom2Nix {
pname = "vim-projectionist";
- version = "2021-01-22";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-projectionist";
- rev = "348e070867d02bd471df486bfbe25e2e2ce13061";
- sha256 = "0fyp1zikw16kzjcs7a6g3kjk74xr46bdhwrwfi9ppfqlhb936kgr";
+ rev = "7d2853e7550e6ff6459096c211a4177303a2e5d2";
+ sha256 = "0qvsm0bd5nbd0dcgcrsa45vxmb4ccsm6yn4j3xiwd52gnyacp14s";
};
meta.homepage = "https://github.com/tpope/vim-projectionist/";
};
vim-prosession = buildVimPluginFrom2Nix {
pname = "vim-prosession";
- version = "2020-11-01";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-prosession";
- rev = "ad008dbdcd04ee1758f4475263c2a37789d32702";
- sha256 = "14fcvghqbv7mx2yi112vc9cq69mw98fgv0vc8x256v639bj1y5g9";
+ rev = "976f3e61c2dd4ab709ea5eccbbab9e42d35d7e8c";
+ sha256 = "01dbiwj1x8rd5yy19cphxysga3fi5l3il2ph8hr1v4adzvw8269z";
};
meta.homepage = "https://github.com/dhruvasagar/vim-prosession/";
};
@@ -7315,12 +7447,12 @@ let
vim-rails = buildVimPluginFrom2Nix {
pname = "vim-rails";
- version = "2020-09-29";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rails";
- rev = "2c42236cf38c0842dd490095ffd6b1540cad2e29";
- sha256 = "0nhf4qd7dchrzjv2ijcddav72qb121c9jkkk06agsv23l9rb31pv";
+ rev = "ee53e8303be8a28234ea97109b4e1ce716f0f2ad";
+ sha256 = "0bjdhkw6ii3z310kjm06g7m03as001cgkzw082mb63kix7hh06x8";
};
meta.homepage = "https://github.com/tpope/vim-rails/";
};
@@ -7339,24 +7471,24 @@ let
vim-rhubarb = buildVimPluginFrom2Nix {
pname = "vim-rhubarb";
- version = "2021-02-11";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rhubarb";
- rev = "964d48fd11db7c3a3246885993319d544c7c6fd5";
- sha256 = "09xpjd96xd0mkzfwyvinjhbza7xp6v66bdrxwkb0j0n1kgfgkx4l";
+ rev = "3d444b5b4f636408c239a59adb88ee13a56486e0";
+ sha256 = "084k5kz7l8hydw072gzjci3nhrfxymszzyk10s5qkq223986vhvv";
};
meta.homepage = "https://github.com/tpope/vim-rhubarb/";
};
vim-rooter = buildVimPluginFrom2Nix {
pname = "vim-rooter";
- version = "2021-03-01";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-rooter";
- rev = "67d51540a4b173d7c77bcf1db9742b3d50e4bf45";
- sha256 = "0a86qb39c5k1h2mi5qsn03zv598776gcvlsrkgw53f3g23xm6rk5";
+ rev = "544e701066c69bbeb45297d0285c2719e125440b";
+ sha256 = "0mj5zvfsi4n8qi8cq0h99j1zb11xmrpkm31ll4q1bm5mf57kbmxa";
};
meta.homepage = "https://github.com/airblade/vim-rooter/";
};
@@ -7447,12 +7579,12 @@ let
vim-scriptease = buildVimPluginFrom2Nix {
pname = "vim-scriptease";
- version = "2021-03-08";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-scriptease";
- rev = "9450c4ea654649b6199750edc9f3f84637268d7b";
- sha256 = "0nkxcykn63187jwzw0anl3chzhm31yzgmkhqra0c9071jzi149xg";
+ rev = "dbdc88f2ca38613a089354823fb2cec4d87d104d";
+ sha256 = "0i89vrnfphr32qcix9ah9cf68xnw6n8jm03xmgys29gkfim4v7sq";
};
meta.homepage = "https://github.com/tpope/vim-scriptease/";
};
@@ -7627,12 +7759,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2021-03-09";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "d30f65105e1f73c63c92c22c4afbad51539f5744";
- sha256 = "05qbrdipxpzj7v0n4q3bj8p2sgl28jm952hy7gs76ma3p3g7mnrq";
+ rev = "67e506c5598c19de4fcdf8780377a92aaddfdbad";
+ sha256 = "1gabnzgrjkrf2x32i55js8xf6zm0vzwnzmlbwqkjf1xi25wgbx1n";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -7699,24 +7831,24 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
- version = "2020-10-07";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
- rev = "f2fc11844b234479d37bef37faa7ceb2aade788b";
- sha256 = "18n16hpkqadq18gpgppbr4s516jpc8qwd357vb2c7069q79kfx39";
+ rev = "d663f4db7a572f9a56c39ae17801a5a7eae81d20";
+ sha256 = "1lwpisz91hs7bjsvi4rjczi95s05kq0k241i8h3mblpsnpv8zm33";
};
meta.homepage = "https://github.com/mhinz/vim-startify/";
};
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
- version = "2021-02-23";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
- rev = "af70d17a863c9a33def9cafbb3911195a571c686";
- sha256 = "078xq6bwkbwsjajyq3c9bn8b3r0da6j70vp1ba934a6jjdv6vrj4";
+ rev = "cee157ee4f73ddacfe1a70bb833b96f7a47a10c2";
+ sha256 = "1y049vbjhsg80am0hxyrcq0d0p7qfyvb1z38nc7yd7bcgwsqc5ac";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@@ -7771,12 +7903,12 @@ let
vim-swap = buildVimPluginFrom2Nix {
pname = "vim-swap";
- version = "2020-11-16";
+ version = "2021-03-18";
src = fetchFromGitHub {
owner = "machakann";
repo = "vim-swap";
- rev = "699b7492c965a3dd96128d16b6b68a15091a931a";
- sha256 = "0vw4d1375xhp1fbv88fp96ry0hzyqkbfn4dccrlfl4sanvkh0r6y";
+ rev = "f363ea636f4e18b4a3382ff352d3cf2e2ac5840e";
+ sha256 = "1pa5crmamama4v3yzcjfbizvpx03wb67zbjx1mn5rz6dcar903f6";
};
meta.homepage = "https://github.com/machakann/vim-swap/";
};
@@ -7856,12 +7988,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2021-03-03";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "f5619460b77b9b444311aa3b6f31ecd9ffdaa6d8";
- sha256 = "1izzpfvppiyf4pcxdny0na634bl147rwiijyaj7rg679w9lv6qwg";
+ rev = "a0a3f130dddfde95700f8d07e51884a2bc0a53c4";
+ sha256 = "07qv8l3rz63ksrv8shphqk42p1yzcjjck6s5sv3sz2z1xwr2dy0x";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -8024,12 +8156,12 @@ let
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2021-03-09";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "3f6ed5af76d45cf3d0e7f87cd927866f3640aa22";
- sha256 = "04m652dfwgr52ic2f206s0mq8z10dnaxb90xcywrfjgkdcjd6d10";
+ rev = "b36abe2613191912e12b9562b209f157a8b927de";
+ sha256 = "1ly3iy1c05ry7yfsph0rribiagcyw07daj2dbfj0la3pbfmvip24";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -8072,12 +8204,12 @@ let
vim-twiggy = buildVimPluginFrom2Nix {
pname = "vim-twiggy";
- version = "2020-11-14";
+ version = "2021-03-19";
src = fetchFromGitHub {
owner = "sodapopcan";
repo = "vim-twiggy";
- rev = "305fa5ab43514b76b15a57596bc514c072b9cdda";
- sha256 = "1hn42fm9a2dvxwml17j5jvd8758s71dlipspn5vi9l545cg94jjf";
+ rev = "cf8aa913329991bfeaa1cabab4bbd8889b0f0790";
+ sha256 = "0j0h95xhb5c59qyx8gc1yrcnsjxffbnycya6wnl7axd71iawwgh8";
};
meta.homepage = "https://github.com/sodapopcan/vim-twiggy/";
};
@@ -8108,12 +8240,12 @@ let
vim-vinegar = buildVimPluginFrom2Nix {
pname = "vim-vinegar";
- version = "2021-01-25";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-vinegar";
- rev = "5f48edf4dcc130ae4a658541c0d6f72a558bc70d";
- sha256 = "195l6ly7ry8721rlkcp9103czvfcmqifbgbibdqdi3pjmaafrb9l";
+ rev = "b245f3ab4580eba27616a5ce06a56d5f791e67bd";
+ sha256 = "0lvqfa5drjzk3b877aldnjc9m4jnwlpxlvfvy8s81az92r69f13m";
};
meta.homepage = "https://github.com/tpope/vim-vinegar/";
};
@@ -8132,12 +8264,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
- version = "2021-02-16";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
- rev = "4c99296b8f29d8936de8c33d98f0acdafcdbd388";
- sha256 = "1w936x8zz0f6v77bhixd48q09naqglq3ar4y26kpr9vscfmsbc00";
+ rev = "08e37d47406d7f57e5907af4dc6bd35cff2b04b3";
+ sha256 = "157gvlpb0i3jn9gjcjgz02y843jh03pqnwfkv2bf9qh7bknrnxr5";
};
meta.homepage = "https://github.com/mg979/vim-visual-multi/";
};
@@ -8156,12 +8288,12 @@ let
vim-vsnip = buildVimPluginFrom2Nix {
pname = "vim-vsnip";
- version = "2021-02-28";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip";
- rev = "925fb3d0163e4c50b8d639029837696ead0f5a56";
- sha256 = "06ssm3m64mcfzasf2sx09nrk8rizgjm9dgl36nm7qk2vchrcbg33";
+ rev = "4eb5f669c11c497fa075912eb03294b11fca2c07";
+ sha256 = "1imrkir6ir2fl63wh91yh5jp64kxd3zh1m7p05dcfbyd7rc2l9c1";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
};
@@ -8216,12 +8348,12 @@ let
vim-wayland-clipboard = buildVimPluginFrom2Nix {
pname = "vim-wayland-clipboard";
- version = "2021-02-17";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "jasonccox";
repo = "vim-wayland-clipboard";
- rev = "2dc05c0f556213068a9ddf37a8b9b2276deccf84";
- sha256 = "16x7dk1x9q8kzjcgapgb9hw8hm4w8v1g6pzpiz6ccsd0ab0jzf40";
+ rev = "1f7f05039c572fde082043915953a88b77c0ddb0";
+ sha256 = "0ihyfdvgiclmcric66nd54ha7ikf2c1pl1slbn4y6mkbxla02yv9";
};
meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/";
};
@@ -8408,14 +8540,14 @@ let
vimsence = buildVimPluginFrom2Nix {
pname = "vimsence";
- version = "2021-03-02";
+ version = "2021-03-17";
src = fetchFromGitHub {
- owner = "hugolgst";
+ owner = "vimsence";
repo = "vimsence";
- rev = "16ce1f653d3ae7b65506f7e35c3723aeea9f758f";
- sha256 = "0rnfmr8qk59dbdwd2jjjlkjwh82w58pmsm7p8b3lr2hhxz0z4sfd";
+ rev = "ad036250a116472218430aed1817e5b6c204d0b8";
+ sha256 = "0yn3w193h9h1fyaniwdj4y7b744kwj11prxcq8iyg897v8jj25bk";
};
- meta.homepage = "https://github.com/hugolgst/vimsence/";
+ meta.homepage = "https://github.com/vimsence/vimsence/";
};
vimshell-vim = buildVimPluginFrom2Nix {
@@ -8432,12 +8564,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-03-05";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "943ae6c7c9d0f256e444c3ddc5e876156335f997";
- sha256 = "0wfdb89iafpwazgg42wxq1fd5g99gyrmk95nzxvnws2a7fy5hi65";
+ rev = "054ea35428e5e8d6abe12b6a535a3b0426d4874e";
+ sha256 = "0cx35hbyhrzmbfzsikbpa4jh0gr3sbdhk27v2nsbwj4i3rg9767p";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -8445,24 +8577,24 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-03-09";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "3af88f325e4784bd209df490dbf648a942326d57";
- sha256 = "0zqp4zvl8xqa0lsj6lwc4wlg0n3wknhfn1g1j2gbncgyiw38ax2l";
+ rev = "428906647a22fdb30409554935eacdd9932726cb";
+ sha256 = "1kyg2j06b6677pfaj2aqw9ivdlrg02hhpy2jyr11xrqy83k461hi";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
vimux = buildVimPluginFrom2Nix {
pname = "vimux";
- version = "2021-03-09";
+ version = "2021-03-18";
src = fetchFromGitHub {
owner = "preservim";
repo = "vimux";
- rev = "29d46f6bc158c28b85ae540dc29459ff41211233";
- sha256 = "1yd9pmyzqyk7mcsa9gkvsz6i9g6zkm63mm9h26713simy1idl536";
+ rev = "708ce200d56d6fc326a8c1acd7f0f4f7c6a9e552";
+ sha256 = "0wkxq1a3phmxskmqcn3067s56k6n9v8k9qqy0mwhxhp2d53asxpf";
};
meta.homepage = "https://github.com/preservim/vimux/";
};
@@ -8626,12 +8758,12 @@ let
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
- version = "2021-02-07";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
- rev = "dbf67638cb7084883c7463b0d6226be9d9159b9a";
- sha256 = "1qxwgjfhzz7ymkbbnjm3xrp368rmcphdaj4lxrkkbp9d2pn9g8s7";
+ rev = "ed423e8a1d2a5842a126d33b824ad3b65f85f3ba";
+ sha256 = "19c238sdc6i3ky374v52g13csnbmdcm9d97iji6fmklmzsyrq4cr";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -8675,24 +8807,24 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2021-03-06";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "a9b4a655b61aeb02229d54ff7cd22395a02a9ee7";
- sha256 = "1dxr4p1ikmqacjb0x9p0ndlcdg812yzqmk56c79dgllf0cr0l7hg";
+ rev = "79e273ed8ff386a81e6a88ae888ec6d878a9dcbc";
+ sha256 = "00x0b2lwrfkmny6rhwjrb1kyp2lai597f6f62whhwgw7iq9j5b5k";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2021-03-08";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "ead21935391bb1f3906c7358af7ebe5572592cfd";
- sha256 = "1qcd7w5hadf6h4lxrvj8xjl729csy0bc0dch39xy4j6iph9w8jpq";
+ rev = "33b62b688ef4f0b3810c4d3d1b3901f572488691";
+ sha256 = "0dsc1h8ih5jgfni5szm8dby368naxh3igndm80yrciy2glcj1ayn";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 1ee919874866..7a0df067f6c1 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -731,7 +731,7 @@ self: super: {
libiconv
];
- cargoSha256 = "F+kIVnO7MBuaYRa2MPsD3eQ2d5W5VxHhxHKeo/ic6TE=";
+ cargoSha256 = "u1ryOhwDgRBQ32MBPkWHI6eU6yZqNAZfyKvckr6nvCY=";
};
in
''
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index f5d7434fe272..1180b4572d22 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -6,180 +6,18 @@
# type-check:
# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py
# linted:
-# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py
+# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py
-import argparse
-import functools
-import http
-import json
+import inspect
import os
-import subprocess
import sys
-import time
-import traceback
-import urllib.error
-import urllib.parse
-import urllib.request
-import xml.etree.ElementTree as ET
-from datetime import datetime
-from functools import wraps
-from multiprocessing.dummy import Pool
+from typing import List, Tuple
from pathlib import Path
-from typing import Dict, List, Optional, Tuple, Union, Any, Callable
-from urllib.parse import urljoin, urlparse
-from tempfile import NamedTemporaryFile
-
-import git
-
-ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here
-ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # "
-ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # "
-
-ROOT = Path(__file__).parent
-DEFAULT_IN = ROOT.joinpath("vim-plugin-names")
-DEFAULT_OUT = ROOT.joinpath("generated.nix")
-DEPRECATED = ROOT.joinpath("deprecated.json")
-
-def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2):
- """Retry calling the decorated function using an exponential backoff.
- http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/
- original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry
- (BSD licensed)
- :param ExceptionToCheck: the exception on which to retry
- :param tries: number of times to try (not retry) before giving up
- :param delay: initial delay between retries in seconds
- :param backoff: backoff multiplier e.g. value of 2 will double the delay
- each retry
- """
-
- def deco_retry(f: Callable) -> Callable:
- @wraps(f)
- def f_retry(*args: Any, **kwargs: Any) -> Any:
- mtries, mdelay = tries, delay
- while mtries > 1:
- try:
- return f(*args, **kwargs)
- except ExceptionToCheck as e:
- print(f"{str(e)}, Retrying in {mdelay} seconds...")
- time.sleep(mdelay)
- mtries -= 1
- mdelay *= backoff
- return f(*args, **kwargs)
-
- return f_retry # true decorator
-
- return deco_retry
-
-def make_request(url: str) -> urllib.request.Request:
- token = os.getenv("GITHUB_API_TOKEN")
- headers = {}
- if token is not None:
- headers["Authorization"] = f"token {token}"
- return urllib.request.Request(url, headers=headers)
-
-class Repo:
- def __init__(
- self, owner: str, name: str, branch: str, alias: Optional[str]
- ) -> None:
- self.owner = owner
- self.name = name
- self.branch = branch
- self.alias = alias
- self.redirect: Dict[str, str] = {}
-
- def url(self, path: str) -> str:
- return urljoin(f"https://github.com/{self.owner}/{self.name}/", path)
-
- def __repr__(self) -> str:
- return f"Repo({self.owner}, {self.name})"
-
- @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
- def has_submodules(self) -> bool:
- try:
- req = make_request(self.url(f"blob/{self.branch}/.gitmodules"))
- urllib.request.urlopen(req, timeout=10).close()
- except urllib.error.HTTPError as e:
- if e.code == 404:
- return False
- else:
- raise
- return True
-
- @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
- def latest_commit(self) -> Tuple[str, datetime]:
- commit_url = self.url(f"commits/{self.branch}.atom")
- commit_req = make_request(commit_url)
- with urllib.request.urlopen(commit_req, timeout=10) as req:
- self.check_for_redirect(commit_url, req)
- xml = req.read()
- root = ET.fromstring(xml)
- latest_entry = root.find(ATOM_ENTRY)
- assert latest_entry is not None, f"No commits found in repository {self}"
- commit_link = latest_entry.find(ATOM_LINK)
- assert commit_link is not None, f"No link tag found feed entry {xml}"
- url = urlparse(commit_link.get("href"))
- updated_tag = latest_entry.find(ATOM_UPDATED)
- assert (
- updated_tag is not None and updated_tag.text is not None
- ), f"No updated tag found feed entry {xml}"
- updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ")
- return Path(str(url.path)).name, updated
-
- def check_for_redirect(self, url: str, req: http.client.HTTPResponse):
- response_url = req.geturl()
- if url != response_url:
- new_owner, new_name = (
- urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]
- )
- end_line = "\n" if self.alias is None else f" as {self.alias}\n"
- plugin_line = "{owner}/{name}" + end_line
-
- old_plugin = plugin_line.format(owner=self.owner, name=self.name)
- new_plugin = plugin_line.format(owner=new_owner, name=new_name)
- self.redirect[old_plugin] = new_plugin
-
- def prefetch_git(self, ref: str) -> str:
- data = subprocess.check_output(
- ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref]
- )
- return json.loads(data)["sha256"]
-
- def prefetch_github(self, ref: str) -> str:
- data = subprocess.check_output(
- ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]
- )
- return data.strip().decode("utf-8")
-
-
-class Plugin:
- def __init__(
- self,
- name: str,
- commit: str,
- has_submodules: bool,
- sha256: str,
- date: Optional[datetime] = None,
- ) -> None:
- self.name = name
- self.commit = commit
- self.has_submodules = has_submodules
- self.sha256 = sha256
- self.date = date
-
- @property
- def normalized_name(self) -> str:
- return self.name.replace(".", "-")
-
- @property
- def version(self) -> str:
- assert self.date is not None
- return self.date.strftime("%Y-%m-%d")
-
- def as_json(self) -> Dict[str, str]:
- copy = self.__dict__.copy()
- del copy["date"]
- return copy
+# Import plugin update library from maintainers/scripts/pluginupdate.py
+ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
+sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts"))
+import pluginupdate
GET_PLUGINS = f"""(with import {{}};
let
@@ -197,204 +35,16 @@ let
checksums = lib.mapAttrs getChecksum generated;
in lib.filterAttrs (n: v: v != null) checksums)"""
-
-class CleanEnvironment(object):
- def __enter__(self) -> None:
- self.old_environ = os.environ.copy()
- local_pkgs = str(ROOT.joinpath("../../.."))
- os.environ["NIX_PATH"] = f"localpkgs={local_pkgs}"
- self.empty_config = NamedTemporaryFile()
- self.empty_config.write(b"{}")
- self.empty_config.flush()
- os.environ["NIXPKGS_CONFIG"] = self.empty_config.name
-
- def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
- os.environ.update(self.old_environ)
- self.empty_config.close()
-
-
-def get_current_plugins() -> List[Plugin]:
- with CleanEnvironment():
- out = subprocess.check_output(["nix", "eval", "--json", GET_PLUGINS])
- data = json.loads(out)
- plugins = []
- for name, attr in data.items():
- p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
- plugins.append(p)
- return plugins
-
-
-def prefetch_plugin(
- user: str,
- repo_name: str,
- branch: str,
- alias: Optional[str],
- cache: "Optional[Cache]" = None,
-) -> Tuple[Plugin, Dict[str, str]]:
- repo = Repo(user, repo_name, branch, alias)
- commit, date = repo.latest_commit()
- has_submodules = repo.has_submodules()
- cached_plugin = cache[commit] if cache else None
- if cached_plugin is not None:
- cached_plugin.name = alias or repo_name
- cached_plugin.date = date
- return cached_plugin, repo.redirect
-
- print(f"prefetch {user}/{repo_name}")
- if has_submodules:
- sha256 = repo.prefetch_git(commit)
- else:
- sha256 = repo.prefetch_github(commit)
-
- return (
- Plugin(alias or repo_name, commit, has_submodules, sha256, date=date),
- repo.redirect,
- )
-
-
-def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin:
- plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line))
- return plugin
-
-
-def print_download_error(plugin: str, ex: Exception):
- print(f"{plugin}: {ex}", file=sys.stderr)
- ex_traceback = ex.__traceback__
- tb_lines = [
- line.rstrip("\n")
- for line in traceback.format_exception(ex.__class__, ex, ex_traceback)
- ]
- print("\n".join(tb_lines))
-
-
-def check_results(
- results: List[Tuple[str, str, Union[Exception, Plugin], Dict[str, str]]]
-) -> Tuple[List[Tuple[str, str, Plugin]], Dict[str, str]]:
- failures: List[Tuple[str, Exception]] = []
- plugins = []
- redirects: Dict[str, str] = {}
- for (owner, name, result, redirect) in results:
- if isinstance(result, Exception):
- failures.append((name, result))
- else:
- plugins.append((owner, name, result))
- redirects.update(redirect)
-
- print(f"{len(results) - len(failures)} plugins were checked", end="")
- if len(failures) == 0:
- print()
- return plugins, redirects
- else:
- print(f", {len(failures)} plugin(s) could not be downloaded:\n")
-
- for (plugin, exception) in failures:
- print_download_error(plugin, exception)
-
- sys.exit(1)
-
-
-def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]:
- branch = "master"
- alias = None
- name, repo = line.split("/")
- if " as " in repo:
- repo, alias = repo.split(" as ")
- alias = alias.strip()
- if "@" in repo:
- repo, branch = repo.split("@")
-
- return (name.strip(), repo.strip(), branch.strip(), alias)
-
-
-def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]:
- plugins = []
- with open(plugin_file) as f:
- for line in f:
- plugin = parse_plugin_line(line)
- if not plugin[0]:
- msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]"
- print(msg, file=sys.stderr)
- sys.exit(1)
- plugins.append(plugin)
- return plugins
-
-
-def get_cache_path() -> Optional[Path]:
- xdg_cache = os.environ.get("XDG_CACHE_HOME", None)
- if xdg_cache is None:
- home = os.environ.get("HOME", None)
- if home is None:
- return None
- xdg_cache = str(Path(home, ".cache"))
-
- return Path(xdg_cache, "vim-plugin-cache.json")
-
-
-class Cache:
- def __init__(self, initial_plugins: List[Plugin]) -> None:
- self.cache_file = get_cache_path()
-
- downloads = {}
- for plugin in initial_plugins:
- downloads[plugin.commit] = plugin
- downloads.update(self.load())
- self.downloads = downloads
-
- def load(self) -> Dict[str, Plugin]:
- if self.cache_file is None or not self.cache_file.exists():
- return {}
-
- downloads: Dict[str, Plugin] = {}
- with open(self.cache_file) as f:
- data = json.load(f)
- for attr in data.values():
- p = Plugin(
- attr["name"], attr["commit"], attr["has_submodules"], attr["sha256"]
- )
- downloads[attr["commit"]] = p
- return downloads
-
- def store(self) -> None:
- if self.cache_file is None:
- return
-
- os.makedirs(self.cache_file.parent, exist_ok=True)
- with open(self.cache_file, "w+") as f:
- data = {}
- for name, attr in self.downloads.items():
- data[name] = attr.as_json()
- json.dump(data, f, indent=4, sort_keys=True)
-
- def __getitem__(self, key: str) -> Optional[Plugin]:
- return self.downloads.get(key, None)
-
- def __setitem__(self, key: str, value: Plugin) -> None:
- self.downloads[key] = value
-
-
-def prefetch(
- args: Tuple[str, str, str, Optional[str]], cache: Cache
-) -> Tuple[str, str, Union[Exception, Plugin], dict]:
- assert len(args) == 4
- owner, repo, branch, alias = args
- try:
- plugin, redirect = prefetch_plugin(owner, repo, branch, alias, cache)
- cache[plugin.commit] = plugin
- return (owner, repo, plugin, redirect)
- except Exception as e:
- return (owner, repo, e, {})
-
-
-header = (
+HEADER = (
"# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!"
)
-def generate_nix(plugins: List[Tuple[str, str, Plugin]], outfile: str):
+def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
with open(outfile, "w+") as f:
- f.write(header)
+ f.write(HEADER)
f.write(
"""
{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
@@ -432,136 +82,9 @@ in lib.fix' (lib.extends overrides packages)
print(f"updated {outfile}")
-def rewrite_input(
- input_file: Path, redirects: Dict[str, str] = None, append: Tuple = ()
-):
- with open(input_file, "r") as f:
- lines = f.readlines()
-
- lines.extend(append)
-
- if redirects:
- lines = [redirects.get(line, line) for line in lines]
-
- cur_date_iso = datetime.now().strftime("%Y-%m-%d")
- with open(DEPRECATED, "r") as f:
- deprecations = json.load(f)
- for old, new in redirects.items():
- old_plugin = fetch_plugin_from_pluginline(old)
- new_plugin = fetch_plugin_from_pluginline(new)
- if old_plugin.normalized_name != new_plugin.normalized_name:
- deprecations[old_plugin.normalized_name] = {
- "new": new_plugin.normalized_name,
- "date": cur_date_iso,
- }
- with open(DEPRECATED, "w") as f:
- json.dump(deprecations, f, indent=4, sort_keys=True)
-
- lines = sorted(lines, key=str.casefold)
-
- with open(input_file, "w") as f:
- f.writelines(lines)
-
-
-def parse_args():
- parser = argparse.ArgumentParser(
- description=(
- "Updates nix derivations for vim plugins"
- f"By default from {DEFAULT_IN} to {DEFAULT_OUT}"
- )
- )
- parser.add_argument(
- "--add",
- dest="add_plugins",
- default=[],
- action="append",
- help="Plugin to add to vimPlugins from Github in the form owner/repo",
- )
- parser.add_argument(
- "--input-names",
- "-i",
- dest="input_file",
- default=DEFAULT_IN,
- help="A list of plugins in the form owner/repo",
- )
- parser.add_argument(
- "--out",
- "-o",
- dest="outfile",
- default=DEFAULT_OUT,
- help="Filename to save generated nix code",
- )
- parser.add_argument(
- "--proc",
- "-p",
- dest="proc",
- type=int,
- default=30,
- help="Number of concurrent processes to spawn.",
- )
- return parser.parse_args()
-
-
-def commit(repo: git.Repo, message: str, files: List[Path]) -> None:
- repo.index.add([str(f.resolve()) for f in files])
-
- if repo.index.diff("HEAD"):
- print(f'committing to nixpkgs "{message}"')
- repo.index.commit(message)
- else:
- print("no changes in working tree to commit")
-
-
-def get_update(input_file: str, outfile: str, proc: int):
- cache: Cache = Cache(get_current_plugins())
- _prefetch = functools.partial(prefetch, cache=cache)
-
- def update() -> dict:
- plugin_names = load_plugin_spec(input_file)
-
- try:
- pool = Pool(processes=proc)
- results = pool.map(_prefetch, plugin_names)
- finally:
- cache.store()
-
- plugins, redirects = check_results(results)
-
- generate_nix(plugins, outfile)
-
- return redirects
-
- return update
-
-
def main():
- args = parse_args()
- nixpkgs_repo = git.Repo(ROOT, search_parent_directories=True)
- update = get_update(args.input_file, args.outfile, args.proc)
-
- redirects = update()
- rewrite_input(args.input_file, redirects)
- commit(nixpkgs_repo, "vimPlugins: update", [args.outfile])
-
- if redirects:
- update()
- commit(
- nixpkgs_repo,
- "vimPlugins: resolve github repository redirects",
- [args.outfile, args.input_file, DEPRECATED],
- )
-
- for plugin_line in args.add_plugins:
- rewrite_input(args.input_file, append=(plugin_line + "\n",))
- update()
- plugin = fetch_plugin_from_pluginline(plugin_line)
- commit(
- nixpkgs_repo,
- "vimPlugins.{name}: init at {version}".format(
- name=plugin.normalized_name, version=plugin.version
- ),
- [args.outfile, args.input_file],
- )
+ editor = pluginupdate.Editor("vim", ROOT, GET_PLUGINS, generate_nix)
+ pluginupdate.update_plugins(editor)
if __name__ == "__main__":
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 2076e24423d0..18abd14118dc 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -3,6 +3,8 @@ aca/completion-tabnine
ackyshake/Spacegray.vim@main
airblade/vim-gitgutter
airblade/vim-rooter
+akinsho/nvim-bufferline.lua
+akinsho/nvim-toggleterm.lua
aklt/plantuml-syntax
altercation/vim-colors-solarized
alvan/vim-closetag
@@ -45,6 +47,7 @@ cespare/vim-toml
Chiel92/vim-autoformat
chikatoike/concealedyank.vim
chikatoike/sourcemap.vim
+chr4/nginx.vim
chrisbra/CheckAttach
chrisbra/csv.vim
chrisbra/NrrwRgn
@@ -106,7 +109,7 @@ eikenb/acp
elixir-editors/vim-elixir
elmcast/elm-vim
elzr/vim-json
-embark-theme/vim as embark-vim
+embark-theme/vim@main as embark-vim
embear/vim-localvimrc
enomsg/vim-haskellConcealPlus
enricobacis/vim-airline-clock
@@ -115,6 +118,7 @@ ervandew/supertab
esneider/YUNOcommit.vim
euclidianAce/BetterLua.vim
euclio/vim-markdown-composer
+f-person/git-blame.nvim
farmergreg/vim-lastplace
fatih/vim-go
fcpg/vim-osc52
@@ -177,7 +181,6 @@ hrsh7th/vim-vsnip
hrsh7th/vim-vsnip-integ
hsanson/vim-android
hsitz/VimOrganizer
-hugolgst/vimsence
iamcco/coc-spell-checker
ianks/vim-tsx
idanarye/vim-merginal
@@ -263,6 +266,7 @@ kbenzie/vim-spirv
kchmck/vim-coffee-script
KeitaNakamura/neodark.vim
keith/investigate.vim
+keith/rspec.vim
keith/swift.vim
kevinhwang91/nvim-bqf@main
kevinhwang91/nvim-hlslens@main
@@ -301,6 +305,7 @@ liuchengxu/vim-which-key
liuchengxu/vista.vim
LnL7/vim-nix
lotabout/skim.vim
+luan/vim-concourse
LucHermitte/lh-brackets
LucHermitte/lh-vim-lib
ludovicchabant/vim-gutentags
@@ -344,6 +349,7 @@ maximbaz/lightline-ale
MaxMEllon/vim-jsx-pretty
mbbill/undotree
mboughaba/i3config.vim
+mcchrish/nnn.vim
megaannum/forms
megaannum/self
mengelbrecht/lightline-bufferline
@@ -414,6 +420,7 @@ nishigori/increment-activator
nixprime/cpsm
NLKNguyen/papercolor-theme
noc7c9/vim-iced-coffee-script
+norcalli/nvim-colorizer.lua
norcalli/nvim-terminal.lua
norcalli/snippets.nvim
npxbr/glow.nvim
@@ -485,6 +492,7 @@ raghur/vim-ghost
Raimondi/delimitMate
rakr/vim-one
rbgrouleff/bclose.vim
+rbong/vim-flog
reedes/vim-pencil
reedes/vim-wordy
rhysd/committia.vim
@@ -630,6 +638,7 @@ travitch/hasksyn
tremor-rs/tremor-vim@main
triglav/vim-visual-increment
troydm/zoomwintab.vim
+tversteeg/registers.nvim@main
twerth/ir_black
twinside/vim-haskellconceal
Twinside/vim-hoogle
@@ -689,6 +698,7 @@ Vimjas/vim-python-pep8-indent
vimlab/split-term.vim
vimoutliner/vimoutliner
vimpostor/vim-tpipeline
+vimsence/vimsence
vimwiki/vimwiki
vito-c/jq.vim
vmchale/ats-vim
@@ -716,6 +726,7 @@ xolox/vim-easytags
xolox/vim-misc
xuhdev/vim-latex-live-preview
Xuyuanp/nerdtree-git-plugin
+yamatsum/nvim-nonicons@main
ycm-core/YouCompleteMe
Yggdroot/indentLine
Yilin-Yang/vim-markbar
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 75d6bf80228e..533c2e3f4a03 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8 }:
+{ config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
@@ -48,6 +48,18 @@ let
};
};
+ antfu.icons-carbon = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "icons-carbon";
+ publisher = "antfu";
+ version = "0.2.2";
+ sha256 = "0mfap16la09mn0jhvy8s3dainrmjz64vra7d0d4fbcpgg420kv3f";
+ };
+ meta = with lib; {
+ license = licenses.mit;
+ };
+ };
+
ms-python.vscode-pylance = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-pylance";
@@ -234,6 +246,18 @@ let
};
};
+ emmanuelbeziat.vscode-great-icons = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-great-icons";
+ publisher = "emmanuelbeziat";
+ version = "2.1.64";
+ sha256 = "sha256-qsL1vWiEAYeWkMDNSrr1yzg0QxroEQQeznoDL3Ujy/o=";
+ };
+ meta = with lib; {
+ license = licenses.mit;
+ };
+ };
+
esbenp.prettier-vscode = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
@@ -365,8 +389,8 @@ let
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
- version = "0.0.204";
- sha256 = "0gqgbvr7fs5znxyi1sjd40x14ppwswgnb3v9a7fkd9ap02ak831r";
+ version = "0.0.206";
+ sha256 = "1xalwk2bndb73p8p2b4w5qz7m1n80xyw67wb5qlq1rrfjchhicyv";
};
meta = with lib; {
license = licenses.mit;
@@ -570,6 +594,20 @@ let
};
};
+ redhat.java = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "java";
+ publisher = "redhat";
+ version = "0.76.0";
+ sha256 = "0xb9brki4s00piv4kqgz6idm16nk6x1j6502jljz7y9pif38z32y";
+ };
+ buildInputs = [ jdk ];
+ meta = {
+ license = lib.licenses.epl20;
+ broken = lib.versionOlder jdk.version "11";
+ };
+ };
+
redhat.vscode-yaml = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-yaml";
diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
index e8e8ead9dbde..836b9cc2a2b9 100644
--- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
+++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
@@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
mktplcRef = {
name = "vsliveshare";
publisher = "ms-vsliveshare";
- version = "1.0.3912";
- sha256 = "1k5yy04q85jjr7hzrv0s7x1m2251kglb038wcvvbs568vpscghi8";
+ version = "1.0.3968";
+ sha256 = "1nmhkxrlg9blxcqh7a3hl0wc5mkk2p77mn228lvmcirpbk3acsx5";
};
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
nativeBuildInputs = nativeBuildInputs ++ [
diff --git a/pkgs/misc/vscode-extensions/python/extract-nuget.nix b/pkgs/misc/vscode-extensions/python/extract-nuget.nix
index e4d3b6a0ed1b..1e70cabe0358 100644
--- a/pkgs/misc/vscode-extensions/python/extract-nuget.nix
+++ b/pkgs/misc/vscode-extensions/python/extract-nuget.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation {
inherit name version src;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
dontBuild = true;
unpackPhase = "unzip $src";
installPhase = ''
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
index bdaee22a480e..ece623b53c36 100644
--- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
@@ -2,6 +2,7 @@
"name": "rust-analyzer",
"version": "0.4.0-dev",
"dependencies": {
+ "https-proxy-agent": "^5.0.0",
"node-fetch": "^2.6.1",
"vscode-languageclient": "^7.1.0-next.4",
"@rollup/plugin-commonjs": "^17.0.0",
diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix
index 801c0a10e952..7c9eaa656182 100644
--- a/pkgs/misc/vscode-extensions/terraform/default.nix
+++ b/pkgs/misc/vscode-extensions/terraform/default.nix
@@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
- version = "2.8.2";
+ version = "2.8.3";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
- sha256 = "0f1ck3h8ckvr75j27w2lxjbwnr24nc6fjki0gnn715ynkqg7w9bi";
+ sha256 = "1cng82q9079qmn5q71h9knh9qzhqrl3phaamkqfjy1jallgi43b1";
};
patches = [ ./fix-terraform-ls.patch ];
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 8a814e9558de..b88107f992c9 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -241,6 +241,18 @@ in rec {
popd >/dev/null
'';
};
+
+ sandbox = stdenv.mkDerivation {
+ name = "apple-lib-sandbox";
+ dontUnpack = true;
+
+ installPhase = ''
+ mkdir -p $out/include $out/lib
+ ln -s "${lib.getDev sdk}/include/sandbox.h" $out/include/sandbox.h
+ cp "${darwin-stubs}/usr/lib/libsandbox.1.tbd" $out/lib
+ ln -s libsandbox.1.tbd $out/lib/libsandbox.tbd
+ '';
+ };
};
overrides = super: {
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
index 002709ce2df2..5ac971d02f76 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
@@ -1,4 +1,4 @@
-{ lib, appleDerivation, yacc, flex }:
+{ lib, stdenv, appleDerivation, yacc, flex }:
appleDerivation {
nativeBuildInputs = [ yacc flex ];
@@ -26,7 +26,7 @@ appleDerivation {
cp migcom.1 $out/share/man/man1
substituteInPlace $out/bin/mig \
- --replace 'arch=`/usr/bin/arch`' 'arch=i386' \
+ --replace 'arch=`/usr/bin/arch`' 'arch=${stdenv.targetPlatform.darwinArch}' \
--replace '/usr/bin/' "" \
--replace '/bin/rmdir' "rmdir" \
--replace 'C=''${MIGCC}' "C=cc"
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index e9aa706da2d3..29ae1871ddb1 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, binutils-unwrapped, cctools, llvm }:
+{ lib, stdenv, makeWrapper, binutils-unwrapped, cctools, llvm, clang-unwrapped }:
# Make sure both underlying packages claim to have prepended their binaries
# with the same targetPrefix.
@@ -49,8 +49,19 @@ stdenv.mkDerivation {
ln -sv "$path" "$dest_path"
done
done
+ ''
+ # On aarch64-darwin we must use clang, because "as" from cctools just doesn't
+ # handle the arch. Proxying calls to clang produces quite a bit of warnings,
+ # and using clang directly here is a better option than relying on cctools.
+ # On x86_64-darwin the Clang version is too old to support this mode.
+ + lib.optionalString stdenv.isAarch64 ''
+ rm $out/bin/as
+ makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/as" \
+ --add-flags "-x assembler -integrated-as -c"
'';
+ nativeBuildInputs = lib.optionals stdenv.isAarch64 [ makeWrapper ];
+
passthru = {
inherit targetPrefix;
};
diff --git a/pkgs/os-specific/darwin/macfuse/default.nix b/pkgs/os-specific/darwin/macfuse/default.nix
new file mode 100644
index 000000000000..7e1b4ed7763c
--- /dev/null
+++ b/pkgs/os-specific/darwin/macfuse/default.nix
@@ -0,0 +1,59 @@
+{ lib, stdenv, fetchurl, cpio, xar, undmg, libtapi, DiskArbitration }:
+
+stdenv.mkDerivation rec {
+ pname = "macfuse-stubs";
+ version = "4.1.0";
+
+ src = fetchurl {
+ url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg";
+ sha256 = "118hg64w5wb95lbxw6w1hbqxrx3plcbxfjhvxx86q0zx0saa9diw";
+ };
+
+ nativeBuildInputs = [ cpio xar undmg libtapi ];
+ propagatedBuildInputs = [ DiskArbitration ];
+
+ postUnpack = ''
+ xar -xf 'Install macFUSE.pkg'
+ cd Core.pkg
+ gunzip -dc Payload | cpio -i
+ '';
+
+ sourceRoot = ".";
+
+ buildPhase = ''
+ pushd usr/local/lib
+ for f in *.dylib; do
+ tapi stubify --filetype=tbd-v2 "$f" -o "''${f%%.dylib}.tbd"
+ done
+ sed -i "s|^prefix=.*|prefix=$out|" pkgconfig/fuse.pc
+ popd
+ '';
+
+ # NOTE: Keep in mind that different parts of macFUSE are distributed under a
+ # different license
+ installPhase = ''
+ mkdir -p $out/include $out/lib/pkgconfig
+ cp usr/local/lib/*.tbd $out/lib
+ cp usr/local/lib/pkgconfig/*.pc $out/lib/pkgconfig
+ cp -R usr/local/include/* $out/include
+ '';
+
+ meta = with lib; {
+ homepage = "https://osxfuse.github.io";
+ description = "Build time stubs for FUSE on macOS";
+ longDescription = ''
+ macFUSE is required for this package to work on macOS. To install macFUSE,
+ use the installer from the
+ project website.
+ '';
+ platforms = platforms.darwin;
+ maintainers = with maintainers; [ midchildan ];
+
+ # macFUSE as a whole includes code with restrictions on commercial
+ # redistribution. However, the build artifacts that we actually touch for
+ # this derivation are distributed under a free license.
+ license = with licenses; [
+ lgpl2Plus # libfuse
+ ];
+ };
+}
diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix
deleted file mode 100644
index d0f6b0f53117..000000000000
--- a/pkgs/os-specific/darwin/osxfuse/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, stdenv, runCommand, fetchFromGitHub, autoreconfHook }:
-
-let
- version = "3.8.3";
-
- headers = runCommand "osxfuse-common-${version}" {
- src = fetchFromGitHub {
- owner = "osxfuse";
- repo = "osxfuse";
- rev = "osxfuse-${version}";
- sha256 = "13lmg41zcyiajh8m42w7szkbg2is4551ryx2ia2mmzvvd23pag0z";
- };
- } ''
- mkdir -p $out/include
- cp --target-directory=$out/include $src/common/*.h
- '';
-in
-
-stdenv.mkDerivation {
-
- pname = "osxfuse";
- inherit version;
-
- src = fetchFromGitHub {
- owner = "osxfuse";
- repo = "fuse";
- rev = "1a1977a"; # Submodule reference from osxfuse/osxfuse at tag osxfuse-${version}
- sha256 = "101fw8j40ylfbbrjycnwr5qp422agyf9sfbczyb9w5ivrkds3rfw";
- };
-
- postPatch = ''
- touch config.rpath
- '';
-
- postInstall = ''
- ln -s osxfuse.pc $out/lib/pkgconfig/fuse.pc
- '';
-
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ headers ];
-
- meta = with lib; {
- homepage = "https://osxfuse.github.io";
- description = "C-based FUSE for macOS SDK";
- platforms = platforms.darwin;
- license = licenses.gpl2;
- };
-}
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index 16ed52ea81e7..cabac19ba867 100644
--- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
+++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
@@ -14,12 +14,6 @@ let
minSdkVersion = targetPlatform.minSdkVersion or "9.0";
-iosPlatformArch = { parsed, ... }: {
- armv7a = "armv7";
- aarch64 = "arm64";
- x86_64 = "x86_64";
-}.${parsed.cpu.name};
-
in
rec {
@@ -35,9 +29,7 @@ rec {
binutils = wrapBintoolsWith {
libc = targetIosSdkPkgs.libraries;
bintools = binutils-unwrapped;
- extraBuildCommands = ''
- echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags
- '' + lib.optionalString (sdk.platform == "iPhoneSimulator") ''
+ extraBuildCommands = lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
'' + lib.optionalString (sdk.platform == "iPhoneOS") ''
echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
@@ -52,7 +44,7 @@ rec {
extraBuildCommands = ''
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
mv cc-cflags.tmp $out/nix-support/cc-cflags
- echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
+ echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags
'' + lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index b79f0bd84f2f..f986ed790a16 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "acpi-call";
- version = "2020-04-07-${kernel.version}";
+ version = "1.2.1";
+ name = "${pname}-${version}-${kernel.version}";
src = fetchFromGitHub {
owner = "nix-community";
repo = "acpi_call";
- rev = "fe4cd0124099b88b61f83006023bc0d95e742e75";
- sha256 = "1rksbg78i7y2wzam9p6kbhx8rmkaiq0kqg8nj7k0j6d25m79289s";
+ rev = "v${version}";
+ sha256 = "0mr4rjbv6fj4phf038addrgv32940bphghw2v9n1z4awvw7wzkbg";
};
hardeningDisable = [ "pic" ];
@@ -26,8 +27,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
maintainers = with maintainers; [ raskin mic92 ];
- inherit (src.meta) homepage;
+ homepage = "https://github.com/nix-community/acpi_call";
platforms = platforms.linux;
description = "A module allowing arbitrary ACPI calls; use case: hybrid video";
+ license = licenses.gpl3Plus;
};
}
diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix
index 026ef5b0f468..815dc6a2ee3c 100644
--- a/pkgs/os-specific/linux/akvcam/default.nix
+++ b/pkgs/os-specific/linux/akvcam/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "akvcam";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "webcamoid";
repo = "akvcam";
rev = version;
- sha256 = "ULEhfF+uC/NcVUGAtmP1+BnrcgRgftNS97nLp81avQ8=";
+ sha256 = "0r5xg7pz0wl6pq5029rpzm9fn978vq0md31xjkp2amny7rrgxw72";
};
nativeBuildInputs = [ qmake ];
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index b73018370266..768aa7d7e7d9 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -85,11 +85,11 @@ stdenv.mkDerivation rec {
(lib.versionAtLeast kernel.version "4.9") )
[ ./patches/4.9-get_user_pages.patch ];
+ nativeBuildInputs = [ unzip ];
buildInputs =
[ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE
patchelf
- unzip
libGLU libGL
fontconfig
freetype
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index d994aed6d0f9..290e3b561800 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -6,13 +6,13 @@
python.pkgs.buildPythonApplication rec {
pname = "bcc";
- version = "0.18.0";
+ version = "0.19.0";
disabled = !stdenv.isLinux;
src = fetchurl {
url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
- sha256 = "sha256-0F8tppVFu7cnuSnlgcEvbEdykxYhGJnTc04I98/yIVs=";
+ sha256 = "sha256-TEH8Gmp+8ghLQ8UsGy5hBCMLqfMeApWEFr8THYSOdOQ=";
};
format = "other";
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 29dceecad6ed..6cb23de50a99 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -19,11 +19,11 @@
];
in stdenv.mkDerivation rec {
pname = "bluez";
- version = "5.55";
+ version = "5.56";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
- sha256 = "124v9s4y1s7s6klx5vlmzpk1jlr4x84ch7r7scm7x2f42dqp2qw8";
+ sha256 = "sha256-WcTbqfyKripqX48S8ZvBsMLcJzVcfKMSPu0/5r19C50=";
};
buildInputs = [
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 61b66c6c861d..0e7eaa19b4de 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -68,13 +68,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "conky";
- version = "1.11.6";
+ version = "1.12.1";
src = fetchFromGitHub {
owner = "brndnmtthws";
repo = "conky";
rev = "v${version}";
- sha256 = "0y2g66fjqp2hdk0y1h4ijxhnv34j16gizvxpmbigwh4n6zijcm6v";
+ sha256 = "sha256-qQx9+Z1OAQlbHupflzHD5JV4NqedoF8A57F1+rPT3/o=";
};
postPatch = ''
diff --git a/pkgs/os-specific/linux/dlm/default.nix b/pkgs/os-specific/linux/dlm/default.nix
new file mode 100644
index 000000000000..9e81ea38348b
--- /dev/null
+++ b/pkgs/os-specific/linux/dlm/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, rustPlatform
+, fetchFromSourcehut
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "dlm";
+ version = "2020-01-07";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = pname;
+ rev = "6b0e11c4f453b1a4d7a32019227539a980b7ce66";
+ sha256 = "1r3w7my0g3v2ya317qnvjx8wnagjahpj7yx72a65hf2pjbf5x42p";
+ };
+
+ cargoSha256 = "OFMCsUmrRYlobiUAqm1huuzDxdf1BWmU2RqZ9Y6Yjew=";
+
+ meta = with lib; {
+ description = "A stupid simple graphical login manager";
+ homepage = "https://git.sr.ht/~kennylevinsen/dlm";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index 21458daf966f..5a472c73578a 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, bash, perl, python }:
+{ lib, stdenv, fetchFromGitHub, bash, perl, python2 }:
+
+# There are fixes for python3 compatibility on master
stdenv.mkDerivation rec {
pname = "dmtcp";
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
substituteInPlace test/autotest.py \
--replace /bin/bash ${bash}/bin/bash \
--replace /usr/bin/perl ${perl}/bin/perl \
- --replace /usr/bin/python ${python}/bin/python \
+ --replace /usr/bin/python ${python2}/bin/python \
--replace "os.environ['USER']" "\"nixbld1\"" \
--replace "os.getenv('USER')" "\"nixbld1\""
'';
diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index ced77f3fcc9e..280960591015 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.36";
+ version = "0.38";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version;
- sha256 = "0w7v2hihwwmnqd56bsmbjsiw8yyadr7zbdssjamqxx0pyl3dnrda";
+ sha256 = "sha256-UR6NHIO/L/QbuVerXe32RNT33wwrDvIZpV6nlYaImI8=";
};
nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 6801256c7d36..b66c4e73084f 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "firmware-linux-nonfree";
- version = "2021-02-08";
+ version = "2021-03-15";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
- rev = lib.replaceStrings ["-"] [""] version;
- sha256 = "0c85cd659312isfz1r87qswsgfhy0rljagcwspnvjljqrh9bsgzq";
+ rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version;
+ sha256 = "sha256-BnYqveVFJk/tVYgYuggXgYGcUCZT9iPkCQIi48FOTWc=";
};
installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "0l4xsgxdvjffad7a98n42nyqy3ihs6m6hy3qsfkqin9z10413x5n";
+ outputHash = "sha256-TzAMGj7IDhzXcFhHAd15aZvAqyN+OKlJTkIhVGoTkIs=";
meta = with lib; {
description = "Binary firmware collection packaged by kernel.org";
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index bfa7783b6b83..24e23f2b7e97 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -91,13 +91,7 @@ let
self = stdenv.mkDerivation rec {
pname = "fwupd";
- # A regression is present in https://github.com/fwupd/fwupd/commit/fde4b1676a2c64e70bebd88f7720307c62635654
- # released with 1.5.6.
- # Fix for the regression: https://github.com/fwupd/fwupd/pull/2902
- # Maintainer says a new release is to be expected in a few days:
- # https://twitter.com/hughsient/status/1362476792297185289
- # In the mean time, please do not release 1.5.6 and go strait to 1.5.7
- version = "1.5.5";
+ version = "1.5.7";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -106,7 +100,7 @@ let
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
- sha256 = "0c2m9qz1g7zxqc6w90w9hksf8y9hvlh0vyvx06q01x893j5hzxh6";
+ sha256 = "16isrrv6zhdgccbfnz7km5g1cnvfnip7aiidkfhf5dlnrnyb2sxh";
};
patches = [
@@ -189,6 +183,11 @@ let
"-Defi-libdir=${gnu-efi}/lib"
"-Defi-ldsdir=${gnu-efi}/lib"
"-Defi-includedir=${gnu-efi}/include/efi"
+ "-Defi_sbat_distro_id=nixos"
+ "-Defi_sbat_distro_summary=NixOS"
+ "-Defi_sbat_distro_pkgname=fwupd"
+ "-Defi_sbat_distro_version=${version}"
+ "-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd&from=0&size=50&sort=relevance&query=fwupd"
"--localstatedir=/var"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
@@ -236,6 +235,8 @@ let
contrib/get-version.py \
contrib/generate-version-script.py \
meson_post_install.sh \
+ plugins/uefi-capsule/efi/generate_sbat.py \
+ plugins/uefi-capsule/efi/generate_binary.py \
po/make-images \
po/make-images.sh \
po/test-deps
@@ -250,8 +251,8 @@ let
testFw = fetchFromGitHub {
owner = "fwupd";
repo = "fwupd-test-firmware";
- rev = "42b62c62dc85ecfb8e38099fe5de0625af87a722";
- sha256 = "XUpxE003DZSeLJMtyV5UN5CNHH89/nEVKpCbMStm91Q=";
+ rev = "c13bfb26cae5f4f115dd4e08f9f00b3cb9acc25e";
+ sha256 = "US81i7mtLEe85KdWz5r+fQTk61IhqjVkzykBaBPuKL4=";
};
in ''
# These files have weird licenses so they are shipped separately.
@@ -311,6 +312,7 @@ let
# DisabledPlugins key in fwupd/daemon.conf
defaultDisabledPlugins = [
"test"
+ "test_ble"
"invalid"
];
diff --git a/pkgs/os-specific/linux/greetd/default.nix b/pkgs/os-specific/linux/greetd/default.nix
new file mode 100644
index 000000000000..fc5dd04b43c1
--- /dev/null
+++ b/pkgs/os-specific/linux/greetd/default.nix
@@ -0,0 +1,51 @@
+{ rustPlatform
+, lib
+, fetchFromSourcehut
+, pam
+, scdoc
+, installShellFiles
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "greetd";
+ version = "0.7.0";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = pname;
+ rev = version;
+ sha256 = "b+S3fuJ8gjnSQzLHl3Bs9iO/Un2ynggAplz01GjJvFI=";
+ };
+
+ cargoSha256 = "w6d8rIc03Qa2/TpztpyVijjd3y0Vo38+JDhsOkSFG5E=";
+
+ nativeBuildInputs = [
+ scdoc
+ installShellFiles
+ ];
+
+ buildInputs = [
+ pam
+ ];
+
+ postInstall = ''
+ for f in man/*; do
+ scdoc < "$f" > "$(sed 's/-\([0-9]\)\.scd$/.\1/' <<< "$f")"
+ rm "$f"
+ done
+ installManPage man/*
+ '';
+
+ meta = with lib; {
+ description = "Minimal and flexible login manager daemon";
+ longDescription = ''
+ greetd is a minimal and flexible login manager daemon
+ that makes no assumptions about what you want to launch.
+ Comes with agreety, a simple, text-based greeter.
+ '';
+ homepage = "https://kl.wtf/projects/greetd/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/gtkgreet/default.nix b/pkgs/os-specific/linux/gtkgreet/default.nix
new file mode 100644
index 000000000000..7ab7c01475bd
--- /dev/null
+++ b/pkgs/os-specific/linux/gtkgreet/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, lib
+, fetchFromSourcehut
+, pkg-config
+, cmake
+, meson
+, ninja
+, gtk3
+, gtk-layer-shell
+, json_c
+, scdoc
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gtkgreet";
+ version = "0.7";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = pname;
+ rev = version;
+ sha256 = "ms+2FdtzzNlmlzNxFhu4cpX5H+5H+9ZOtZ0p8uVA3lo=";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ meson
+ ninja
+ cmake
+ ];
+
+ buildInputs = [
+ gtk3
+ gtk-layer-shell
+ json_c
+ scdoc
+ ];
+
+ mesonFlags = [
+ "-Dlayershell=enabled"
+ ];
+
+ meta = with lib; {
+ description = "GTK based greeter for greetd, to be run under cage or similar";
+ homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index afd495dd6d1d..affc18e8f37d 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "iproute2";
- version = "5.10.0";
+ version = "5.11.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1sakmhvh40gh4x55vzgy6cyvizqkhqalcfpvs6r0c14w62p38jm5";
+ sha256 = "0m2wa14rhmdb6k07minmw5lk97vz4vn56ndka5849cqjh88fmqn5";
};
preConfigure = ''
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 11886e8e9c6a..6e703feb992a 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchgit
-, fetchpatch
, autoreconfHook
, pkg-config
, ell
@@ -13,12 +12,12 @@
stdenv.mkDerivation rec {
pname = "iwd";
- version = "1.11";
+ version = "1.12";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version;
- sha256 = "0wnyg0f1swi7gvvgf5kzbiz44g2wscf5d5bp320iwyfwnlbqb1bn";
+ sha256 = "sha256-o3Vc5p/AFZwbkEWJZzO6wWAJ/BmSh0eKxdnjm5B9BFU=";
};
outputs = [ "out" "man" ]
@@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
description = "Wireless daemon for Linux";
- license = licenses.lgpl21;
+ license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill fpletz ];
};
diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix
index acffa383f076..e4a7522fe597 100644
--- a/pkgs/os-specific/linux/kernel/hardened/config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened/config.nix
@@ -55,8 +55,8 @@ assert (versionAtLeast version "4.9");
# Wipe higher-level memory allocations on free() with page_poison=1
PAGE_POISONING = yes;
- PAGE_POISONING_NO_SANITY = yes;
- PAGE_POISONING_ZERO = yes;
+ PAGE_POISONING_NO_SANITY = whenOlder "5.11" yes;
+ PAGE_POISONING_ZERO = whenOlder "5.11" yes;
# Enable the SafeSetId LSM
SECURITY_SAFESETID = whenAtLeast "5.1" yes;
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index c7d9376f1b92..d1d8c9c55595 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,26 +1,32 @@
{
"4.14": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.224-hardened1.patch",
- "sha256": "017bczkz0njj5icr3xzw8ai7kgyg919k8jnj3iq8d865db4n9nid",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.224-hardened1/linux-hardened-4.14.224-hardened1.patch"
+ "name": "linux-hardened-4.14.226-hardened1.patch",
+ "sha256": "12h42fsr1sc2zgr1cb2ais0aivg4hpg9x4gc762r7cd4l40fyyg9",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.226-hardened1/linux-hardened-4.14.226-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.179-hardened1.patch",
- "sha256": "1j6gvwjkigv47rc5wcc3cng0n1k1wfw27i34lb5zzlxzkjwbs1rx",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.179-hardened1/linux-hardened-4.19.179-hardened1.patch"
+ "name": "linux-hardened-4.19.182-hardened1.patch",
+ "sha256": "02848qbglzj0w8lwic0fp19zc2b3d229ghfn804qx2h2rxh48c96",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.182-hardened1/linux-hardened-4.19.182-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.22-hardened1.patch",
- "sha256": "0ja7pcc999p6vy16gn4syb4vq7rlqckfrf5z2b4a7rzdzxcm6ji8",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.22-hardened1/linux-hardened-5.10.22-hardened1.patch"
+ "name": "linux-hardened-5.10.25-hardened1.patch",
+ "sha256": "0d5fid229769frifr7g20ly553gxdqqvajfwyzqwjpr82jjzxlis",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.25-hardened1/linux-hardened-5.10.25-hardened1.patch"
+ },
+ "5.11": {
+ "extra": "-hardened1",
+ "name": "linux-hardened-5.11.8-hardened1.patch",
+ "sha256": "1qlvhj8g6vkg3bsd3fl27n6j5c3ykcyypigf22vfy8yl55mnbmv6",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.8-hardened1/linux-hardened-5.11.8-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.104-hardened1.patch",
- "sha256": "0dk0s23vr9vdh8aa7g3f6ygvqry4rw057i18sfnfsr18r7xslhna",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.104-hardened1/linux-hardened-5.4.104-hardened1.patch"
+ "name": "linux-hardened-5.4.107-hardened1.patch",
+ "sha256": "1wy66a97zjrk2g061xj0va0km3y15m0w4p1bvqsyvjlj5x4wwmwh",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.107-hardened1/linux-hardened-5.4.107-hardened1.patch"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 92a28f9c460f..5052d3754b39 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 lib;
buildLinux (args // rec {
- version = "4.14.224";
+ version = "4.14.226";
# 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 = "1x8wyj28zcx6nn3mkfvs7aywrq1rd8xam5f3r02mynb09kn5hdnq";
+ sha256 = "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s";
};
} // (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 342bb6990bd1..8d2f607dbf65 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 lib;
buildLinux (args // rec {
- version = "4.19.179";
+ version = "4.19.182";
# 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 = "14iy4i6xm2mva359dyrx6s1djpw7rxvnkydcbm6lnfvn7sik37a9";
+ sha256 = "0r93mgvjypmj0glg0912vfq9zbagi59w4d88ynz5gm8sl05pbnq5";
};
} // (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 e96de093c0fe..941a1dda9b9a 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 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.260";
+ version = "4.4.262";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1vl8zhlkhqbw2xqvkqhw1z75mrzk5lsdcj8bd2k2fw7cbwa00ln6";
+ sha256 = "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j";
};
} // (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 4136c4f634ec..6d9bb6111dc4 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 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.260";
+ version = "4.9.262";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1xcgqvk1g3l9bidpx377rbbwzvyxb0sbkszlk722bj7vk6c4asmq";
+ sha256 = "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index bdecf6a9bb4f..80b3ee780cdd 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.22";
+ version = "5.10.25";
# 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 = "1pv3661d1gvkdl2jg6wx95lr5lcp6q77jrmx0m4a6z6n6asicnr4";
+ sha256 = "1p8s8vp5b6vjmvhj3plm0pr0d9qp5lrwm6l40a4bjr1vk9myf2lk";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix
index 1a7bbd1288bf..6f59b234ef48 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.11.5";
+ version = "5.11.8";
# 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 = "0srxpl44px1fr7y6nl8pq61vmbkkdbsmxy5k7wvqka33gdhy8212";
+ sha256 = "17y8q0gy4b00rms6pgglzmzz4msvmn2frqvln9vac39m78k3kyci";
};
} // (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 16ac3baa65e8..cb5e9ef7a22a 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 lib;
buildLinux (args // rec {
- version = "5.4.104";
+ version = "5.4.107";
# 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 = "1p8459plp3a6xw7cib34p7bddjs0dlv2m34dy4z6bbsvgfg51m74";
+ sha256 = "0q3m4d96d0hhhzn71aarh314i4cx9h3qvhhi5hrmcsrnbxafyg0w";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
index b437bb498883..d8fc7a71b591 100644
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
- version = "5.11.1";
+ version = "5.11.8";
suffix = "lqx1";
in
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
- sha256 = "00cji0dkfsjz6agwvcqpy7771hqbzcxk8awpbhlhpwa5j161r7l4";
+ sha256 = "1zvd74l6vb0rwrkwwh67i8l6ipin0p981vzdmiwpbpfzasbw59xk";
};
extraMeta = {
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index 6f9b1eaa31da..0aa63af52d8b 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.4.102-rt53"; # updated by ./update-rt.sh
+ version = "5.4.106-rt54"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "1vcscg7cn8qycay913nbc1xl1691anhvakkxwx54s0pnqghpqsgx";
+ sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "0d1653cd5dcv4p13mxmva3jz5mp1phvmibfabhha0wsiqkabvx80";
+ sha256 = "0xwbpn1k1b4bxq15sw7gicrzkfg32nkja308a5pcwx1ihv9khchf";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index e54a05c6e8e3..0323bf81c76c 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
let
- version = "5.11.1";
+ version = "5.11.8";
suffix = "zen1";
in
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
- sha256 = "10xpb6r1ccqy2lsndf16dksi40z1cgm3wqjp3yjwzhad8zdjlm5d";
+ sha256 = "1hb05shhqb6747m131sw30h36ak1m9bwzhfldjypn8phlfkflgkq";
};
extraMeta = {
diff --git a/pkgs/os-specific/linux/kmod/darwin.patch b/pkgs/os-specific/linux/kmod/darwin.patch
index 69dbf479f9f1..e112e6915250 100644
--- a/pkgs/os-specific/linux/kmod/darwin.patch
+++ b/pkgs/os-specific/linux/kmod/darwin.patch
@@ -121,3 +121,15 @@ index fd2028d..ecb0141 100644
if (!cwd)
return NULL;
+--- a/shared/util.h 2018-01-31 18:10:59.000000000 +0100
++++ b/shared/util.h 2020-12-28 19:48:21.000000000 +0100
+@@ -7,6 +7,9 @@
+ #include
+ #include
+ #include
++#ifdef __APPLE__
++#include
++#endif
+
+ #include
+
diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix
index 4cb70faee966..1b1acdb535f5 100644
--- a/pkgs/os-specific/linux/lsiutil/default.nix
+++ b/pkgs/os-specific/linux/lsiutil/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
srcs = [ src "Source/lsiutil.tar.gz" ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
sourceRoot = "lsiutil";
diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix
new file mode 100644
index 000000000000..258f4296e2e0
--- /dev/null
+++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix
@@ -0,0 +1,34 @@
+{ lib, stdenv, kernel, fetchFromGitHub, }:
+
+stdenv.mkDerivation rec {
+ pname = "mbp2018-bridge-drv";
+ version = "0.01";
+
+ src = fetchFromGitHub {
+ owner = "MCMrARM";
+ repo = "mbp2018-bridge-drv";
+ rev = "${version}";
+ sha256 = "0ac2l51ybfrvg8m36x67rsvgjqs1vwp7c89ssvbjkrcq3y4qdb53";
+ };
+
+ buildPhase = ''
+ make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \
+ -j$NIX_BUILD_CORES M=$(pwd) modules
+ '';
+
+ installPhase = ''
+ make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \
+ INSTALL_MOD_PATH=$out M=$(pwd) modules_install
+ '';
+
+ meta = with lib; {
+ description = "A driver for MacBook models 2018 and newer, which makes the keyboard, mouse and audio output work.";
+ longDescription = ''
+ A driver for MacBook models 2018 and newer, implementing the VHCI (required for mouse/keyboard/etc.) and audio functionality.
+ '';
+ homepage = "https://github.com/MCMrARM/mbp2018-bridge-drv";
+ license = lib.licenses.gpl2Only;
+ platforms = platforms.linux;
+ maintainers = [ lib.maintainers.hlolli ];
+ };
+}
diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix
index 67356719ffdb..1e6a55a4d656 100644
--- a/pkgs/os-specific/linux/msr-tools/default.nix
+++ b/pkgs/os-specific/linux/msr-tools/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
preInstall = ''
mkdir -p $out/bin
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 3310692b31dc..ae175a363241 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -40,11 +40,11 @@ let
in
stdenv.mkDerivation rec {
pname = "musl";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchurl {
- url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz";
- sha256 = "0jz8fzwgvfyjgxjbpw35ixdglp2apqjvp8m386f6yr4zacc6xbv8";
+ url = "https://musl.libc.org/releases/${pname}-${version}.tar.gz";
+ sha256 = "1p8r6bac64y98ln0wzmnixysckq3crca69ys7p16sy9d04i975lv";
};
enableParallelBuilding = true;
@@ -67,12 +67,6 @@ stdenv.mkDerivation rec {
url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch";
sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n";
})
- # wcsnrtombs destination buffer overflow, remove >= 1.2.2
- (fetchurl {
- name = "CVE-2020-28928.patch";
- url = "https://www.openwall.com/lists/oss-security/2020/11/20/4/1";
- sha256 = "077n2p165504nz9di6n8y5421591r3lsbcxgih8z26l6mvkhcs2h";
- })
];
CFLAGS = [ "-fstack-protector-strong" ]
++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64";
@@ -149,7 +143,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An efficient, small, quality libc implementation";
- homepage = "http://www.musl-libc.org";
+ homepage = "https://musl.libc.org/";
+ changelog = "https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice dtzWill ];
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 461a65c007b2..c9410c27df96 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "net-tools";
- version = "1.60_p20180626073013";
+ version = "2.10";
src = fetchurl {
url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz";
- sha256 = "0mzsjjmz5kn676w2glmxwwd8bj0xy9dhhn21aplb435b767045q4";
+ sha256 = "sha256-smJDWlJB6Jv6UcPKvVEzdTlS96e3uT8y4Iy52W9YDWk=";
};
preBuild =
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 47179afe515f..5874f334fedb 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -295,7 +295,7 @@ fi
# Resolve the flake.
if [[ -n $flake ]]; then
- flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
+ flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
fi
# Find configuration.nix and open editor instead of building.
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix
index d796bf579f12..2f8a4feb0301 100644
--- a/pkgs/os-specific/linux/numactl/default.nix
+++ b/pkgs/os-specific/linux/numactl/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
patchShebangs test
'';
+ LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
+
# You probably shouldn't ever run these! They will reconfigure Linux
# NUMA settings, which on my build machine makes the rest of package
# building ~5% slower until reboot. Ugh!
@@ -26,6 +28,6 @@ stdenv.mkDerivation rec {
description = "Library and tools for non-uniform memory access (NUMA) machines";
homepage = "https://github.com/numactl/numactl";
license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21
- platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix
index 7f26ae80ed67..5e4e15c364bd 100644
--- a/pkgs/os-specific/linux/pam_mount/default.nix
+++ b/pkgs/os-specific/linux/pam_mount/default.nix
@@ -2,16 +2,15 @@
stdenv.mkDerivation rec {
pname = "pam_mount";
- version = "2.16";
+ version = "2.17";
src = fetchurl {
- url = "mirror://sourceforge/pam-mount/pam_mount/${version}/${pname}-${version}.tar.xz";
- sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf";
+ url = "mirror://sourceforge/pam-mount/pam_mount/${pname}-${version}.tar.xz";
+ sha256 = "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy";
};
patches = [
./insert_utillinux_path_hooks.patch
- ./support_luks2.patch
];
postPatch = ''
@@ -31,7 +30,6 @@ stdenv.mkDerivation rec {
"--sbindir=${placeholder "out"}/bin"
"--sysconfdir=${placeholder "out"}/etc"
"--with-slibdir=${placeholder "out"}/lib"
- "--with-ssbindir=${placeholder "out"}/bin"
];
postInstall = ''
diff --git a/pkgs/os-specific/linux/pam_mount/support_luks2.patch b/pkgs/os-specific/linux/pam_mount/support_luks2.patch
deleted file mode 100644
index 0b8557f1bae0..000000000000
--- a/pkgs/os-specific/linux/pam_mount/support_luks2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit d4434c05e7c0cf05d87089404cfa2deedc60811a
-Author: Ingo Franzki
-Date: Mon Oct 29 16:47:40 2018 +0100
-
- crypto: Add support for LUKS2
-
- Cryptsetup version 2.0 added support for LUKS2.
- This patch adds support for mounting LUKS2 volumes with
- pam_mount.
-
- Signed-off-by: Ingo Franzki
-
-diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c
-index d0ab6ca..abd0358 100644
---- a/src/crypto-dmc.c
-+++ b/src/crypto-dmc.c
-@@ -21,6 +21,12 @@
- #include "libcryptmount.h"
- #include "pam_mount.h"
-
-+#ifndef CRYPT_LUKS
-+ #define CRYPT_LUKS NULL /* Passing NULL to crypt_load will
-+ default to LUKS(1) on older
-+ libcryptsetup versions. */
-+#endif
-+
- /**
- * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt)
- * @path: path to the crypto container
-@@ -48,7 +54,7 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev)
-
- ret = crypt_init(&cd, device);
- if (ret == 0) {
-- ret = crypt_load(cd, CRYPT_LUKS1, NULL);
-+ ret = crypt_load(cd, CRYPT_LUKS, NULL);
- if (ret == -EINVAL)
- ret = false;
- else if (ret == 0)
-@@ -106,7 +112,7 @@ static bool dmc_run(const struct ehd_mount_request *req,
- #endif
- }
-
-- ret = crypt_load(cd, CRYPT_LUKS1, NULL);
-+ ret = crypt_load(cd, CRYPT_LUKS, NULL);
- if (ret == 0) {
- ret = crypt_activate_by_passphrase(cd, mt->crypto_name,
- CRYPT_ANY_SLOT, req->key_data, req->key_size, flags);
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index f69b2bd7fcec..40159cd2acd8 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pax-utils";
- version = "1.2.6";
+ version = "1.2.8";
src = fetchurl {
url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
- sha256 = "08bzvgv1z3371sqf7zlm9i0b1y3wdymj2dqdvzvf192k3nix4hlp";
+ sha256 = "sha256-urTIhG4dLMNmnPqSMdIdszWEHX1Y+eGc0Jn+bOYmsVc=";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/os-specific/linux/s6-linux-init/default.nix
index 87cc098d07d4..41790e5eb781 100644
--- a/pkgs/os-specific/linux/s6-linux-init/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-init/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-linux-init";
- version = "1.0.6.0";
- sha256 = "0kzif3dqhm7h4h7c6npzdbcy7w756222g8ysw116fgb8j385dr6w";
+ version = "1.0.6.1";
+ sha256 = "0sq8ya39a1qs61cdjns8ijwrvxnqd4snk2ab4j5wl9a87i7wixhn";
description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix
index a2ffcae3d6bf..2e9e445eddc5 100644
--- a/pkgs/os-specific/linux/seturgent/default.nix
+++ b/pkgs/os-specific/linux/seturgent/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation {
sha256 = "0q1sr6aljkw2jr9b4xxzbc01qvnd5vk3pxrypif9yd8xjw4wqwri";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- libX11 xorgproto unzip
+ libX11 xorgproto
];
installPhase = ''
diff --git a/pkgs/os-specific/linux/tuigreet/default.nix b/pkgs/os-specific/linux/tuigreet/default.nix
new file mode 100644
index 000000000000..b6db7cfbb7fd
--- /dev/null
+++ b/pkgs/os-specific/linux/tuigreet/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "tuigreet";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "apognu";
+ repo = pname;
+ rev = version;
+ sha256 = "1fk8ppxr3a8vdp7g18pp3sgr8b8s11j30mcqpdap4ai14v19idh8";
+ };
+
+ cargoSha256 = "0qpambizjy6z44spnjnh2kd8nay5953mf1ga2iff2mjlv97zpq22";
+
+ meta = with lib; {
+ description = "Graphical console greter for greetd";
+ homepage = "https://github.com/apognu/tuigreet";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/wlgreet/default.nix b/pkgs/os-specific/linux/wlgreet/default.nix
new file mode 100644
index 000000000000..e48443b1b1e6
--- /dev/null
+++ b/pkgs/os-specific/linux/wlgreet/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, rustPlatform
+, fetchFromSourcehut
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "wlgreet";
+ version = "2020-10-20";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = pname;
+ rev = "4425d296b81550cce01f044fbd7ff083e37550f4";
+ sha256 = "0n0lzg3y1z5s9s6kfkdj5q8w67bqpw08hqfccc5kz0ninzy9j0cc";
+ };
+
+ cargoSha256 = "01bfv2kzg2r9z75b8pq61n2ydc8l5zh69jdyjpj931l642f6kd5a";
+
+ meta = with lib; {
+ description = "Raw wayland greeter for greetd, to be run under sway or similar";
+ homepage = "https://git.sr.ht/~kennylevinsen/wlgreet";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix
index baba0ecdf0ab..71584aff7760 100644
--- a/pkgs/os-specific/solo5/default.nix
+++ b/pkgs/os-specific/solo5/default.nix
@@ -1,6 +1,16 @@
{ lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }:
-let version = "0.6.8";
+let
+ version = "0.6.8";
+ # list of all theoretically available targets
+ targets = [
+ "genode"
+ "hvt"
+ "muen"
+ "spt"
+ "virtio"
+ "xen"
+ ];
in stdenv.mkDerivation {
pname = "solo5";
inherit version;
@@ -29,21 +39,26 @@ in stdenv.mkDerivation {
export DESTDIR=$out
export PREFIX=$out
make install-tools
- ${lib.optionalString stdenv.hostPlatform.isLinux "make ${
- (lib.concatMapStringsSep " " (x: "install-opam-${x}") [ "hvt" "spt" ])
- }"}
+
+ # get CONFIG_* vars from Makeconf which also parse in sh
+ grep '^CONFIG_' Makeconf > nix_tmp_targetconf
+ source nix_tmp_targetconf
+ # install opam / pkg-config files for all enabled targets
+ ${lib.concatMapStrings (bind: ''
+ [ -n "$CONFIG_${lib.toUpper bind}" ] && make install-opam-${bind}
+ '') targets}
+
runHook postInstall
'';
- doCheck = true;
+ doCheck = stdenv.hostPlatform.isLinux;
checkInputs = [ util-linux qemu ];
- checkPhase = if stdenv.hostPlatform.isLinux then
- ''
+ checkPhase = ''
+ runHook preCheck
patchShebangs tests
./tests/bats-core/bats ./tests/tests.bats
- ''
- else
- null;
+ runHook postCheck
+ '';
meta = with lib; {
description = "Sandboxed execution environment";
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 6100498f9bf8..c2d13b00aa83 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv";
};
+ nativeBuildInputs = [ unzip ];
buildInputs =
- [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync glibcLocales ]
+ [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ]
++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix
index d68646c42752..1356f1c7a07c 100644
--- a/pkgs/servers/bazarr/default.nix
+++ b/pkgs/servers/bazarr/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, lib, fetchurl, makeWrapper, python3, nixosTests }:
+{ stdenv, lib, fetchurl, makeWrapper, python3, unrar, ffmpeg, nixosTests }:
stdenv.mkDerivation rec {
pname = "bazarr";
- version = "0.9.0.8";
+ version = "0.9.2";
src = fetchurl {
url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
- sha256 = "sha256-Ecbx7FHpcEkcWBAKCtZPtQKX5ibvU4tajSJ5pyEboKc=";
+ sha256 = "16mh7v8z5ijr75pvavcj6225w6bg12qy1d1w9vm2d5axnfm3wfbk";
};
nativeBuildInputs = [ makeWrapper ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
makeWrapper "${(python3.withPackages (ps: [ps.lxml ps.numpy])).interpreter}" \
$out/bin/bazarr \
--add-flags "$out/src/bazarr.py" \
+ --suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]} \
'';
passthru.tests = {
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Subtitle manager for Sonarr and Radarr";
homepage = "https://www.bazarr.media/";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ xwvvvvwx ];
platforms = platforms.all;
};
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index e90445e29c89..bc8c8df3551b 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -58,7 +58,7 @@ in
};
bird2 = generic {
- version = "2.0.7";
- sha256 = "0rhhbfmfw2d93rvhglv03rdzxsq2disw6s1wm8d6bgdxmrc2n7b3";
+ version = "2.0.8";
+ sha256 = "1xp7f0im1v8pqqx3xqyfkd1nsxk8vnbqgrdrwnwhg8r5xs1xxlhr";
};
}
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index daebf174fafd..07c636b6e5ba 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0xc6lfilfkkjyds59b6c770gj21v9srzpln31c9qb3ls6hzic8gn";
};
- buildInputs = [ zip unzip ];
+ nativeBuildInputs = [ zip unzip ];
installPhase = ''
mkdir -p $out/share/${name}
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index cf0417e332e8..6a8c6541c2cc 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, libtool, gettext, zlib, readline, gsasl
-, guile, python, pcre, libffi, groff }:
+, guile, python2, pcre, libffi, groff }:
stdenv.mkDerivation rec {
pname = "dico";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs =
- [ libtool gettext zlib readline gsasl guile python pcre libffi groff ];
+ [ libtool gettext zlib readline gsasl guile python2 pcre libffi groff ];
doCheck = true;
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 3f76d60233cc..8378102dac53 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -1,10 +1,10 @@
-{lib, stdenv, python, wordnet, writeScript}:
+{lib, stdenv, python2, wordnet, writeScript}:
stdenv.mkDerivation rec {
version = "542";
pname = "dict-db-wordnet";
- buildInputs = [python wordnet];
+ buildInputs = [python2 wordnet];
convert = ./wordnet_structures.py;
builder = writeScript "builder.sh" ''
diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix
index cd0c9c6c24bc..3a01120f3a68 100644
--- a/pkgs/servers/dict/wiktionary/default.nix
+++ b/pkgs/servers/dict/wiktionary/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, dict, glibcLocales }:
+{ lib, stdenv, fetchurl, python2, dict, glibcLocales }:
stdenv.mkDerivation rec {
version = "20210201";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
convert = ./wiktionary2dict.py;
- buildInputs = [ python dict glibcLocales ];
+ buildInputs = [ python2 dict glibcLocales ];
builder = ./builder.sh;
passthru.updateScript = ./update.sh;
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 2a9e00b266bd..2b407074caf4 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "3.0.4";
+ version = "3.0.5";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "451d8913a769b7e4bcb3e250a3181b448e28a82cfc58cea6f2509475d7327983";
+ sha256 = "695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 78addfc4aa2f..b3a876546e78 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -2,7 +2,7 @@
, lib, fetchurl, fetchpatch, fetchFromGitHub
, cmake, ninja, which, findutils, m4, gawk
-, python, python3, openjdk, mono, libressl, boost
+, python2, python3, openjdk, mono, libressl, boost
}@args:
let
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix
index aac9ab07c0f7..e171d7145647 100644
--- a/pkgs/servers/foundationdb/vsmake.nix
+++ b/pkgs/servers/foundationdb/vsmake.nix
@@ -4,7 +4,7 @@
{ gcc6Stdenv, lib, fetchurl, fetchFromGitHub
, which, findutils, m4, gawk
-, python, openjdk, mono, libressl
+, python2, openjdk, mono, libressl
, ...
}:
@@ -51,7 +51,7 @@ let
inherit rev sha256;
};
- nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ];
+ nativeBuildInputs = [ python2 openjdk gawk which m4 findutils mono ];
buildInputs = [ libressl boost ];
inherit patches;
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 4614e1d64cad..1e5697cb59d8 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -1,8 +1,19 @@
-{ lib, python3, fetchFromGitHub }:
+{ lib
+, python3
+, fetchFromGitHub
+}:
let
python = python3.override {
packageOverrides = self: super: {
+ astral = super.astral.overridePythonAttrs (oldAttrs: rec {
+ version = "1.10.1";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "1wbvnqffbgh8grxm07cabdpahlnyfq91pyyaav432cahqi1p59nj";
+ };
+ });
+
bcrypt = super.bcrypt.overridePythonAttrs (oldAttrs: rec {
version = "3.1.7";
src = oldAttrs.src.override {
@@ -24,10 +35,11 @@ let
in python.pkgs.buildPythonApplication rec {
pname = "appdaemon";
version = "4.0.5";
+ disabled = python.pythonOlder "3.6";
src = fetchFromGitHub {
- owner = "home-assistant";
- repo = "appdaemon";
+ owner = "AppDaemon";
+ repo = pname;
rev = version;
sha256 = "7o6DrTufAC+qK3dDfpkuQMQWuduCZ6Say/knI4Y07QM=";
};
@@ -58,17 +70,17 @@ in python.pkgs.buildPythonApplication rec {
--replace "sockjs==0.10.0" "sockjs" \
--replace "deepdiff==4.3.1" "deepdiff" \
--replace "voluptuous==0.11.7" "voluptuous" \
- --replace "astral==1.10.1" "astral" \
--replace "python-socketio==4.4.0" "python-socketio" \
--replace "feedparser==5.2.1" "feedparser>=5.2.1" \
--replace "aiohttp_jinja2==1.2.0" "aiohttp_jinja2>=1.2.0" \
--replace "pygments==2.6.1" "pygments>=2.6.1" \
- --replace "paho-mqtt==1.5.0" "paho-mqtt>=1.5.0"
+ --replace "paho-mqtt==1.5.0" "paho-mqtt>=1.5.0" \
+ --replace "websocket-client==0.57.0" "websocket-client>=0.57.0"
'';
meta = with lib; {
description = "Sandboxed Python execution environment for writing automation apps for Home Assistant";
- homepage = "https://github.com/home-assistant/appdaemon";
+ homepage = "https://github.com/AppDaemon/appdaemon";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg dotlambda ];
};
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 7be68d087e77..f41c5556d717 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -151,7 +151,7 @@
"datadog" = ps: with ps; [ datadog ];
"ddwrt" = ps: with ps; [ ];
"debugpy" = ps: with ps; [ debugpy ];
- "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz
+ "deconz" = ps: with ps; [ pydeconz ];
"decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
"default_config" = ps: with ps; [ pynacl aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ];
@@ -192,7 +192,7 @@
"dublin_bus_transport" = ps: with ps; [ ];
"duckdns" = ps: with ps; [ ];
"dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd
- "dwd_weather_warnings" = ps: with ps; [ ]; # missing inputs: dwdwfsapi
+ "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ];
"dweet" = ps: with ps; [ ]; # missing inputs: dweepy
"dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
"dyson" = ps: with ps; [ aiohttp-cors libpurecool zeroconf ];
@@ -236,7 +236,7 @@
"etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api
"eufy" = ps: with ps; [ ]; # missing inputs: lakeside
"everlights" = ps: with ps; [ pyeverlights ];
- "evohome" = ps: with ps; [ ]; # missing inputs: evohome-async
+ "evohome" = ps: with ps; [ evohome-async ];
"ezviz" = ps: with ps; [ ]; # missing inputs: pyezviz
"faa_delays" = ps: with ps; [ faadelays ];
"facebook" = ps: with ps; [ ];
@@ -374,7 +374,7 @@
"hydrawise" = ps: with ps; [ hydrawiser ];
"hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py
"iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
- "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink
+ "iaqualink" = ps: with ps; [ iaqualink ];
"icloud" = ps: with ps; [ pyicloud ];
"idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py
"ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
@@ -385,7 +385,7 @@
"image_processing" = ps: with ps; [ aiohttp-cors ];
"imap" = ps: with ps; [ aioimaplib ];
"imap_email_content" = ps: with ps; [ ];
- "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client
+ "incomfort" = ps: with ps; [ incomfort-client ];
"influxdb" = ps: with ps; [ influxdb-client influxdb ];
"input_boolean" = ps: with ps; [ ];
"input_datetime" = ps: with ps; [ ];
@@ -424,7 +424,7 @@
"kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client
"kmtronic" = ps: with ps; [ pykmtronic ];
"knx" = ps: with ps; [ xknx ];
- "kodi" = ps: with ps; [ ]; # missing inputs: pykodi
+ "kodi" = ps: with ps; [ pykodi ];
"konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected
"kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky
"kwb" = ps: with ps; [ ]; # missing inputs: pykwb
@@ -563,7 +563,7 @@
"norway_air" = ps: with ps; [ pymetno ];
"notify" = ps: with ps; [ ];
"notify_events" = ps: with ps; [ ]; # missing inputs: notify-events
- "notion" = ps: with ps; [ ]; # missing inputs: aionotion
+ "notion" = ps: with ps; [ aionotion ];
"nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client
"nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents
"nuheat" = ps: with ps; [ ]; # missing inputs: nuheat
@@ -741,7 +741,7 @@
"sighthound" = ps: with ps; [ pillow simplehound ];
"signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi
"simplepush" = ps: with ps; [ ]; # missing inputs: simplepush
- "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python
+ "simplisafe" = ps: with ps; [ simplisafe-python ];
"simulated" = ps: with ps; [ ];
"sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms
"sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control
@@ -766,7 +766,7 @@
"snmp" = ps: with ps; [ pysnmp ];
"sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api
"socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient
- "solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge
+ "solaredge" = ps: with ps; [ solaredge stringcase ];
"solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local
"solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher
"solax" = ps: with ps; [ solax ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index dc61317876b0..6260906e0c25 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -28,6 +28,21 @@ let
(mkOverride "astral" "1.10.1"
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
+ # Pinned due to API changes in iaqualink>=2.0, remove after
+ # https://github.com/home-assistant/core/pull/48137 was merged
+ (self: super: {
+ iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec {
+ version = "0.3.4";
+ src = fetchFromGitHub {
+ owner = "flz";
+ repo = "iaqualink-py";
+ rev = "v${version}";
+ sha256 = "16mn6nd9x3hm6j6da99qhwbqs95hh8wx21r1h1m9csl76z77n9lh";
+ };
+ checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ];
+ });
+ })
+
# Pinned due to bug in ring-doorbell 0.7.0
# https://github.com/tchellomello/python-ring-doorbell/issues/240
(mkOverride "ring-doorbell" "0.6.2"
@@ -178,6 +193,7 @@ in with py.pkgs; buildPythonApplication rec {
"conversation"
"counter"
"cover"
+ "deconz"
"default_config"
"demo"
"derivative"
@@ -213,6 +229,7 @@ in with py.pkgs; buildPythonApplication rec {
"html5"
"http"
"hue"
+ "iaqualink"
"ifttt"
"image"
"image_processing"
@@ -250,6 +267,7 @@ in with py.pkgs; buildPythonApplication rec {
"mqtt_statestream"
"mullvad"
"notify"
+ "notion"
"number"
"ozw"
"panel_custom"
@@ -274,13 +292,17 @@ in with py.pkgs; buildPythonApplication rec {
"search"
"shell_command"
"shopping_list"
+ "simplisafe"
"simulated"
+ "sma"
"sensor"
"smarttub"
"smtp"
+ "solaredge"
"sql"
"ssdp"
"stream"
+ "subaru"
"sun"
"switch"
"system_health"
diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix
deleted file mode 100644
index daac48398538..000000000000
--- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, stdenv, fetchurl, apacheHttpd }:
-
-if lib.versionAtLeast (lib.getVersion apacheHttpd) "2.4" then
-
- throw "mod_evasive is not supported on Apache httpd 2.4"
-
-else
-
-stdenv.mkDerivation {
- name = "mod_evasive-1.10.1";
-
- src = fetchurl {
- url = "http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz";
- sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07";
- };
-
- buildInputs = [ apacheHttpd ];
-
- buildPhase = ''
- export APACHE_LIBEXECDIR=$out/modules
- export makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
- apxs -ca mod_evasive20.c
- '';
-
- installPhase = ''
- mkdir -p $out/modules
- cp .libs/mod_evasive20.so $out/modules
- '';
-
- meta = {
- homepage = "http://www.zdziarski.com/blog/?page_id=442";
- description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack";
- platforms = lib.platforms.linux;
- };
-}
diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix
index 04746d678c52..2762f636f592 100644
--- a/pkgs/servers/http/apache-modules/mod_perl/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, apacheHttpd, perl }:
stdenv.mkDerivation rec {
- name = "mod_perl-2.0.10";
+ pname = "mod_perl";
+ version = "2.0.11";
src = fetchurl {
- url = "mirror://apache/perl/${name}.tar.gz";
- sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi";
+ url = "mirror://apache/perl/${pname}-${version}.tar.gz";
+ sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
};
buildInputs = [ apacheHttpd perl ];
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index 72c6286af3f2..4ed03450af76 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "apt-cacher-ng";
- version = "3.6";
+ version = "3.6.1";
src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
- sha256 = "sha256-/4jA5acNpHpdQ9kb/1A9thtoUCqsYFxSCr4JLmFYdt4=";
+ sha256 = "sha256-avyjp4KH7l6OZxnMVDv1U/MIWcadqyPPtnLYzEYkqlA=";
};
nativeBuildInputs = [ cmake doxygen pkg-config ];
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index ba89d19db34b..fda57cb9a549 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index aad46be30b21..0c33ab431de0 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
- version = "1.19.7";
- sha256 = "03mmfnkhayn8vm2yhs3ngvif6275c368ymx8wvhsbls11h1dvr3s";
+ version = "1.19.8";
+ sha256 = "01cb6hsaik1sfjihbrldmwrcn54gk4plfy350sl1b4rml6qik29h";
}
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index e383d8f0d1b0..ab05d8cbb0ed 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
};
- buildInputs = [ unzip apacheAnt jdk ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ apacheAnt jdk ];
builder = ./builder.sh;
meta = {
diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix
index cf83b2946aeb..49259f49f2ef 100644
--- a/pkgs/servers/imgproxy/default.nix
+++ b/pkgs/servers/imgproxy/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "imgproxy";
- version = "2.16.0";
+ version = "2.16.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- sha256 = "sha256-HUWDwUt/yHgwzqtQKsQ3DrBAfL8PBqGhFLMwS7ix5qE=";
+ sha256 = "sha256-wr4yOrzZT/4WtRze9Yp+M18jusxdddoDd4xs5P7d5oQ=";
rev = "v${version}";
};
- vendorSha256 = "sha256-A03Qdwxv/uUKI4Lfmatqwu1RDH9vKU63Y+x25AdfZXs=";
+ vendorSha256 = "sha256-7IpMgsATQ1SMuBOF9agHIN2Lx6OKxRr0Zk5SRFxHiQ4=";
doCheck = false;
diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix
new file mode 100644
index 000000000000..f907e337ce6d
--- /dev/null
+++ b/pkgs/servers/irc/inspircd/default.nix
@@ -0,0 +1,221 @@
+let
+ # inspircd ships a few extra modules that users can load
+ # via configuration. Upstream thus recommends to ship as
+ # many of them as possible. There is however a problem:
+ # inspircd is licensed under the GPL version 2 only and
+ # some modules link libraries that are incompatible with
+ # the GPL 2. Therefore we can't provide them as binaries
+ # via our binary-caches, but users should still be able
+ # to override this package and build the incompatible
+ # modules themselves.
+ #
+ # This means for us we need to a) prevent hydra from
+ # building a module set with a GPL incompatibility
+ # and b) dynamically figure out the largest possible
+ # set of modules to use depending on stdenv, because
+ # the used libc needs to be compatible as well.
+ #
+ # For an overview of all modules and their licensing
+ # situation, see https://docs.inspircd.org/packaging/
+
+ # Predicate for checking license compatibility with
+ # GPLv2. Since this is _only_ used for libc compatibility
+ # checking, only whitelist licenses used by notable
+ # libcs in nixpkgs (musl and glibc).
+ compatible = lib: drv:
+ lib.any (lic: lic == drv.meta.license) [
+ lib.licenses.mit # musl
+ lib.licenses.lgpl2Plus # glibc
+ ];
+
+ # compatible if libc is compatible
+ libcModules = [
+ "regex_posix"
+ "sslrehashsignal"
+ ];
+
+ # compatible if libc++ is compatible
+ # TODO(sternenseemann):
+ # we could enable "regex_stdlib" automatically, but only if
+ # we are using libcxxStdenv which is compatible with GPLv2,
+ # since the gcc libstdc++ license is GPLv2-incompatible
+ libcxxModules = [
+ "regex_stdlib"
+ ];
+
+ compatibleModules = lib: stdenv: [
+ # GPLv2 compatible dependencies
+ "argon2"
+ "ldap"
+ "mysql"
+ "pgsql"
+ "regex_pcre"
+ "regex_re2"
+ "regex_tre"
+ "sqlite3"
+ "ssl_gnutls"
+ ] ++ lib.optionals (compatible lib stdenv.cc.libc) libcModules;
+
+in
+
+{ lib
+, stdenv
+, fetchFromGitHub
+, nixosTests
+, perl
+, pkg-config
+, libargon2
+, openldap
+, postgresql
+, libmysqlclient
+, pcre
+, tre
+, re2
+, sqlite
+, gnutls
+, libmaxminddb
+, openssl
+, mbedtls
+# For a full list of module names, see https://docs.inspircd.org/packaging/
+, extraModules ? compatibleModules lib stdenv
+}:
+
+let
+ extras = {
+ # GPLv2 compatible
+ argon2 = [
+ (libargon2 // {
+ meta = libargon2.meta // {
+ # use libargon2 as CC0 since ASL20 is GPLv2-incompatible
+ # updating this here is important that meta.license is accurate
+ # libargon2 is licensed under either ASL20 or CC0.
+ license = lib.licenses.cc0;
+ };
+ })
+ ];
+ ldap = [ openldap ];
+ mysql = [ libmysqlclient ];
+ pgsql = [ postgresql ];
+ regex_pcre = [ pcre ];
+ regex_re2 = [ re2 ];
+ regex_tre = [ tre ];
+ sqlite3 = [ sqlite ];
+ ssl_gnutls = [ gnutls ];
+ # depends on stdenv.cc.libc
+ regex_posix = [];
+ sslrehashsignal = [];
+ # depends on used libc++
+ regex_stdlib = [];
+ # GPLv2 incompatible
+ geo_maxmind = [ libmaxminddb ];
+ ssl_mbedtls = [ mbedtls ];
+ ssl_openssl = [ openssl ];
+ };
+
+ # buildInputs necessary for the enabled extraModules
+ extraInputs = lib.concatMap
+ (m: extras."${m}" or (builtins.throw "Unknown extra module ${m}"))
+ extraModules;
+
+ # if true, we can't provide a binary version of this
+ # package without violating the GPL 2
+ gpl2Conflict =
+ let
+ allowed = compatibleModules lib stdenv;
+ in
+ !lib.all (lib.flip lib.elem allowed) extraModules;
+
+ # return list of the license(s) of the given derivation
+ getLicenses = drv:
+ let
+ lics = drv.meta.license or [];
+ in
+ if lib.isAttrs lics || lib.isString lics
+ then [ lics ]
+ else lics;
+
+ # Whether any member of list1 is also member of list2, i. e. set intersection.
+ anyMembers = list1: list2:
+ lib.any (m1: lib.elem m1 list2) list1;
+
+in
+
+stdenv.mkDerivation rec {
+ pname = "inspircd";
+ version = "3.9.0";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0x3paasf4ynx4ddky2nq613vyirbhfnxzkjq148k7154pz3q426s";
+ };
+
+ outputs = [ "bin" "lib" "man" "doc" "out" ];
+
+ nativeBuildInputs = [
+ perl
+ pkg-config
+ ];
+ buildInputs = extraInputs;
+
+ configurePhase = ''
+ patchShebangs configure make/*.pl
+
+ # configure is executed twice, once to set the extras
+ # to use and once to do the Makefile setup
+ ./configure \
+ --enable-extras \
+ ${lib.escapeShellArg (lib.concatStringsSep " " extraModules)}
+
+ # this manually sets the flags instead of using configureFlags, because otherwise stdenv passes flags like --bindir, which make configure fail
+ ./configure \
+ --disable-auto-extras \
+ --distribution-label nixpkgs${version} \
+ --uid 0 \
+ --gid 0 \
+ --binary-dir ${placeholder "bin"}/bin \
+ --config-dir /etc/inspircd \
+ --data-dir ${placeholder "lib"}/lib/inspircd \
+ --example-dir ${placeholder "doc"}/share/doc/inspircd \
+ --log-dir /var/log/inspircd \
+ --manual-dir ${placeholder "man"}/share/man/man1 \
+ --module-dir ${placeholder "lib"}/lib/inspircd \
+ --runtime-dir /var/run \
+ --script-dir ${placeholder "bin"}/share/inspircd \
+ '';
+
+ postInstall = ''
+ # for some reasons the executables are not executable
+ chmod +x $bin/bin/*
+ '';
+
+ enableParallelBuilding = true;
+
+ passthru.tests = {
+ nixos-test = nixosTests.inspircd;
+ };
+
+ meta = {
+ description = "A modular C++ IRC server";
+ license = [ lib.licenses.gpl2Only ]
+ ++ lib.concatMap getLicenses extraInputs
+ ++ lib.optionals (anyMembers extraModules libcModules) (getLicenses stdenv.cc.libc)
+ # FIXME(sternenseemann): get license of used lib(std)c++ somehow
+ ++ lib.optional (anyMembers extraModules libcxxModules) "Unknown"
+ # Hack: Definitely prevent a hydra from building this package on
+ # a GPL 2 incompatibility even if it is not in a top-level attribute,
+ # but pulled in indirectly somehow.
+ ++ lib.optional gpl2Conflict lib.licenses.unfree;
+ maintainers = [ lib.maintainers.sternenseemann ];
+ # windows is theoretically possible, but requires extra work
+ # which I am not willing to do and can't test.
+ # https://github.com/inspircd/inspircd/blob/master/win/README.txt
+ platforms = lib.platforms.unix;
+ homepage = "https://www.inspircd.org/";
+ } // lib.optionalAttrs gpl2Conflict {
+ # make sure we never distribute a GPLv2-violating module
+ # in binary form. They can be built locally of course.
+ hydraPlatforms = [];
+ };
+}
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index c5d1f6c058ff..a89d4f216254 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.17.668";
+ version = "0.17.699";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "sha256-+cvUpWVpXEkW+d92aIOli+pNi+ZDHEbxDDQ67O6kOVA=";
+ sha256 = "sha256-dftllucRemUdZjYDLKPJ4XJ031OZpsW4bpJDuWPyses=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/jellyfin/10.5.x.nix b/pkgs/servers/jellyfin/10.5.x.nix
index da4d2c4c1d58..9bece72566f8 100644
--- a/pkgs/servers/jellyfin/10.5.x.nix
+++ b/pkgs/servers/jellyfin/10.5.x.nix
@@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- unzip
makeWrapper
];
diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index 6b67ef939dcc..92f31126e813 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -18,12 +18,12 @@ let
in stdenv.mkDerivation rec {
pname = "jellyfin";
- version = "10.7.0";
+ version = "10.7.1";
# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz";
- sha256 = "sha256-63T1EBjtTWxg41W5gBDYCthgnokZ/e/B1s6BmymO32w=";
+ sha256 = "sha256-pgFksZz0sD73uZDyUIhdFCgHPo67ZZiwklafyemJFGs=";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix
index 94a1832bd8d3..efd2b17d7e51 100644
--- a/pkgs/servers/kapowbang/default.nix
+++ b/pkgs/servers/kapowbang/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "kapowbang";
- version = "0.6.0";
+ version = "0.7.0";
subPackages = [ "." ];
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "BBVA";
repo = "kapow";
rev = "v${version}";
- sha256 = "sha256-+GZarnG+SlxynoXYTvI1f9eki3DobiDt7vUdWlC0ECk=";
+ sha256 = "sha256-0ftdc3ol1g0WnZgicXl46Xpph4cUYk/G/eeu+9JnPyA=";
};
- vendorSha256 = "sha256-vXu64o/MTmw9oZL4MIHB+PEfYLcKVh5A5iGZ1RW1Xd4=";
+ vendorSha256 = "sha256-41Jk3aTe4EA5dwkriEo48QNJg2k3T/R/8i8XWcURcG8=";
doCheck = false;
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index bfa372ed0692..90510d502525 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap
-, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python
+, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python3
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
buildInputs = [
perl pam nspr nss openldap db cyrus_sasl svrcore icu
- net-snmp kerberos pcre libevent openssl python
+ net-snmp kerberos pcre libevent openssl python3
] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
patches = [
diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
index 2ba07ee5739e..b61332be2432 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/roehling/postsrsd";
description = "Postfix Sender Rewriting Scheme daemon";
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 0740613bad7a..7a2eb9fd2cdf 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64;
stdenv.mkDerivation rec {
pname = "rspamd";
- version = "2.6";
+ version = "2.7";
src = fetchFromGitHub {
owner = "rspamd";
repo = "rspamd";
rev = version;
- sha256 = "0vwa7k2s2bkfb8w78z5izkd6ywjbzqysb0grls898y549hm8ii70";
+ sha256 = "sha256-LMLRDnKfGpApVsIvPNY2nxl+H5+qeVvwvwr3wdyyhjs=";
};
nativeBuildInputs = [ cmake pkg-config perl ];
diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix
index 4bc969a851c1..82d8d3026590 100644
--- a/pkgs/servers/mail/sympa/default.nix
+++ b/pkgs/servers/mail/sympa/default.nix
@@ -12,7 +12,6 @@ let
DBI
DateTimeFormatMail
DateTimeTimeZone
- DigestMD5
Encode
FCGI
FileCopyRecursive
@@ -28,7 +27,6 @@ let
libintl_perl
MHonArc
- MIMEBase64
MIMECharset
MIMETools
MIMEEncWords
@@ -56,8 +54,8 @@ let
IOSocketSSL
MailDKIM
NetDNS
- NetLDAP
- NetSMTP
+ perlldap
+ libnet
SOAPLite
]);
in
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index a9954b4a147f..468c46b12695 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.29.0";
+ version = "1.30.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-BySztUwVqyaL0AvmJMWEbjVqf981ABKMAU9f9C/0wkU=";
+ sha256 = "1ca69v479537bbj2hjliwk9zzy9fqqsf7fm188k6xxj0a37q9y41";
};
patches = [
diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index 6d12ac84d901..4235c7e26b1d 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "matterbridge";
- version = "1.21.0";
+ version = "1.22.0";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
src = fetchurl {
url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
- sha256 = "sha256-ehn6KdPpDpfdyWCVfLuZLq2dDmZXc6InlnovqNsdG6Y=";
+ sha256 = "sha256-jwatqxQh4t4tgNiOEjS9vxIM+9XtnH8QNch887+xDnI=";
};
meta = with lib; {
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index f63f76efabae..6a7ba06df885 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
let
- version = "5.25.3";
+ version = "5.32.1";
mattermost-server = buildGoPackage rec {
pname = "mattermost-server";
@@ -11,7 +11,7 @@ let
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
- sha256 = "03xcwlbb9ff5whsdn2m3kqskxpwpfciikjjndbhksc8k8963z07j";
+ sha256 = "BssrTfkIxUbXYXIfz9i+5b4rEYSzBim+/riK78m8Bxo=";
};
goPackagePath = "github.com/mattermost/mattermost-server";
@@ -29,7 +29,7 @@ let
src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
- sha256 = "1p1qxzrd6rj1i43vj18ysknrw2v02s7llx94nrdd5lk10ayzmg63";
+ sha256 = "kRerl3fYRTrotj86AIFSor3GpjhABkCmego1ms9HmkQ=";
};
installPhase = ''
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index a2ffe32acd27..ce53f30929de 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "minio";
- version = "2021-03-12T00-00-47Z";
+ version = "2021-03-17T02-33-02Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "sha256-7KHEmnrTw6SBhsImMjcv+b1wvFEg8AXgsuZTGp5iVis=";
+ sha256 = "sha256-nCCU9hSt8VaLpZmqZFl3GczqDJXEQJ4rFn/9B0gV/5g=";
};
vendorSha256 = "sha256-tMt6XRj1dd+AHqWA6WGm5GBFGx+IsP1ijYCj8cmUXy0=";
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index dc7ca728f2ce..9bf10165e007 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
- version = "7.4.3";
+ version = "7.4.5";
excludedPackages = [ "release_publisher" ];
@@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "sha256-FPQa6q1ks9Lpod5sI29YBnGZvVRU12hTiw6GR85/mEs=";
+ sha256 = "10pnwd4d19ry7w2x46acc3j8gjn73b45fzc579gz1hc8hx2b3s0s";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "sha256-idbG+K9NVnNhEB0f7DfP7iaEnHMf59ieQtYnmT6CvVM=";
+ sha256 = "1x9jx3ww37cn6r6cn6gqlavmllxydks23vm8w4934bv8zppj1zwz";
};
- vendorSha256 = "sha256-LL+EkDZbbaNo/fPMGlPsB8jgBYHoe6SdkBbQoW5y4EU=";
+ vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc";
postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index d6e79831329f..e27167041c47 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -14,7 +14,13 @@ buildGoModule rec {
vendorSha256 = null;
- subPackages = [ "..." ];
+ subPackages = [
+ # TODO split every executable into its own package
+ "cmd/loki"
+ "cmd/loki-canary"
+ "cmd/promtail"
+ "cmd/logcli"
+ ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ];
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 64ee8752f1f4..c25c23671ba9 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "2.0.65";
+ version = "2.0.66";
pname = "munin";
src = fetchFromGitHub {
owner = "munin-monitoring";
repo = "munin";
rev = version;
- sha256 = "0gz9kp1x39xpklq77xpm8kldsc4w87732if90w5p9pw0ip4cn6df";
+ sha256 = "sha256-1aikMRY1YiSQNUnYqsw1Eew9D9JHbkX+BXNCof6YK50=";
};
buildInputs = [
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 09af13951c9d..a58ec2bf7b29 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
};
patches = [ ./nagios.patch ];
- buildInputs = [ php perl gd libpng zlib unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ php perl gd libpng zlib ];
configureFlags = [ "--localstatedir=/var/lib/nagios" ];
buildFlags = [ "all" ];
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index 8f354d4bb46f..27a6e01dba3d 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat"
'';
- nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo ];
- buildInputs = with perlPackages; [ file perl unzip openssl ncurses JSON Tk TermReadKey ];
+ nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo unzip ];
+ buildInputs = with perlPackages; [ file perl openssl ncurses JSON Tk TermReadKey ];
enableParallelBuilding = true;
doCheck = false; # tries to use networking
diff --git a/pkgs/servers/monitoring/prometheus/cups-exporter.nix b/pkgs/servers/monitoring/prometheus/cups-exporter.nix
deleted file mode 100644
index a02dab88a3a6..000000000000
--- a/pkgs/servers/monitoring/prometheus/cups-exporter.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, nixosTests }:
-
-python3Packages.buildPythonApplication rec {
- pname = "prometheus-cups-exporter-unstable";
- version = "2019-03-17";
-
- format = "other";
-
- src = fetchFromGitHub {
- owner = "ThoreKr";
- repo = "cups_exporter";
- rev = "8fd1c2517e9878b7b7c73a450e5e546f437954a9";
- sha256 = "1cwk2gbw2svqjlzgwv5wqzhq7fxwrwsrr0kkbnqn4mfb0kq6pa8m";
- };
-
- propagatedBuildInputs = with python3Packages; [ prometheus_client pycups ];
-
- installPhase = ''
- mkdir -p $out/share/
- cp cups_exporter.py $out/share/
- '';
-
- fixupPhase = ''
- makeWrapper "${python3Packages.python.interpreter}" "$out/bin/prometheus-cups-exporter" \
- --set PYTHONPATH "$PYTHONPATH" \
- --add-flags "$out/share/cups_exporter.py"
- '';
-
- passthru.tests = { inherit (nixosTests.prometheus-exporters) cups; };
-
- meta = with lib; {
- description = "A simple prometheus exporter for cups implemented in python";
- homepage = "https://github.com/ThoreKr/cups_exporter";
- license = licenses.unfree;
- maintainers = [ maintainers.mmahut ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 3a01acbb372b..285db02e1ccd 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
- version = "1.17.3";
+ version = "1.18.0";
excludedPackages = "test";
@@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
- sha256 = "sha256-DJvXGjh1FN6SHcfVUlbfoKgBD1ThaJMvKUqvIKCyzeI=";
+ sha256 = "sha256-1sFl+F3g2anssW59eKbjPdVCIyGq8JuoJGXVQZys854=";
};
- vendorSha256 = "sha256-UTdJT4cwRCqkn01YXB1KYc7hp1smpZFke9aAODd/2x0=";
+ vendorSha256 = "sha256-m53S/L71nyioCBbIDDAWEnqStBdqTFGq16y5ozsXq1c=";
preBuild = ''
buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}")
diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix
index d24fe89cc48e..06d7a954aa90 100644
--- a/pkgs/servers/nats-server/default.nix
+++ b/pkgs/servers/nats-server/default.nix
@@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
pname = "nats-server";
- version = "2.1.9";
+ version = "2.2.0";
goPackagePath = "github.com/nats-io/${pname}";
@@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "nats-io";
repo = pname;
- sha256 = "0y92isca1dlvprik0lbiz8ny1w84svy4zn73brqhzrkxnqppcxi2";
+ sha256 = "sha256-CNCdJUug99a9yE8YxSk7/s1CIEYJd9n8Gahz+B3ZyjI=";
};
meta = {
diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix
index 40a304bafbad..bf6d95b65d45 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.21.0";
+ version = "0.21.1";
goPackagePath = "github.com/nats-io/${pname}";
src = fetchFromGitHub {
rev = "v${version}";
owner = "nats-io";
repo = pname;
- sha256 = "sha256-vZFX5YDf722c7xc4oh4SoL91s7XuZsXzFxW+i//mOUw=";
+ sha256 = "sha256-GqnIGnXcOcfbAgUruVxsTSvi6pH1E3QugEmZr3tPiIY=";
};
meta = {
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index abec3c5f79f9..4a6db24bc4c4 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
description = "Event sourcing database with processing logic in JavaScript";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ puffnfresh ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix
index efa43f7a844f..a9a74f0b75f3 100644
--- a/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/pkgs/servers/nosql/riak/2.2.0.nix
@@ -28,8 +28,9 @@ in
stdenv.mkDerivation {
name = "riak-2.2.0";
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- which unzip erlang pam
+ which erlang pam
];
src = srcs.riak;
diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix
index 02fd76315184..d7612d30764a 100644
--- a/pkgs/servers/nosql/victoriametrics/default.nix
+++ b/pkgs/servers/nosql/victoriametrics/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "VictoriaMetrics";
- version = "1.52.0";
+ version = "1.54.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1sqzpr48sylgiy4zaf3f8hnwzv7imf57bxg6sin9lv291ybhxs68";
+ sha256 = "sha256-nZSNn1vLk3y6s4ie1AkSkGmKUiIrcBr3yKW5uAEtRt0=";
};
vendorSha256 = null;
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix
index e5e4df1a292b..9cd06a3ebc6c 100644
--- a/pkgs/servers/p910nd/default.nix
+++ b/pkgs/servers/p910nd/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
};
postPatch = ''
- sed -e "s|/usr||g" -i Makefile
+ substituteInPlace Makefile --replace "/usr" ""
+ substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
'';
makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ];
@@ -39,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = "http://p910nd.sourceforge.net/";
downloadPage = "https://sourceforge.net/projects/p910nd/";
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 6261e2f9bfab..6e6bf845d0fd 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.21.4.4079-1b7748a7b";
+ version = "1.22.0.4163-d8c4875dd";
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 = "0843sdl9c6382vjj3ykvcl6rizs2jnb4jqx19ah3phbcvsnjlhdb";
+ sha256 = "16lwcimgnpxcyxbk4qwkqz5mzmizqfzihwqb41awc38qlfbjzh5g";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
- sha256 = "02v4jf6jajm5gvsilllln1vvnxx30gi2b8ljsby5d3xhhca6kmqx";
+ sha256 = "0wvqrn7mycrx0rn4zkp6cr2mr59nfqh63czm0awsfpqc6hqggz8y";
};
outputs = [ "out" "basedb" ];
diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix
index 681a9dd38ca3..f86254e93b18 100644
--- a/pkgs/servers/rainloop/default.nix
+++ b/pkgs/servers/rainloop/default.nix
@@ -4,7 +4,7 @@
pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}";
version = "1.14.0";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
mkdir rainloop
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index cd19c77cab3e..0b2a0e38f01c 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -160,7 +160,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Ripple P2P payment network reference server";
homepage = "https://github.com/ripple/rippled";
- maintainers = with maintainers; [ ehmry offline RaghavSood ];
+ maintainers = with maintainers; [ offline RaghavSood ];
license = licenses.isc;
platforms = [ "x86_64-linux" ];
};
diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index f1e705b0693e..4d326c0bd621 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform }:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "routinator";
@@ -11,6 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE=";
};
+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ=";
meta = with lib; {
@@ -18,6 +19,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/NLnetLabs/routinator";
license = licenses.bsd3;
maintainers = with maintainers; [ _0x4A6F ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix
index cf96edfe9638..ada7ea1c2200 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.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "aler9";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-U0wZ0NrvCQjMLDDjO6Jf6uu5FlHar7Td2zhoU2+MMkM=";
+ sha256 = "sha256-uahgIphp2/iE11v33sPNrm0evz6dQvzjEQ9uMVEuTTI=";
};
- vendorSha256 = "sha256-dfAuq4iw3NQ4xaabPv7MQ88CYXgivRBeyvbmJ3SSjbI=";
+ vendorSha256 = "sha256-nAeP9ZmYu5VPKR628aJVNS8t41V/AYkgwOcO/d0nQv4=";
# Tests need docker
doCheck = false;
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 4533e3138a7a..64a6dddfaa04 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -20,14 +20,14 @@ let
]);
path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
in stdenv.mkDerivation rec {
- version = "3.1.1";
+ version = "3.2.0";
pname = "sabnzbd";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0m39r2il7d014kf2p6v28lw2hzshm6bhhdchqa8wzyvvmygqmwf2";
+ sha256 = "sha256-h+efFsyCqcMktKpKOqaHkfFdJKGAjvIOc6NmIyXnZDA=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index c51b0d209845..19aac337057f 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -21,7 +21,7 @@ let
# Work around the "unpacker appears to have produced no directories"
# case that happens when the archive doesn't have a subdirectory.
setSourceRoot = "sourceRoot=$(pwd)";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
meta = a.meta // {
platforms = elasticsearch.meta.platforms;
maintainers = (a.meta.maintainers or []) ++ (with lib.maintainers; [ offline ]);
diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index ae0ae2e3eea4..ff464c628248 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
- version = "0.23.11";
+ version = "0.23.14";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
- sha256 = "sha256-1VUW8WBNlGSL9JpKhpYfAgCFp3ZGYgWFXTehOAueuZI=";
+ sha256 = "sha256-QhBdOXu+KizeSYHUbNflDaDpzjeEFaYkhY+K1MgLzzc=";
};
dontBuild = true;
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index a1803abe6a8c..cdaa96464e7b 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }:
+{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, nixosTests }:
stdenv.mkDerivation rec {
pname = "sonarr";
- version = "2.0.0.5344";
+ version = "3.0.5.1144";
src = fetchurl {
- url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
- sha256 = "0bsxf7m2dir7gi0cfn8vdasr11q224b9mp6cixak9ss5zafwn59a";
+ url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz";
+ sha256 = "1ajqh3hvjfsbs6rb2f8dnndxsycmlzamp0cwjwkh1j2dinbzdbvp";
};
nativeBuildInputs = [ makeWrapper ];
@@ -14,17 +14,21 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp -r * $out/bin/
-
makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \
- --add-flags "$out/bin/NzbDrone.exe" \
+ --add-flags "$out/bin/Sonarr.exe" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
curl sqlite libmediainfo ]}
'';
+ passthru = {
+ updateScript = "./update.sh";
+ tests.smoke-test = nixosTests.sonarr;
+ };
+
meta = {
description = "Smart PVR for newsgroup and bittorrent users";
homepage = "https://sonarr.tv/";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fadenb purcell ];
platforms = lib.platforms.all;
};
diff --git a/pkgs/servers/sonarr/update.sh b/pkgs/servers/sonarr/update.sh
new file mode 100755
index 000000000000..faa4f65cfc8f
--- /dev/null
+++ b/pkgs/servers/sonarr/update.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+latestTag=$(curl https://api.github.com/repos/Sonarr/Sonarr/tags | jq -r '.[] | .name' | sort --version-sort | tail -1)
+version="$(expr $latestTag : 'v\(.*\)')"
+
+update-source-version sonarr "$version"
diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix
index 8d3e4e1388b2..057bce2e4b03 100644
--- a/pkgs/servers/sozu/default.nix
+++ b/pkgs/servers/sozu/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "sozu";
- version = "0.11.50";
+ version = "0.11.56";
src = fetchFromGitHub {
owner = "sozu-proxy";
repo = pname;
rev = version;
- sha256 = "1srg2b8vwc4vp07kg4fizqj1rbm9hvf6hj1mjdh6yvb9cpbw3jz7";
+ sha256 = "sha256-/XyBzhZCsX9sGk+iTFlDnblWfDCZdI4b9yfo4Z+Wp1U=";
};
- cargoSha256 = "5WOigCiQZQ5DaTd15vV8pUh8Xl3UIe9yLG1ptUtY+iA=";
+ cargoSha256 = "sha256-F5EjBWHBNaQipxCi9Kiz5UTPMU0DuRf15NIVVvhiRxY=";
buildInputs =
lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index 37c697f3676e..22110f3b4f05 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
meta = {
description = "Client library that can be used to connect to MySQL or MariaDB";
- license = licenses.lgpl21;
+ license = licenses.lgpl21Plus;
maintainers = with maintainers; [ globin ];
platforms = platforms.all;
};
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 5aab3000f374..6b22185cd800 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
};
- buildInputs = [ unzip ant ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ ant ];
meta = {
platforms = lib.platforms.unix;
diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix
index 184c54ba9ca8..92c31ead6c47 100644
--- a/pkgs/servers/swego/default.nix
+++ b/pkgs/servers/swego/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "swego";
- version = "0.92";
+ version = "0.93";
src = fetchFromGitHub {
owner = "nodauf";
repo = "Swego";
rev = "v${version}";
- sha256 = "sha256-SiB0Z6Eqbn/6VGDTt5bQtgcT4V4AjRIIYYk98EW7ss4=";
+ sha256 = "sha256-oTeSh7OzjzbgKbSQSNhnCUZw5FdUkN+Y9LkIbWFhn5c=";
};
- vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI=";
+ vendorSha256 = "sha256-TK1LN9EmVH95jPO6K7gtCwdnW4WOKH3K7Q0FhgNMVUQ=";
postInstall = ''
mv $out/bin/src $out/bin/$pname
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 32c5a23a9a79..714cf5174570 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,20 +2,20 @@
buildGoModule rec {
pname = "tailscale";
- version = "1.4.5";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- sha256 = "sha256-PMBlvres95UIbd3uqZWPE3OzyrEAGEXit/Z7X1p46GY=";
+ sha256 = "07dzcqd98nsrdv72wp93q6f23mn3pfmpyyi61dx6c26w0j5n4r0p";
};
nativeBuildInputs = [ makeWrapper ];
CGO_ENABLED = 0;
- vendorSha256 = "sha256-WvojOnGQ/ssBkoQwIlOVsaEUJmi2ugqgtTAVKJg8Spk=";
+ vendorSha256 = "0wbw9pc0cv05bw2gsps3099zipwjj3r23vyf87qy6g21r08xrrm8";
doCheck = false;
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index f09f99e66b56..ca8d7d7412dc 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "traefik";
- version = "2.4.6";
+ version = "2.4.8";
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
- sha256 = "1f2gj9axmdisp4yza5pa60x2s79vdybgsb5ddyfwkl5m89sh0r2z";
+ sha256 = "sha256-hCBhJazI0Y1qQjULF+CBfUfz6PvkgLXafvXKR6iKHmU=";
stripRoot = false;
};
- vendorSha256 = "1w9crp4bk5dk0ph558w9mj8cylm2z6bc81hghmv86ild524a0l9v";
+ vendorSha256 = "sha256-MW/JG4TbUvbo4dQnQbKIbLlLgkQvOqsfagpXILJ/BYQ=";
doCheck = false;
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix
index b681727c08f9..3eb51b68b8cd 100644
--- a/pkgs/servers/udpt/default.nix
+++ b/pkgs/servers/udpt/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
description = "A lightweight UDP torrent tracker";
homepage = "https://naim94a.github.io/udpt";
license = lib.licenses.gpl3;
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ makefu ];
};
}
diff --git a/pkgs/servers/web-apps/bookstack/composer-env.nix b/pkgs/servers/web-apps/bookstack/composer-env.nix
new file mode 100644
index 000000000000..b91be187f55c
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/composer-env.nix
@@ -0,0 +1,238 @@
+# This file originates from composer2nix
+
+{ stdenv, lib, writeTextFile, fetchurl, php, unzip, phpPackages }:
+
+let
+ inherit (phpPackages) composer;
+ buildZipPackage = { name, src }:
+ stdenv.mkDerivation {
+ inherit name src;
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ unzip $src
+ baseDir=$(find . -type d -mindepth 1 -maxdepth 1)
+ cd $baseDir
+ mkdir -p $out
+ mv * $out
+ '';
+ };
+
+ buildPackage =
+ { name
+ , src
+ , packages ? {}
+ , devPackages ? {}
+ , buildInputs ? []
+ , symlinkDependencies ? false
+ , executable ? false
+ , removeComposerArtifacts ? false
+ , postInstall ? ""
+ , noDev ? false
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ...}@args:
+
+ let
+ reconstructInstalled = writeTextFile {
+ name = "reconstructinstalled.php";
+ executable = true;
+ text = ''
+ #! ${php}/bin/php
+
+ '';
+ };
+
+ constructBin = writeTextFile {
+ name = "constructbin.php";
+ executable = true;
+ text = ''
+ #! ${php}/bin/php
+
+ '';
+ };
+
+ bundleDependencies = dependencies:
+ lib.concatMapStrings (dependencyName:
+ let
+ dependency = dependencies.${dependencyName};
+ in
+ ''
+ ${if dependency.targetDir == "" then ''
+ vendorDir="$(dirname ${dependencyName})"
+ mkdir -p "$vendorDir"
+ ${if symlinkDependencies then
+ ''ln -s "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
+ else
+ ''cp -av "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
+ }
+ '' else ''
+ namespaceDir="${dependencyName}/$(dirname "${dependency.targetDir}")"
+ mkdir -p "$namespaceDir"
+ ${if symlinkDependencies then
+ ''ln -s "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
+ else
+ ''cp -av "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
+ }
+ ''}
+ '') (builtins.attrNames dependencies);
+
+ extraArgs = removeAttrs args [ "name" "packages" "devPackages" "buildInputs" ];
+ in
+ stdenv.mkDerivation ({
+ name = "composer-${name}";
+ buildInputs = [ php composer ] ++ buildInputs;
+
+ inherit unpackPhase buildPhase;
+
+ installPhase = ''
+ ${if executable then ''
+ mkdir -p $out/share/php
+ cp -av $src $out/share/php/$name
+ chmod -R u+w $out/share/php/$name
+ cd $out/share/php/$name
+ '' else ''
+ cp -av $src $out
+ chmod -R u+w $out
+ cd $out
+ ''}
+
+ # Remove unwanted files
+ rm -f *.nix
+
+ export HOME=$TMPDIR
+
+ # Remove the provided vendor folder if it exists
+ rm -Rf vendor
+
+ # If there is no composer.lock file, compose a dummy file.
+ # Otherwise, composer attempts to download the package.json file from
+ # the registry which we do not want.
+ if [ ! -f composer.lock ]
+ then
+ cat > composer.lock < vendor/composer/installed.json
+
+ # Copy or symlink the provided dependencies
+ cd vendor
+ ${bundleDependencies packages}
+ ${lib.optionalString (!noDev) (bundleDependencies devPackages)}
+ cd ..
+
+ # Reconstruct autoload scripts
+ # We use the optimize feature because Nix packages cannot change after they have been built
+ # Using the dynamic loader for a Nix package is useless since there is nothing to dynamically reload.
+ composer dump-autoload --optimize ${lib.optionalString noDev "--no-dev"}
+
+ # Run the install step as a validation to confirm that everything works out as expected
+ composer install --optimize-autoloader ${lib.optionalString noDev "--no-dev"}
+
+ ${lib.optionalString executable ''
+ # Reconstruct the bin/ folder if we deploy an executable project
+ ${constructBin} composer.json
+ ln -s $(pwd)/vendor/bin $out/bin
+ ''}
+
+ ${lib.optionalString (!symlinkDependencies) ''
+ # Patch the shebangs if possible
+ if [ -d $(pwd)/vendor/bin ]
+ then
+ # Look for all executables in bin/
+ for i in $(pwd)/vendor/bin/*
+ do
+ # Look for their location
+ realFile=$(readlink -f "$i")
+
+ # Restore write permissions
+ chmod u+wx "$(dirname "$realFile")"
+ chmod u+w "$realFile"
+
+ # Patch shebang
+ sed -e "s|#!/usr/bin/php|#!${php}/bin/php|" \
+ -e "s|#!/usr/bin/env php|#!${php}/bin/php|" \
+ "$realFile" > tmp
+ mv tmp "$realFile"
+ chmod u+x "$realFile"
+ done
+ fi
+ ''}
+
+ if [ "$removeComposerArtifacts" = "1" ]
+ then
+ # Remove composer stuff
+ rm -f composer.json composer.lock
+ fi
+
+ # Execute post install hook
+ runHook postInstall
+ '';
+ } // extraArgs);
+in
+{
+ composer = lib.makeOverridable composer;
+ buildZipPackage = lib.makeOverridable buildZipPackage;
+ buildPackage = lib.makeOverridable buildPackage;
+}
diff --git a/pkgs/servers/web-apps/bookstack/composition.nix b/pkgs/servers/web-apps/bookstack/composition.nix
new file mode 100644
index 000000000000..0df6cdae4cf0
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/composition.nix
@@ -0,0 +1,13 @@
+{pkgs ? import {
+ inherit system;
+ }, system ? builtins.currentSystem, noDev ? false}:
+
+let
+ composerEnv = import ./composer-env.nix {
+ inherit (pkgs) stdenv lib writeTextFile fetchurl php unzip phpPackages;
+ };
+in
+import ./php-packages.nix {
+ inherit composerEnv noDev;
+ inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
+}
diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix
new file mode 100644
index 000000000000..9ab47ace6ad6
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/default.nix
@@ -0,0 +1,38 @@
+{ pkgs, system, lib, fetchFromGitHub, dataDir ? "/var/lib/bookstack" }:
+
+let
+ package = (import ./composition.nix {
+ inherit pkgs system;
+ noDev = true; # Disable development dependencies
+ }).overrideAttrs (attrs : {
+ installPhase = attrs.installPhase + ''
+ rm -R $out/storage $out/public/uploads
+ ln -s ${dataDir}/.env $out/.env
+ ln -s ${dataDir}/storage $out/storage
+ ln -s ${dataDir}/public/uploads $out/public/uploads
+ '';
+ });
+
+in package.override rec {
+ name = "bookstack";
+ version = "0.31.7";
+
+ src = fetchFromGitHub {
+ owner = "bookstackapp";
+ repo = name;
+ rev = "v${version}";
+ sha256 = "1jak6g2q4zbr0gxqj0bqhks687whmmw8ylzwm4saws7ikcxkwna4";
+ };
+
+ meta = with lib; {
+ description = "A platform to create documentation/wiki content built with PHP & Laravel";
+ longDescription = ''
+ A platform for storing and organising information and documentation.
+ Details for BookStack can be found on the official website at https://www.bookstackapp.com/.
+ '';
+ homepage = "https://www.bookstackapp.com/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ymarkus ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix
new file mode 100644
index 000000000000..5edd0b68e868
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/php-packages.nix
@@ -0,0 +1,897 @@
+{composerEnv, fetchurl, fetchgit ? null, fetchhg ? null, fetchsvn ? null, noDev ? false}:
+
+let
+ packages = {
+ "aws/aws-sdk-php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "aws-aws-sdk-php-3e6143f5c12986d727307d5d19d6aec21575d903";
+ src = fetchurl {
+ url = https://api.github.com/repos/aws/aws-sdk-php/zipball/3e6143f5c12986d727307d5d19d6aec21575d903;
+ sha256 = "16hbw8gqscbc3bcvnfdsll6x1653lq2s4dga3d5jbpczil3ws9yb";
+ };
+ };
+ };
+ "barryvdh/laravel-dompdf" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "barryvdh-laravel-dompdf-30310e0a675462bf2aa9d448c8dcbf57fbcc517d";
+ src = fetchurl {
+ url = https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/30310e0a675462bf2aa9d448c8dcbf57fbcc517d;
+ sha256 = "1fnan9b2g4xhqqvlfsn3alb4nx5jjlrapgiad2kca13b3gizv7zr";
+ };
+ };
+ };
+ "barryvdh/laravel-snappy" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "barryvdh-laravel-snappy-1903ab84171072b6bff8d98eb58d38b2c9aaf645";
+ src = fetchurl {
+ url = https://api.github.com/repos/barryvdh/laravel-snappy/zipball/1903ab84171072b6bff8d98eb58d38b2c9aaf645;
+ sha256 = "1awr5kwj482qsh5wpg0q44fjqi7a9q26ghcc9wp1n9zm97y0rx7a";
+ };
+ };
+ };
+ "doctrine/cache" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-cache-13e3381b25847283a91948d04640543941309727";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727;
+ sha256 = "088fxbpjssp8x95qr3ip2iynxrimimrby03xlsvp2254vcyx94c5";
+ };
+ };
+ };
+ "doctrine/dbal" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-dbal-47433196b6390d14409a33885ee42b6208160643";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/dbal/zipball/47433196b6390d14409a33885ee42b6208160643;
+ sha256 = "0bcg9494hr31902zcmq5kk7ji78yxk074d5bd9chxn9q0xz4g2h8";
+ };
+ };
+ };
+ "doctrine/event-manager" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f;
+ sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8";
+ };
+ };
+ };
+ "doctrine/inflector" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-inflector-9cf661f4eb38f7c881cac67c75ea9b00bf97b210";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210;
+ sha256 = "0gkaw5aqkdppd7cz1n46kdms0bv8kzbnpjh75jnhv98p9fik7f24";
+ };
+ };
+ };
+ "doctrine/lexer" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-lexer-e864bbf5904cb8f5bb334f99209b48018522f042";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042;
+ sha256 = "11lg9fcy0crb8inklajhx3kyffdbx7xzdj8kwl21xsgq9nm9iwvv";
+ };
+ };
+ };
+ "dompdf/dompdf" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "dompdf-dompdf-db91d81866c69a42dad1d2926f61515a1e3f42c5";
+ src = fetchurl {
+ url = https://api.github.com/repos/dompdf/dompdf/zipball/db91d81866c69a42dad1d2926f61515a1e3f42c5;
+ sha256 = "10nsmaiqfk6wgv0l9wjsh7h8nigdfabygkhjk7wdbxdfvlvniddd";
+ };
+ };
+ };
+ "dragonmantank/cron-expression" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "dragonmantank-cron-expression-65b2d8ee1f10915efb3b55597da3404f096acba2";
+ src = fetchurl {
+ url = https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2;
+ sha256 = "07yqbhf6n4d818gvla60mgg23gichwiafd5ypd70w4b4dlbcxcpl";
+ };
+ };
+ };
+ "egulias/email-validator" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4";
+ src = fetchurl {
+ url = https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4;
+ sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck";
+ };
+ };
+ };
+ "facade/flare-client-php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "facade-flare-client-php-ef0f5bce23b30b32d98fd9bb49c6fa37b40eb546";
+ src = fetchurl {
+ url = https://api.github.com/repos/facade/flare-client-php/zipball/ef0f5bce23b30b32d98fd9bb49c6fa37b40eb546;
+ sha256 = "1car7k8zzkgib9wpi9lzw1dj9qgjak8s9dmiimxaigvb7q4bc5vk";
+ };
+ };
+ };
+ "facade/ignition" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "facade-ignition-b6aea4a99303d9d32afd486a285162a89af8a8a3";
+ src = fetchurl {
+ url = https://api.github.com/repos/facade/ignition/zipball/b6aea4a99303d9d32afd486a285162a89af8a8a3;
+ sha256 = "1dx6gf4qz6jf8hds3lyxs09zlr6ndl3d36212w2hr4b15ihmyszw";
+ };
+ };
+ };
+ "facade/ignition-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "facade-ignition-contracts-aeab1ce8b68b188a43e81758e750151ad7da796b";
+ src = fetchurl {
+ url = https://api.github.com/repos/facade/ignition-contracts/zipball/aeab1ce8b68b188a43e81758e750151ad7da796b;
+ sha256 = "0b5hv56758fh2y6fqbygwn94qgqwjan8d2s1i10m242x80h9jjiw";
+ };
+ };
+ };
+ "fideloper/proxy" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "fideloper-proxy-c073b2bd04d1c90e04dc1b787662b558dd65ade0";
+ src = fetchurl {
+ url = https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0;
+ sha256 = "05jzgjj4fy5p1smqj41b5qxj42zn0mnczvsaacni4fmq174mz4gy";
+ };
+ };
+ };
+ "filp/whoops" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "filp-whoops-df7933820090489623ce0be5e85c7e693638e536";
+ src = fetchurl {
+ url = https://api.github.com/repos/filp/whoops/zipball/df7933820090489623ce0be5e85c7e693638e536;
+ sha256 = "0azpv2r8hc9s5pbk9wh2qk52qzycsbvpijr8w68l311igpcj4f78";
+ };
+ };
+ };
+ "guzzlehttp/guzzle" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "guzzlehttp-guzzle-0aa74dfb41ae110835923ef10a9d803a22d50e79";
+ src = fetchurl {
+ url = https://api.github.com/repos/guzzle/guzzle/zipball/0aa74dfb41ae110835923ef10a9d803a22d50e79;
+ sha256 = "0gba1711dpi147fzi2ab2pg0k1g6zfanm5w5hf4c7w0b3h4ya5gj";
+ };
+ };
+ };
+ "guzzlehttp/promises" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "guzzlehttp-promises-60d379c243457e073cff02bc323a2a86cb355631";
+ src = fetchurl {
+ url = https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631;
+ sha256 = "0lvcr64bx9sb90qggxk7g7fsplz403gm3i8lnlcaifyjrlmdj5wb";
+ };
+ };
+ };
+ "guzzlehttp/psr7" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "guzzlehttp-psr7-53330f47520498c0ae1f61f7e2c90f55690c06a3";
+ src = fetchurl {
+ url = https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3;
+ sha256 = "0948mbbqn1xcz39diajhvlr9a7586vx3091kzx96m0z4ki3lhv7g";
+ };
+ };
+ };
+ "intervention/image" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "intervention-image-abbf18d5ab8367f96b3205ca3c89fb2fa598c69e";
+ src = fetchurl {
+ url = https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e;
+ sha256 = "1msfpr9bip69bmhg23ka2f43phgb6dq5z604j5psjh3xd86r6c5d";
+ };
+ };
+ };
+ "knplabs/knp-snappy" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "knplabs-knp-snappy-7bac60fb729147b7ccd8532c07df3f52a4afa8a4";
+ src = fetchurl {
+ url = https://api.github.com/repos/KnpLabs/snappy/zipball/7bac60fb729147b7ccd8532c07df3f52a4afa8a4;
+ sha256 = "0qbywknz3zwhk91yaqd5p6nf48hzk1zmyqgrc9nb9ys2v6wy6njz";
+ };
+ };
+ };
+ "laravel/framework" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "laravel-framework-d0e4731e92ca88f4a78fe9e0c2c426a3e8c063c8";
+ src = fetchurl {
+ url = https://api.github.com/repos/laravel/framework/zipball/d0e4731e92ca88f4a78fe9e0c2c426a3e8c063c8;
+ sha256 = "15zjpq6lbxs019vd0mm2nbfi91yyw40wsf5fl0jbw3s1ffvaq898";
+ };
+ };
+ };
+ "laravel/socialite" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "laravel-socialite-8d25d574b4f2005411c0b9cb527ef5e745c1b07d";
+ src = fetchurl {
+ url = https://api.github.com/repos/laravel/socialite/zipball/8d25d574b4f2005411c0b9cb527ef5e745c1b07d;
+ sha256 = "0ash56za1flniq9nnk3siyb8l0m2cjwn2n25315qfhmdgbxxjz68";
+ };
+ };
+ };
+ "league/commonmark" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-commonmark-11df9b36fd4f1d2b727a73bf14931d81373b9a54";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/commonmark/zipball/11df9b36fd4f1d2b727a73bf14931d81373b9a54;
+ sha256 = "15chm1sa65b58b47am00ik03s2agnx49i8yww3mhqlijvbrjvxc3";
+ };
+ };
+ };
+ "league/flysystem" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-flysystem-9be3b16c877d477357c015cec057548cf9b2a14a";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a;
+ sha256 = "0mhlr6l75j58xwbadq30x58s67434195zlpdax6ix4nkr7fc907j";
+ };
+ };
+ };
+ "league/flysystem-aws-s3-v3" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972;
+ sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab";
+ };
+ };
+ };
+ "league/mime-type-detection" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-mime-type-detection-3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3;
+ sha256 = "0pmq486v2nf6672y2z53cyb3mfrxcc8n7z2ilpzz9zkkf2yb990j";
+ };
+ };
+ };
+ "league/oauth1-client" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-oauth1-client-1e7e6be2dc543bf466236fb171e5b20e1b06aee6";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/oauth1-client/zipball/1e7e6be2dc543bf466236fb171e5b20e1b06aee6;
+ sha256 = "1vmzvghl4c4k9vxza50k0w28hxm88vcrcdspqp7f3vmfg5c1zav2";
+ };
+ };
+ };
+ "monolog/monolog" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "monolog-monolog-1cb1cde8e8dd0f70cc0fe51354a59acad9302084";
+ src = fetchurl {
+ url = https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084;
+ sha256 = "1gymdiymwrjw25fjqapq3jlmf6wnp1h26ms74sckd70d53c4m52k";
+ };
+ };
+ };
+ "mtdowling/jmespath.php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "mtdowling-jmespath.php-42dae2cbd13154083ca6d70099692fef8ca84bfb";
+ src = fetchurl {
+ url = https://api.github.com/repos/jmespath/jmespath.php/zipball/42dae2cbd13154083ca6d70099692fef8ca84bfb;
+ sha256 = "157pdx45dmkxwxyq8vdjfci24fw7kl3yc2gj1cifp9kaia7mwlkk";
+ };
+ };
+ };
+ "nesbot/carbon" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "nesbot-carbon-528783b188bdb853eb21239b1722831e0f000a8d";
+ src = fetchurl {
+ url = https://api.github.com/repos/briannesbitt/Carbon/zipball/528783b188bdb853eb21239b1722831e0f000a8d;
+ sha256 = "18pvfwjvclfj0mrgqvycgrbyx5jfcp1hks4yljc6mp66yxr787x4";
+ };
+ };
+ };
+ "nunomaduro/collision" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "nunomaduro-collision-f7c45764dfe4ba5f2618d265a6f1f9c72732e01d";
+ src = fetchurl {
+ url = https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d;
+ sha256 = "1cazbjxl5rqw4cl783nrymhcvjhvwwwjswr5w0si1wfhmpvr349q";
+ };
+ };
+ };
+ "onelogin/php-saml" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b";
+ src = fetchurl {
+ url = https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b;
+ sha256 = "0ycj3n22k5i3h8p7gn0xff6a7smjypazl2k5qvyzg86fjr7s3vfv";
+ };
+ };
+ };
+ "opis/closure" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "opis-closure-943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5";
+ src = fetchurl {
+ url = https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5;
+ sha256 = "0y47ldgzzv22c5dnsdzqmbrsicq6acjyba0119d3dc6wa3n7zqi6";
+ };
+ };
+ };
+ "paragonie/random_compat" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "paragonie-random_compat-84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95";
+ src = fetchurl {
+ url = https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95;
+ sha256 = "03nsccdvcb79l64b7lsmx0n8ldf5z3v8niqr7bpp6wg401qp9p09";
+ };
+ };
+ };
+ "phenx/php-font-lib" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "phenx-php-font-lib-ca6ad461f032145fff5971b5985e5af9e7fa88d8";
+ src = fetchurl {
+ url = https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8;
+ sha256 = "0grirw04sfg38fd4h0yaks43s49cxr5bisrr4ligjig2q3rjai31";
+ };
+ };
+ };
+ "phenx/php-svg-lib" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "phenx-php-svg-lib-5fa61b65e612ce1ae15f69b3d223cb14ecc60e32";
+ src = fetchurl {
+ url = https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32;
+ sha256 = "1jbkn7wm82y6pbyb7gx989k4yaprsc7xpa49nn4ywscmkz7ckd5y";
+ };
+ };
+ };
+ "php-parallel-lint/php-console-color" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "php-parallel-lint-php-console-color-b6af326b2088f1ad3b264696c9fd590ec395b49e";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e;
+ sha256 = "030449mkpxs35y8dk336ls3bfdq3zjnxswnk5khlg45z5147cr3k";
+ };
+ };
+ };
+ "php-parallel-lint/php-console-highlighter" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "php-parallel-lint-php-console-highlighter-21bf002f077b177f056d8cb455c5ed573adfdbb8";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8;
+ sha256 = "013phmp5n6hp6mvlpbqbrih0zd8h7xc152dpzxxf49b0jczxh8y4";
+ };
+ };
+ };
+ "phpoption/phpoption" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "phpoption-phpoption-994ecccd8f3283ecf5ac33254543eb0ac946d525";
+ src = fetchurl {
+ url = https://api.github.com/repos/schmittjoh/php-option/zipball/994ecccd8f3283ecf5ac33254543eb0ac946d525;
+ sha256 = "1snrnfvqhnr5z9llf8kbqk9l97gfyp8gghmhi1ng8qx5xzv1anr7";
+ };
+ };
+ };
+ "predis/predis" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "predis-predis-9930e933c67446962997b05201c69c2319bf26de";
+ src = fetchurl {
+ url = https://api.github.com/repos/predis/predis/zipball/9930e933c67446962997b05201c69c2319bf26de;
+ sha256 = "0qnpiyv96gs8yzy3b1ba918yw1pv8bgzw7skcf3k40ffpxsmkxv6";
+ };
+ };
+ };
+ "psr/container" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-container-b7ce3b176482dbbc1245ebf52b181af44c2cf55f";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f;
+ sha256 = "0rkz64vgwb0gfi09klvgay4qnw993l1dc03vyip7d7m2zxi6cy4j";
+ };
+ };
+ };
+ "psr/http-client" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621;
+ sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v";
+ };
+ };
+ };
+ "psr/http-message" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363;
+ sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45";
+ };
+ };
+ };
+ "psr/log" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-log-0f73288fd15629204f9d42b7055f72dacbe811fc";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc;
+ sha256 = "1npi9ggl4qll4sdxz1xgp8779ia73gwlpjxbb1f1cpl1wn4s42r4";
+ };
+ };
+ };
+ "psr/simple-cache" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b;
+ sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw";
+ };
+ };
+ };
+ "ralouphie/getallheaders" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "ralouphie-getallheaders-120b605dfeb996808c31b6477290a714d356e822";
+ src = fetchurl {
+ url = https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822;
+ sha256 = "1bv7ndkkankrqlr2b4kw7qp3fl0dxi6bp26bnim6dnlhavd6a0gg";
+ };
+ };
+ };
+ "ramsey/uuid" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "ramsey-uuid-7e1633a6964b48589b142d60542f9ed31bd37a92";
+ src = fetchurl {
+ url = https://api.github.com/repos/ramsey/uuid/zipball/7e1633a6964b48589b142d60542f9ed31bd37a92;
+ sha256 = "0s6z2c8jvwjmxzy2kqmxqpz0val9i5r757mdwf2yc7qrwm6bwd15";
+ };
+ };
+ };
+ "robrichards/xmlseclibs" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "robrichards-xmlseclibs-f8f19e58f26cdb42c54b214ff8a820760292f8df";
+ src = fetchurl {
+ url = https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df;
+ sha256 = "01zlpm36rrdj310cfmiz2fnabszxd3fq80fa8x8j3f9ki7dvhh5y";
+ };
+ };
+ };
+ "sabberworm/php-css-parser" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "sabberworm-php-css-parser-d217848e1396ef962fb1997cf3e2421acba7f796";
+ src = fetchurl {
+ url = https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796;
+ sha256 = "17jkly8k02p54qa004spikakxis8syjw3vhwgrsi9g1cb4wsg3g9";
+ };
+ };
+ };
+ "scrivo/highlight.php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "scrivo-highlight.php-44a3d4136edb5ad8551590bf90f437db80b2d466";
+ src = fetchurl {
+ url = https://api.github.com/repos/scrivo/highlight.php/zipball/44a3d4136edb5ad8551590bf90f437db80b2d466;
+ sha256 = "0p0bj3yqiaa917lgx4ycwic2qqlg3cxka2adhziqzhlq9jqhzi8r";
+ };
+ };
+ };
+ "socialiteproviders/discord" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-discord-c6eddeb07ace7473e82d02d4db852dfacf5ef574";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574;
+ sha256 = "1w8m7jmlsdk94cqckgd75mwblh3jj6j16w3g4hzysyms25g091xc";
+ };
+ };
+ };
+ "socialiteproviders/gitlab" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-gitlab-a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/GitLab/zipball/a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d;
+ sha256 = "1blv2h69dmm0r0djz3h0l0cxkxmzd1fzgg13r3npxx7c80xjpw3a";
+ };
+ };
+ };
+ "socialiteproviders/manager" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-manager-0f5e82af0404df0080bdc5c105cef936c1711524";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Manager/zipball/0f5e82af0404df0080bdc5c105cef936c1711524;
+ sha256 = "0ppmln72khli94ylnsjarnhzkqzpkc32pn3zf3ljahm1yghccczx";
+ };
+ };
+ };
+ "socialiteproviders/microsoft-azure" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-microsoft-azure-7808764f777a01df88be9ca6b14d683e50aaf88a";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/7808764f777a01df88be9ca6b14d683e50aaf88a;
+ sha256 = "1lxsvb5pzqrm467a8737v98sgmsxs6mvxc683p19b2y30g4fyrlj";
+ };
+ };
+ };
+ "socialiteproviders/okta" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-okta-e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Okta/zipball/e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8;
+ sha256 = "1a3anw5di5nqiabvqpmsjv5x0jasmsn4y876qsv77gazxja880ng";
+ };
+ };
+ };
+ "socialiteproviders/slack" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-slack-8efb25c71d98bedf4010a829d1e41ff9fe449bcc";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Slack/zipball/8efb25c71d98bedf4010a829d1e41ff9fe449bcc;
+ sha256 = "0ax3n4s1djidkhgvrcgv1qipv3k0fhfd0cvs273h6wh66bjniq66";
+ };
+ };
+ };
+ "socialiteproviders/twitch" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-twitch-7accf30ae7a3139b757b4ca8f34989c09a3dbee7";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7;
+ sha256 = "089i4fwxb32zmbxib0544jfs48wzjyp7bsqss2bf2xx89dsrx4ah";
+ };
+ };
+ };
+ "ssddanbrown/htmldiff" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "ssddanbrown-htmldiff-f60d5cc278b60305ab980a6665f46117c5b589c0";
+ src = fetchurl {
+ url = https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/f60d5cc278b60305ab980a6665f46117c5b589c0;
+ sha256 = "12h3swr8rjf5w78kfgwzkf0zb59b4a8mjwf65fgcgvjg115wha9x";
+ };
+ };
+ };
+ "swiftmailer/swiftmailer" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "swiftmailer-swiftmailer-698a6a9f54d7eb321274de3ad19863802c879fb7";
+ src = fetchurl {
+ url = https://api.github.com/repos/swiftmailer/swiftmailer/zipball/698a6a9f54d7eb321274de3ad19863802c879fb7;
+ sha256 = "1zmyr6szxvbc77rs4q1cp7f3vzw1wfx9rbbj7x9s65gh37z9fd1w";
+ };
+ };
+ };
+ "symfony/console" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-console-24026c44fc37099fa145707fecd43672831b837a";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/console/zipball/24026c44fc37099fa145707fecd43672831b837a;
+ sha256 = "19c5yczwxk0965pdg7ka8sa8wsr569r6l725rj4y9sabfd6mg6jf";
+ };
+ };
+ };
+ "symfony/css-selector" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-css-selector-f907d3e53ecb2a5fad8609eb2f30525287a734c8";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8;
+ sha256 = "19yqy81psz2wh8gy2j3phywsgrw9sbcw83l8lbnxbk5khg8hw3nm";
+ };
+ };
+ };
+ "symfony/debug" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-debug-af4987aa4a5630e9615be9d9c3ed1b0f24ca449c";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/debug/zipball/af4987aa4a5630e9615be9d9c3ed1b0f24ca449c;
+ sha256 = "15y1bgdrzq3859ql37ymx4fsvd28kyck69ncm6zyg84q3fhd8i19";
+ };
+ };
+ };
+ "symfony/deprecation-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-deprecation-contracts-5fa56b4074d1ae755beb55617ddafe6f5d78f665";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665;
+ sha256 = "0ny59x0aaipqaj956wx7ak5f6d5rn90766swp5m18019v9cppg10";
+ };
+ };
+ };
+ "symfony/error-handler" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-error-handler-d603654eaeb713503bba3e308b9e748e5a6d3f2e";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/error-handler/zipball/d603654eaeb713503bba3e308b9e748e5a6d3f2e;
+ sha256 = "15xdk9bbyfdm8yf19jfb3zr1yaj0lprf9pmxgj630vbpbqkgsd8f";
+ };
+ };
+ };
+ "symfony/event-dispatcher" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-event-dispatcher-c352647244bd376bf7d31efbd5401f13f50dad0c";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c;
+ sha256 = "1cxgn0y83i4qqx757kq96jadwwbc68h11snhvy175xvy8nvsmxkd";
+ };
+ };
+ };
+ "symfony/event-dispatcher-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-event-dispatcher-contracts-84e23fdcd2517bf37aecbd16967e83f0caee25a7";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7;
+ sha256 = "1pcfrlc0rg8vdnp23y3y1p5qzng5nxf5i2c36g9x9f480xrnc1fw";
+ };
+ };
+ };
+ "symfony/finder" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-finder-25d79cfccfc12e84e7a63a248c3f0720fdd92db6";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/finder/zipball/25d79cfccfc12e84e7a63a248c3f0720fdd92db6;
+ sha256 = "04fwddn12sj6vzr5xr4xd25m86cn4l15079490h3q3igprzvrqk8";
+ };
+ };
+ };
+ "symfony/http-client-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-http-client-contracts-41db680a15018f9c1d4b23516059633ce280ca33";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/http-client-contracts/zipball/41db680a15018f9c1d4b23516059633ce280ca33;
+ sha256 = "1iia9rpbri1whp2dw4qfhh90gmkdvxhgjwxi54q7wlnlhijgga81";
+ };
+ };
+ };
+ "symfony/http-foundation" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-http-foundation-8888741b633f6c3d1e572b7735ad2cae3e03f9c5";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/http-foundation/zipball/8888741b633f6c3d1e572b7735ad2cae3e03f9c5;
+ sha256 = "0qs389nxxqc6nwx5x6b9kz8ykdlhdx7k8k6nd2apppxpqalvk6sw";
+ };
+ };
+ };
+ "symfony/http-kernel" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-http-kernel-07ea794a327d7c8c5d76e3058fde9fec6a711cb4";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/http-kernel/zipball/07ea794a327d7c8c5d76e3058fde9fec6a711cb4;
+ sha256 = "0mnay6nn299ljjgaqqbk8kcl431wrzvzsqybvl648pf513mp9vy9";
+ };
+ };
+ };
+ "symfony/mime" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-mime-7dee6a43493f39b51ff6c5bb2bd576fe40a76c86";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/mime/zipball/7dee6a43493f39b51ff6c5bb2bd576fe40a76c86;
+ sha256 = "0931zsmnpx75b9b34a03l0sfp22mailaa2y5az3cgx9v0bkc0vka";
+ };
+ };
+ };
+ "symfony/polyfill-ctype" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-ctype-c6c942b1ac76c82448322025e084cadc56048b4e";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e;
+ sha256 = "0jpk859wx74vm03q5s9z25f4ak2138p2x5q3b587wvy8rq2m4pbd";
+ };
+ };
+ };
+ "symfony/polyfill-iconv" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-iconv-06fb361659649bcfd6a208a0f1fcaf4e827ad342";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342;
+ sha256 = "0glb56w5q4v2j629rkndp2c7v4mcs6xdl14nwaaxy85lr5w4ixnq";
+ };
+ };
+ };
+ "symfony/polyfill-intl-idn" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-intl-idn-2d63434d922daf7da8dd863e7907e67ee3031483";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483;
+ sha256 = "0sk592qrdb6dvk6v8msjva8p672qmhmnzkw1lw53gks0xrc20xjy";
+ };
+ };
+ };
+ "symfony/polyfill-intl-normalizer" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-intl-normalizer-43a0283138253ed1d48d352ab6d0bdb3f809f248";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248;
+ sha256 = "04irkl6aks8zyfy17ni164060liihfyraqm1fmpjbs5hq0b14sc9";
+ };
+ };
+ };
+ "symfony/polyfill-mbstring" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-mbstring-5232de97ee3b75b0360528dae24e73db49566ab1";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1;
+ sha256 = "1mm670fxj2x72a9mbkyzs3yifpp6glravq2ss438bags1xf6psz8";
+ };
+ };
+ };
+ "symfony/polyfill-php72" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-php72-cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9;
+ sha256 = "12dmz2n1b9pqqd758ja0c8h8h5dxdai5ik74iwvaxc5xn86a026b";
+ };
+ };
+ };
+ "symfony/polyfill-php73" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-php73-a678b42e92f86eca04b7fa4c0f6f19d097fb69e2";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2;
+ sha256 = "10rq2x2q9hsdzskrz0aml5qcji27ypxam324044fi24nl60fyzg0";
+ };
+ };
+ };
+ "symfony/polyfill-php80" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-php80-dc3063ba22c2a1fd2f45ed856374d79114998f91";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91;
+ sha256 = "1mhfjibk7mqyzlqpz6jjpxpd93fnfw0nik140x3mq1d2blg5cbvd";
+ };
+ };
+ };
+ "symfony/process" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-process-7e950b6366d4da90292c2e7fa820b3c1842b965a";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a;
+ sha256 = "07ykgz5bjd45izf5n6jm2n27wcaa7aih2wlsiln1ffj9vqd6l1s4";
+ };
+ };
+ };
+ "symfony/routing" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-routing-87529f6e305c7acb162840d1ea57922038072425";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/routing/zipball/87529f6e305c7acb162840d1ea57922038072425;
+ sha256 = "0qrgacividsp7c61y03qh8lb4vj30g0mvljnm5k60h4zzdmivlgc";
+ };
+ };
+ };
+ "symfony/service-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-service-contracts-d15da7ba4957ffb8f1747218be9e1a121fd298a1";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1;
+ sha256 = "168iq1lp2r5qb5h8j0s17da09iaj2h5hrrdc9rw2p73hq8rvm1w2";
+ };
+ };
+ };
+ "symfony/translation" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-translation-e1d0c67167a553556d9f974b5fa79c2448df317a";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/translation/zipball/e1d0c67167a553556d9f974b5fa79c2448df317a;
+ sha256 = "1b6fj278i1wdf4l7py9n86lmhrqmzvjy7kapjpfkz03adn2ps127";
+ };
+ };
+ };
+ "symfony/translation-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-translation-contracts-e2eaa60b558f26a4b0354e1bbb25636efaaad105";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/translation-contracts/zipball/e2eaa60b558f26a4b0354e1bbb25636efaaad105;
+ sha256 = "1k26yvgk84rz6ja9ml6l6iwbbi68qsqnq2cpky044g9ymvlg8d5g";
+ };
+ };
+ };
+ "symfony/var-dumper" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-var-dumper-a1eab2f69906dc83c5ddba4632180260d0ab4f7f";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/var-dumper/zipball/a1eab2f69906dc83c5ddba4632180260d0ab4f7f;
+ sha256 = "1yw12jbx6gf5mvg7jrr1v57ah3b2s4hflz2p1m98nayi4qhdp20m";
+ };
+ };
+ };
+ "tijsverkoyen/css-to-inline-styles" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "tijsverkoyen-css-to-inline-styles-b43b05cf43c1b6d849478965062b6ef73e223bb5";
+ src = fetchurl {
+ url = https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5;
+ sha256 = "0lc6jviz8faqxxs453dbqvfdmm6l2iczxla22v2r6xhakl58pf3w";
+ };
+ };
+ };
+ "vlucas/phpdotenv" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "vlucas-phpdotenv-5e679f7616db829358341e2d5cccbd18773bdab8";
+ src = fetchurl {
+ url = https://api.github.com/repos/vlucas/phpdotenv/zipball/5e679f7616db829358341e2d5cccbd18773bdab8;
+ sha256 = "05j5wj1hry30vaqna4a232gjlibp89ha3ibhy04x5lbm0c98b73q";
+ };
+ };
+ };
+ };
+ devPackages = {};
+in
+composerEnv.buildPackage {
+ inherit packages devPackages noDev;
+ name = "bookstack";
+ src = ./.;
+ executable = false;
+ symlinkDependencies = false;
+ meta = {
+ license = "MIT";
+ };
+}
diff --git a/pkgs/servers/web-apps/bookstack/update.sh b/pkgs/servers/web-apps/bookstack/update.sh
new file mode 100755
index 000000000000..f61a51105902
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/update.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nix curl jq nix-update
+
+# check if composer2nix is installed
+if ! command -v composer2nix &> /dev/null; then
+ echo "Please install composer2nix (https://github.com/svanderburg/composer2nix) to run this script."
+ exit 1
+fi
+
+CURRENT_VERSION=$(nix eval --raw '(with import ../../../.. {}; bookstack.version)')
+TARGET_VERSION_REMOTE=$(curl https://api.github.com/repos/bookstackapp/bookstack/releases/latest | jq -r ".tag_name")
+TARGET_VERSION=${TARGET_VERSION_REMOTE:1}
+BOOKSTACK=https://github.com/bookstackapp/bookstack/raw/$TARGET_VERSION_REMOTE
+SHA256=$(nix-prefetch-url --unpack "https://github.com/bookstackapp/bookstack/archive/v$TARGET_VERSION/bookstack.tar.gz")
+
+if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
+ echo "bookstack is up-to-date: ${CURRENT_VERSION}"
+ exit 0
+fi
+
+curl -LO "$BOOKSTACK/composer.json"
+curl -LO "$BOOKSTACK/composer.lock"
+
+composer2nix --name "bookstack" \
+ --composition=composition.nix \
+ --no-dev
+rm composer.json composer.lock
+
+# change version number
+sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \
+ -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \
+ -i ./default.nix
+
+# fix composer-env.nix
+sed -e "s/stdenv\.lib/lib/g" \
+ -e '3s/stdenv, writeTextFile/stdenv, lib, writeTextFile/' \
+ -i ./composer-env.nix
+
+# fix composition.nix
+sed -e '7s/stdenv writeTextFile/stdenv lib writeTextFile/' \
+ -i composition.nix
+
+# fix missing newline
+echo "" >> composition.nix
+echo "" >> php-packages.nix
+
+cd ../../../..
+nix-build -A bookstack
+
+exit $?
diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix
index 1c2e16f76fc6..ae56fed52bd3 100644
--- a/pkgs/servers/web-apps/galene/default.nix
+++ b/pkgs/servers/web-apps/galene/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "galene";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "jech";
repo = "galene";
rev = "galene-${version}";
- sha256 = "0hpgqqv8mp1d3sk7dk49m3yv0cv4afa0v3vdd4w8mdnx6pcqdgy1";
+ sha256 = "1pl3mnkmfqykhq55q36kvvnvn9fgsk72pfa7nii3hywzad0bj0ar";
};
- vendorSha256 = "12b7andpzsgzmd56gg4gc5ilkxvjrpwpmwbdmygfzgkd5jncmcgp";
+ vendorSha256 = "0jrc6y5chkj25bnpzn6blvfb0vd09h6fdcz75g54605z8nqd397p";
outputs = [ "out" "static" ];
diff --git a/pkgs/servers/web-apps/moodle/moodle-utils.nix b/pkgs/servers/web-apps/moodle/moodle-utils.nix
index 168482bffe65..090d87cb1ee8 100644
--- a/pkgs/servers/web-apps/moodle/moodle-utils.nix
+++ b/pkgs/servers/web-apps/moodle/moodle-utils.nix
@@ -8,15 +8,16 @@ let
configurePhase ? ":",
buildPhase ? ":",
buildInputs ? [ ],
+ nativeBuildInputs ? [ ],
...
}:
stdenv.mkDerivation (a // {
name = name;
inherit pluginType;
- inherit configurePhase buildPhase;
+ inherit configurePhase buildPhase buildInputs;
- buildInputs = [ unzip ] ++ buildInputs;
+ nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
installPhase = ''
runHook preInstall
diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix
index 934ef81ac90e..e260702d5759 100644
--- a/pkgs/servers/web-apps/restya-board/default.nix
+++ b/pkgs/servers/web-apps/restya-board/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
license = licenses.osl3;
homepage = "https://restya.com";
maintainers = with maintainers; [ tstrobel ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix
index b3fedf9bc5d6..4a73c5770d2a 100644
--- a/pkgs/servers/web-apps/sogo/default.nix
+++ b/pkgs/servers/web-apps/sogo/default.nix
@@ -1,4 +1,4 @@
-{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir
+{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }:
with lib; gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
@@ -11,7 +11,7 @@ with lib; gnustep.stdenv.mkDerivation rec {
sha256 = "145hdlwnqds5zmpxbh4yainsbv5vy99ji93d6pl7xkbqwncfi80i";
};
- nativeBuildInputs = [ gnustep.make makeWrapper python2 ];
+ nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ]
++ optional (openldap != null) openldap;
diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 0fae5ac2287e..330470f0fd58 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
- version = "5.5.3";
+ version = "5.6.2";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
- sha256 = "sTkmdr9Mulw7XwNEMJBU81rwNV/agNpBjCznGuObrtQ=";
+ sha256 = "sha256-W9/U3i6jALXolDFraiI/a+PNPoNHim0rZHzaqSy4gkI=";
};
installPhase = ''
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e8b29f9bbac9..59879c652f90 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1015,11 +1015,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation {
- name = "libXt-1.2.0";
+ name = "libXt-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2";
- sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk";
+ url = "mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2";
+ sha256 = "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
@@ -1340,11 +1340,11 @@ lib.makeScope newScope (self: with self; {
}) {};
utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation {
- name = "util-macros-1.19.2";
+ name = "util-macros-1.19.3";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2";
- sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p";
+ url = "mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2";
+ sha256 = "0w8ryfqylprz37zj9grl4jzdsqq67ibfwq5raj7vm1i7kmp2x08g";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 3ee31e4c2a7a..aaab0c994f6d 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -202,7 +202,7 @@ mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2
mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2
mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2
+mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2
mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2
@@ -216,6 +216,6 @@ mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
mirror://xorg/individual/util/imake-1.0.8.tar.bz2
mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
-mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
+mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2
diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix
index 60480b3ac2bd..b29151911a63 100644
--- a/pkgs/servers/xandikos/default.nix
+++ b/pkgs/servers/xandikos/default.nix
@@ -1,18 +1,18 @@
{ lib
, fetchFromGitHub
, python3Packages
-, installShellFiles
+, nixosTests
}:
python3Packages.buildPythonApplication rec {
pname = "xandikos";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "jelmer";
repo = "xandikos";
rev = "v${version}";
- sha256 = "sha256-/pr8ZqgYk24CdJNAETCDF4ZtufXkVEu1Zw25PcPEo7M=";
+ sha256 = "sha256-Epy6NWtRY2Oj4MHTStdv8ZJ5SvSmUo6IlwL5PJV9pD0=";
};
propagatedBuildInputs = with python3Packages; [
@@ -25,11 +25,7 @@ python3Packages.buildPythonApplication rec {
prometheus_client
];
- nativeBuildInputs = [ installShellFiles ];
-
- postInstall = ''
- installManPage xandikos.1
- '';
+ passthru.tests.xandikos = nixosTests.xandikos;
meta = with lib; {
description = "Lightweight CalDAV/CardDAV server";
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 581785beb7a5..c467c04c3ff6 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -131,7 +131,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@@ -141,7 +141,7 @@ let
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-TwKT7Z9qa3fkfUHvq+YvMxnobvyL+DzFhzMET7xvkhE=";
+ sha256 = "2OSfQJDTd43xfdgl5KKoAZIBVoJCPNndArZnXWXDr1s=";
};
# Fix FHS paths in tests
@@ -214,7 +214,7 @@ let
checkInputs = [
coreutils
- (python3.withPackages(ps: [ps.pexpect]))
+ (python3.withPackages (ps: [ ps.pexpect ]))
procps
];
diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix
index a52c57464929..5bb4ffa243fc 100644
--- a/pkgs/shells/fish/plugins/build-fish-plugin.nix
+++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix
@@ -11,8 +11,6 @@ attrs@{
buildPhase ? ":",
preInstall ? "",
postInstall ? "",
- # name of the subdirectory in which to store the plugin
- installPath ? lib.getName pname,
checkInputs ? [],
# plugin packages to add to the vendor paths of the test fish shell
@@ -26,7 +24,15 @@ attrs@{
...
}:
-stdenv.mkDerivation (attrs // {
+let
+ # Do not pass attributes that are only relevant to buildFishPlugin to mkDerivation.
+ drvAttrs = builtins.removeAttrs attrs [
+ "checkPlugins"
+ "checkFunctionDirs"
+ ];
+in
+
+stdenv.mkDerivation (drvAttrs // {
inherit name;
inherit unpackPhase configurePhase buildPhase;
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index c10537959d75..360380e19b34 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchurl }:
+{ lib
+, stdenv
+, fetchurl
+, installShellFiles
+}:
stdenv.mkDerivation rec {
pname = "mksh";
@@ -6,20 +10,30 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
- "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
- "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
+ "https://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz"
+ "http://pub.allbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz"
];
- sha256 = "01n5ggw33bw4jv4d3148wlw9n4aj7vdn3ffnc66c9w9pldjidbkp";
+ hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY=";
};
+ nativeBuildInputs = [
+ installShellFiles
+ ];
+
dontConfigure = true;
- buildPhase = "sh ./Build.sh -r";
+ buildPhase = ''
+ runHook preBuild
+ sh ./Build.sh -r
+ runHook postBuild
+ '';
installPhase = ''
- install -D -m 755 mksh $out/bin/mksh
- install -D -m 644 mksh.1 $out/share/man/man1/mksh.1
- install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc
+ runHook preInstall
+ install -D mksh $out/bin/mksh
+ install -D dot.mkshrc $out/share/mksh/mkshrc
+ installManPage mksh.1
+ runHook postInstall
'';
meta = with lib; {
@@ -32,7 +46,7 @@ stdenv.mkDerivation rec {
systems.
'';
homepage = "https://www.mirbsd.org/mksh.htm";
- license = licenses.bsd3;
+ license = with licenses; [ miros isc unicode-dfs-2016 ];
maintainers = with maintainers; [ AndersonTorres joachifm ];
platforms = platforms.unix;
};
@@ -41,3 +55,5 @@ stdenv.mkDerivation rec {
shellPath = "/bin/mksh";
};
}
+# TODO [ AndersonTorres ]: lksh
+# TODO [ AndersonTorres ]: a more accurate licensing info
diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
index d9a846c9e06f..e8d00d73d1aa 100644
--- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals";
homepage = "https://github.com/halfo/lambda-mod-zsh-theme/";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ ma27 ];
};
}
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 1c191b567d73..6d5000e6f69f 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
- version = "2021-03-08";
+ version = "2021-03-15";
pname = "oh-my-zsh";
- rev = "0ab87c26c17171ae6162ff379a0c704fa57dff2e";
+ rev = "95a06f3927a286db257dc99791b02caba757fe33";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "1ryf7wj7k7b63sg3ipjdmn3wnyjlh0saf2kz084jmy82hxhqpd8w";
+ sha256 = "1w0g68rvw17jg085qj1g264dsii25gph6vpp6gpn8wby0972h7n0";
};
installPhase = ''
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 3e5c46709ac7..a7b91a82a9d2 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -322,7 +322,7 @@ in rec {
libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils
- libssh2 nghttp2 libkrb5 ninja;
+ libssh2 nghttp2 libkrb5 ninja brotli;
llvmPackages_7 = super.llvmPackages_7 // (let
tools = super.llvmPackages_7.tools.extend (_: _: {
@@ -359,7 +359,7 @@ in rec {
[ bootstrapTools ] ++
(with pkgs; [
xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt
- llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out
+ llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out
libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
]) ++
(with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
@@ -411,7 +411,7 @@ in rec {
[ bootstrapTools ] ++
(with pkgs; [
xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt
- llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out
+ llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out
libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
]) ++
(with pkgs.darwin; [ dyld ICU Libsystem locale ]);
@@ -533,7 +533,7 @@ in rec {
gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext
binutils.bintools darwin.binutils darwin.binutils.bintools
- curl.out openssl.out libssh2.out nghttp2.lib libkrb5
+ curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5
cc.expand-response-params libxml2.out
]) ++ (with pkgs.darwin; [
dyld Libsystem CF cctools ICU libiconv locale libtapi
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 1d5abdc8b4a6..7b68c877a6ef 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -18,7 +18,7 @@ in rec {
bzip2_ = bzip2.override (args: { linkStatic = true; });
# Avoid messing with libkrb5 and libnghttp2.
- curl_ = curl.override (args: { gssSupport = false; http2Support = false; });
+ curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
build = stdenv.mkDerivation {
name = "stdenv-bootstrap-tools";
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 13a7a03d6a8b..2b89b37f7864 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -106,7 +106,12 @@ in rec {
++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || (stdenv.noCC or false);
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
- defaultHardeningFlags = if stdenv.hostPlatform.isMusl
+ # Musl-based platforms will keep "pie", other platforms will not.
+ defaultHardeningFlags = if stdenv.hostPlatform.isMusl &&
+ # Except when:
+ # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries.
+ # - static armv7l, where compilation fails.
+ !((stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) && stdenv.hostPlatform.isStatic)
then supportedHardeningFlags
else lib.remove "pie" supportedHardeningFlags;
enabledHardeningOptions =
@@ -251,6 +256,7 @@ in rec {
lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"]
++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}"
+ ++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}"
++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}";
diff --git a/pkgs/test/cuda/cuda-library-samples/default.nix b/pkgs/test/cuda/cuda-library-samples/default.nix
new file mode 100644
index 000000000000..91095fbd3ac4
--- /dev/null
+++ b/pkgs/test/cuda/cuda-library-samples/default.nix
@@ -0,0 +1,42 @@
+{ callPackage
+, cudatoolkit_10_1, cudatoolkit_10_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+, cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2
+, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2
+}:
+
+rec {
+
+ cuda-library-samples_cudatoolkit_10_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_1;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_10_1;
+ };
+
+ cuda-library-samples_cudatoolkit_10_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_2;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_10_2;
+ };
+
+ cuda-library-samples_cudatoolkit_10 =
+ cuda-library-samples_cudatoolkit_10_2;
+
+ ##
+
+ cuda-library-samples_cudatoolkit_11_0 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_0;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_11_0;
+ };
+
+ cuda-library-samples_cudatoolkit_11_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_1;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_11_1;
+ };
+
+ cuda-library-samples_cudatoolkit_11_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_2;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_11_2;
+ };
+
+ cuda-library-samples_cudatoolkit_11 =
+ cuda-library-samples_cudatoolkit_11_2;
+}
diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix
new file mode 100644
index 000000000000..f1ce243bfa6a
--- /dev/null
+++ b/pkgs/test/cuda/cuda-library-samples/generic.nix
@@ -0,0 +1,70 @@
+{ lib, stdenv, fetchFromGitHub
+, cmake, addOpenGLRunpath
+, cudatoolkit
+, cutensor_cudatoolkit
+}:
+
+let
+ rev = "5aab680905d853bce0dbad4c488e4f7e9f7b2302";
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "CUDALibrarySamples";
+ inherit rev;
+ sha256 = "0gwgbkq05ygrfgg5hk07lmap7n7ampxv0ha1axrv8qb748ph81xs";
+ };
+ commonAttrs = {
+ version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version;
+ nativeBuildInputs = [ cmake addOpenGLRunpath ];
+ buildInputs = [ cudatoolkit ];
+ enableParallelBuilding = true;
+ postFixup = ''
+ for exe in $out/bin/*; do
+ addOpenGLRunpath $exe
+ done
+ '';
+ meta = {
+ description = "examples of using libraries using CUDA";
+ longDescription = ''
+ CUDA Library Samples contains examples demonstrating the use of
+ features in the math and image processing libraries cuBLAS, cuTENSOR,
+ cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG.
+ '';
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
+ };
+ };
+in
+
+{
+ cublas = stdenv.mkDerivation (commonAttrs // {
+ pname = "cuda-library-samples-cublas";
+
+ src = "${src}/cuBLASLt";
+ });
+
+ cusolver = stdenv.mkDerivation (commonAttrs // {
+ pname = "cuda-library-samples-cusolver";
+
+ src = "${src}/cuSOLVER";
+
+ sourceRoot = "cuSOLVER/gesv";
+ });
+
+ cutensor = stdenv.mkDerivation (commonAttrs // {
+ pname = "cuda-library-samples-cutensor";
+
+ src = "${src}/cuTENSOR";
+
+ cmakeFlags = [
+ "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin"
+ ];
+
+ # CUTENSOR_ROOT is double escaped
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "\''${CUTENSOR_ROOT}/include" "${cutensor_cudatoolkit.dev}/include"
+ '';
+
+ CUTENSOR_ROOT = cutensor_cudatoolkit;
+ });
+}
diff --git a/pkgs/test/cuda/cuda-samples/default.nix b/pkgs/test/cuda/cuda-samples/default.nix
new file mode 100644
index 000000000000..46d4d531690d
--- /dev/null
+++ b/pkgs/test/cuda/cuda-samples/default.nix
@@ -0,0 +1,52 @@
+{ callPackage
+, cudatoolkit_9_2
+, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+}:
+
+rec {
+ cuda-samples_cudatoolkit_9_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_9_2;
+ sha256 = "1ydankhyigcg99h0rqnmz1z4vc0sl6p9s1s0hbdxh5l1sx9141j6";
+ };
+
+ cuda-samples_cudatoolkit_9 = cuda-samples_cudatoolkit_9_2;
+
+ ##
+
+ cuda-samples_cudatoolkit_10_0 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_0;
+ sha256 = "1zvh4xsdyc59m87brpcmssxsjlp9dkynh4asnkcmc3g94f53l0jw";
+ };
+
+ cuda-samples_cudatoolkit_10_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_1;
+ sha256 = "1s8ka0hznrni36ajhzf2gqpdrl8kd8fi047qijxks5l2abc093qd";
+ };
+
+ cuda-samples_cudatoolkit_10_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_2;
+ sha256 = "01p1innzgh9siacpld6nsqimj8jkg93rk4gj8q4crn62pa5vhd94";
+ };
+
+ cuda-samples_cudatoolkit_10 = cuda-samples_cudatoolkit_10_2;
+
+ ##
+
+ cuda-samples_cudatoolkit_11_0 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_0;
+ sha256 = "1n3vjc8c7zdig2xgl5fppavrphqzhdiv9m9nk6smh4f99fwi0705";
+ };
+
+ cuda-samples_cudatoolkit_11_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_1;
+ sha256 = "1kjixk50i8y1bkiwbdn5lkv342crvkmbvy1xl5j3lsa1ica21kwh";
+ };
+
+ cuda-samples_cudatoolkit_11_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_2;
+ sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1";
+ };
+
+ cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_2;
+}
diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix
new file mode 100644
index 000000000000..2e3dcc8891f4
--- /dev/null
+++ b/pkgs/test/cuda/cuda-samples/generic.nix
@@ -0,0 +1,51 @@
+{ lib, stdenv, fetchFromGitHub
+, pkg-config, addOpenGLRunpath
+, sha256, cudatoolkit
+}:
+
+let
+ pname = "cuda-samples";
+ version = lib.versions.majorMinor cudatoolkit.version;
+in
+
+stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = pname;
+ rev = "v${version}";
+ inherit sha256;
+ };
+
+ nativeBuildInputs = [ pkg-config addOpenGLRunpath ];
+
+ buildInputs = [ cudatoolkit ];
+
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ export CUDA_PATH=${cudatoolkit}
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 -t $out/bin bin/${stdenv.hostPlatform.parsed.cpu.name}/${stdenv.hostPlatform.parsed.kernel.name}/release/*
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ for exe in $out/bin/*; do
+ addOpenGLRunpath $exe
+ done
+ '';
+
+ meta = {
+ description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
+ # CUDA itself is proprietary, but these sample apps are not.
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
+ };
+}
diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix
new file mode 100644
index 000000000000..9e7eaf8036a7
--- /dev/null
+++ b/pkgs/test/cuda/default.nix
@@ -0,0 +1,26 @@
+{ callPackage }:
+
+rec {
+ cuda-samplesPackages = callPackage ./cuda-samples { };
+ inherit (cuda-samplesPackages)
+ cuda-samples_cudatoolkit_9
+ cuda-samples_cudatoolkit_9_2
+ cuda-samples_cudatoolkit_10
+ cuda-samples_cudatoolkit_10_0
+ cuda-samples_cudatoolkit_10_1
+ cuda-samples_cudatoolkit_10_2
+ cuda-samples_cudatoolkit_11
+ cuda-samples_cudatoolkit_11_0
+ cuda-samples_cudatoolkit_11_1
+ cuda-samples_cudatoolkit_11_2;
+
+ cuda-library-samplesPackages = callPackage ./cuda-library-samples { };
+ inherit (cuda-library-samplesPackages)
+ cuda-library-samples_cudatoolkit_10
+ cuda-library-samples_cudatoolkit_10_1
+ cuda-library-samples_cudatoolkit_10_2
+ cuda-library-samples_cudatoolkit_11
+ cuda-library-samples_cudatoolkit_11_0
+ cuda-library-samples_cudatoolkit_11_1
+ cuda-library-samples_cudatoolkit_11_2;
+}
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index f45e981cff07..fa93ceb0721e 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -47,5 +47,7 @@ with pkgs;
texlive = callPackage ./texlive {};
+ cuda = callPackage ./cuda { };
+
writers = callPackage ../build-support/writers/test.nix {};
}
diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix
index 30d0026c848d..7a6affd6cbe0 100644
--- a/pkgs/test/texlive/default.nix
+++ b/pkgs/test/texlive/default.nix
@@ -1,4 +1,4 @@
-{ runCommandNoCC, fetchurl, file, texlive }:
+{ runCommandNoCC, fetchurl, file, texlive, writeShellScript }:
{
chktex = runCommandNoCC "texlive-test-chktex" {
@@ -17,7 +17,7 @@
'';
# https://github.com/NixOS/nixpkgs/issues/75605
- dvipng = runCommandNoCC "texlive-test-dvipng" {
+ dvipng.basic = runCommandNoCC "texlive-test-dvipng-basic" {
nativeBuildInputs = [ file texlive.combined.scheme-medium ];
input = fetchurl {
name = "test_dvipng.tex";
@@ -38,6 +38,47 @@
mv document*.png "$out"/
'';
+ # test dvipng's limited capability to render postscript specials via GS
+ dvipng.ghostscript = runCommandNoCC "texlive-test-ghostscript" {
+ nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ];
+ input = builtins.toFile "postscript-sample.tex" ''
+ \documentclass{minimal}
+ \begin{document}
+ Ni
+ \special{ps:
+ newpath
+ 0 0 moveto
+ 7 7 rlineto
+ 0 7 moveto
+ 7 -7 rlineto
+ stroke
+ showpage
+ }
+ \end{document}
+ '';
+ gs_trap = writeShellScript "gs_trap.sh" ''
+ exit 1
+ '';
+ } ''
+ cp "$gs_trap" ./gs
+ export PATH=$PWD:$PATH
+ # check that the trap works
+ gs && exit 1
+
+ cp "$input" ./document.tex
+
+ latex document.tex
+ dvipng -T 1in,1in -strict -picky document.dvi
+ for f in document*.png; do
+ file "$f" | tee output
+ grep PNG output
+ done
+
+ mkdir "$out"
+ mv document*.png "$out"/
+ '';
+
+
# https://github.com/NixOS/nixpkgs/issues/75070
dvisvgm = runCommandNoCC "texlive-test-dvisvgm" {
nativeBuildInputs = [ file texlive.combined.scheme-medium ];
diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix
index 1a4f1daad51e..591edff2add7 100644
--- a/pkgs/tools/X11/alttab/default.nix
+++ b/pkgs/tools/X11/alttab/default.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, ronn, libpng, uthash
-, xorg }:
+{ lib, stdenv, coreutils, fetchFromGitHub, autoconf, automake, pkg-config, procps, ronn,
+libpng, uthash , which, xnee, xorg, python3Packages }:
stdenv.mkDerivation rec {
- version = "1.5.0";
+ version = "1.6.0";
pname = "alttab";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "sagb";
repo = pname;
rev = "v${version}";
- sha256 = "026xd1bkg10fj2q1n6xx797xk1grpby25qj1pnw2lp4f3vc19qn6";
+ sha256 = "sha256-G4tu008IC3RCeCRZVKFPY2+ioLuUa9hDDKUx1q5C5FQ=";
};
nativeBuildInputs = [
@@ -35,10 +35,22 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = true;
+
+ checkInputs = [
+ coreutils
+ procps
+ python3Packages.xvfbwrapper
+ which
+ xnee
+ xorg.xeyes
+ xorg.xprop
+ ];
+
meta = with lib; {
homepage = "https://github.com/sagb/alttab";
description = "X11 window switcher designed for minimalistic window managers or standalone X11 session";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.sgraf ];
};
diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix
index 1f0a7a8e3a6a..d8c220d0fd7f 100644
--- a/pkgs/tools/X11/libstrangle/default.nix
+++ b/pkgs/tools/X11/libstrangle/default.nix
@@ -1,14 +1,16 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitLab, libGL, libX11 }:
stdenv.mkDerivation rec {
pname = "libstrangle";
- version = "2017-02-22";
+ version = "0.1.1";
- src = fetchFromGitHub {
- owner = "milaq";
+ buildInputs = [ libGL libX11 ];
+
+ src = fetchFromGitLab {
+ owner = "torkel104";
repo = pname;
- rev = "6020f9e375ba747c75eb7996b7d5f0214ac3221e";
- sha256 = "04ikacbjcq9phdc8q5y1qjjpa1sxmzfm0idln9ys95prg289zp4h";
+ rev = version;
+ sha256 = "135icr544w5ynlxfnxqgjn794bsm9i703rh9jfnracjb7jgnha4w";
};
makeFlags = [ "prefix=" "DESTDIR=$(out)" ];
@@ -17,10 +19,11 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteAllInPlace src/strangle.sh
+ substituteAllInPlace src/stranglevk.sh
'';
meta = with lib; {
- homepage = "https://github.com/milaq/libstrangle";
+ homepage = "https://gitlab.com/torkel104/libstrangle";
description = "Frame rate limiter for Linux/OpenGL";
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/tools/X11/libstrangle/nixos.patch b/pkgs/tools/X11/libstrangle/nixos.patch
index 03c8c19b54cf..05364028e3e7 100644
--- a/pkgs/tools/X11/libstrangle/nixos.patch
+++ b/pkgs/tools/X11/libstrangle/nixos.patch
@@ -1,29 +1,43 @@
diff --git a/makefile b/makefile
-index eb13054..a3a1125 100644
--- a/makefile
+++ b/makefile
-@@ -27,12 +27,10 @@ $(BUILDDIR)libstrangle32.so: $(BUILDDIR)
- $(CC) $(CFLAGS) $(LDFLAGS) -m32 -o $(BUILDDIR)libstrangle32.so $(SOURCES)
+@@ -86,10 +86,6 @@ install-common:
+ install -m 0755 -D -T $(SOURCEDIR)/stranglevk.sh $(DESTDIR)$(bindir)/stranglevk
+ install -m 0644 -D -T $(SOURCEDIR)/vulkan/libstrangle_vk.json $(DESTDIR)$(datarootdir)/vulkan/implicit_layer.d/libstrangle_vk.json
- install: all
-- install -m 0644 -D -T $(BUILDDIR)libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf
- install -m 0755 -D -T $(BUILDDIR)libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so
- install -m 0755 -D -T $(BUILDDIR)libstrangle64.so $(DESTDIR)$(LIB64_PATH)/libstrangle.so
- install -m 0755 -D -T $(SOURCEDIR)strangle.sh $(DESTDIR)$(bindir)/strangle
- install -m 0644 -D -T COPYING $(DESTDIR)$(DOC_PATH)/LICENSE
+-install-ld: ld
+- install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf
- ldconfig
+-
+ install-32: 32-bit
+ install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so
+ install -m 0755 -D -T $(BUILDDIR)/libstrangle32_nodlsym.so $(DESTDIR)$(LIB32_PATH)/libstrangle_nodlsym.so
+@@ -109,8 +105,7 @@ install: \
+ all \
+ install-common \
+ install-32 \
+- install-64 \
+- install-ld
++ install-64
clean:
- rm -f $(BUILDDIR)libstrangle64.so
+ rm -f $(BUILDDIR)/libstrangle64.so
diff --git a/src/strangle.sh b/src/strangle.sh
-index e280e86..b2dd42b 100755
--- a/src/strangle.sh
+++ b/src/strangle.sh
-@@ -31,6 +31,5 @@ if [ "$#" -eq 0 ]; then
- exit 1
+@@ -130,6 +130,5 @@ if [ "$STRANGLE_VKONLY" != "1" ]; then
+ fi
fi
-# Execute the strangled program under a clean environment
# pass through the FPS and overriden LD_PRELOAD environment variables
--exec env FPS="${FPS}" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" "$@"
-+FPS="${FPS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" exec "$@"
+-exec env ENABLE_VK_LAYER_TORKEL104_libstrangle=1 LD_PRELOAD="${LD_PRELOAD}" "$@"
++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 XDG_DATA_DIRS="${XDG_DATA_DIRS}${XDG_DATA_DIRS:+:}@out@/share" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}" exec "$@"
+diff --git a/src/stranglevk.sh b/src/stranglevk.sh
+--- a/src/stranglevk.sh
++++ b/src/stranglevk.sh
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 strangle "$@"
++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 @out@/bin/strangle "$@"
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index c1cef23a695b..58bac8702b70 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "screen-message";
- version = "0.25";
+ version = "0.26";
src = fetchurl {
url = "mirror://debian/pool/main/s/screen-message/screen-message_${version}.orig.tar.gz";
- sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0";
+ sha256 = "sha256-vBKnuXOEQZDACmlNP9wjJ3NbIdixIx7I72a6Nj6pjzc=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/X11/xkeysnail/default.nix b/pkgs/tools/X11/xkeysnail/default.nix
index fa52a714c7a7..2d66405904f6 100644
--- a/pkgs/tools/X11/xkeysnail/default.nix
+++ b/pkgs/tools/X11/xkeysnail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, python3Packages }:
+{ lib, fetchFromGitHub, makeWrapper, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "xkeysnail";
diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix
index 68046be2eeea..d85e5365d63a 100644
--- a/pkgs/tools/admin/analog/default.nix
+++ b/pkgs/tools/admin/analog/default.nix
@@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk";
};
- configurePhase = ''
+ postPatch = ''
sed -i src/anlghead.h \
-e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \
-e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g"
+ substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
'';
installPhase = ''
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2;
description = "Powerful tool to generate web server statistics";
maintainers = [ lib.maintainers.peti ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 13860b4bf7ce..56a0d252a8c4 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -1,16 +1,16 @@
{ buildGoModule, lib, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "aws-vault";
- version = "6.2.0";
+ version = "6.3.0";
src = fetchFromGitHub {
owner = "99designs";
repo = pname;
rev = "v${version}";
- sha256 = "0892fhjmxnms09bfbjnngnnnli2d4nkwq44fw98yb3d5lbpa1j1j";
+ sha256 = "sha256-bmqmT/gkdgczrDfZdI+FySX5CuesJXWKS0JatzaubIw=";
};
- vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z";
+ vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index c5e792d6bcd8..445d32be1225 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.19.25"; # N.B: if you change this, change botocore and boto3 to a matching version too
+ version = "1.19.34"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-YL5MnlN+DODGgpi2qtpr6wwC0nuebl/VoBzXRk4l4R8=";
+ sha256 = "sha256-RJ+ibZmOxH4r+pGI/rrkRES89u0IRUU3sSE5OFSJ2qw=";
};
# https://github.com/aws/aws-cli/issues/4837
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 6379fa94bd7a..0c41f4127c80 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
let
- version = "2.18.0";
+ version = "2.20.0";
srcName = "azure-cli-${version}-src";
src = fetchFromGitHub {
@@ -9,7 +9,7 @@ let
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
- sha256 = "sha256-3qQKQePyLYwIS3yO3exHNd0uoPr7y4iZ12+GaiHfqz8=";
+ sha256 = "sha256-unG17oiqZZJNGg8QCg7xY0GzuMu2gaAIIgGF8TlMBQQ=";
};
# put packages that needs to be overriden in the py package scope
@@ -137,6 +137,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
psutil
requests
scp
+ semver
six
sshtunnel
urllib3
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index 8decd2f80f1e..e81815b065cc 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -61,6 +61,7 @@ let
azure-mgmt-core
azure-mgmt-resource
colorama
+ cryptography
humanfriendly
jmespath
knack
@@ -85,7 +86,8 @@ let
postPatch = ''
substituteInPlace setup.py \
- --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2"
+ --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" \
+ --replace "cryptography>=3.2,<3.4" "cryptography"
'';
doCheck = stdenv.isLinux;
@@ -136,8 +138,8 @@ let
azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip"
"8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
- azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.2.0" "zip"
- "sha256-sh2IWOaaoW0luQjEARah93PBJ+xN1gLLuFQuvzmlXYM=";
+ azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.3.0" "zip"
+ "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1";
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip"
"1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd";
@@ -148,8 +150,8 @@ let
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip"
"0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1";
- azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
- "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
+ azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip"
+ "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b";
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.0.0" "zip"
"sha256-h3nif64OgekSh4mjOSTbom8qDXVrIVNksbQ3LwILnx8=";
@@ -160,8 +162,8 @@ let
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip"
"059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx";
- azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "18.0.0" "zip"
- "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e";
+ azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "19.0.0" "zip"
+ "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879a";
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
"12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
@@ -175,8 +177,8 @@ let
azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip"
"8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998";
- azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "1.0.0" "zip"
- "08xp04mkl5ajwyr0l62c8bfb4n8p9s9fp6szynb2bdp6m2p3g2z0";
+ azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "3.0.0" "zip"
+ "sha256-/WV5vxXOg9CUT+NAnhpOG7f+QBGfUlTNVO26LTtuIoM=";
azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip"
"0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";
@@ -190,8 +192,8 @@ let
azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.12.0" "zip"
"187z0w5by7d9a2zsz3kidmzjw591akpc6dwhps4jyb4skcmyw86s";
- azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "3.0.0" "zip"
- "0iq04hvivq3fvg2lhax95gx0x35avk5hps42227z3qna5i2cznpn";
+ azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip"
+ "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6";
azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip"
"1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y";
@@ -199,23 +201,23 @@ let
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
- azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.14.0" "zip"
- "0f8m7j8sdm1rfrwizz3qfk4lyb2x02af3v66as5yqjriipk1bnbg";
+ azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.15.0" "zip"
+ "sha256-XpjDYGCad7RDsv5DHgM35ctwW08C0CBHkfmYX3zmiDY=";
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
- azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip"
- "18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh";
+ azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip"
+ "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f";
- azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.0.0" "zip"
- "3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199";
+ azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.1.0" "zip"
+ "f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab";
azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "0.1.0" "zip"
"sha256-baEkJcurDMYvJG5yZrTWev9r3QMey+UMdULC8rJECtQ=";
- azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip"
- "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm";
+ azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "3.0.0" "zip"
+ "sha256-iUR3VyXFJTYU0ldXbYQe5or6NPVwsFwJJKf3Px2yiiQ=";
azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip"
"0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6";
@@ -232,8 +234,8 @@ let
azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip"
"16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3";
- azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "2.0.0" "zip"
- "14v8ja8har2xrb00v98610pqvakcdvnzw8hkd6wbr1np3f3dxi8f";
+ azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "8.0.0" "zip"
+ "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e";
azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip"
"9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3";
@@ -241,14 +243,14 @@ let
azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip"
"09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5";
- azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.21.0" "zip"
- "0023q32z4vn94l5aqf7h6ld4ai12a703y7glnl02lls25qfs9xvv";
+ azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.26.0" "zip"
+ "sha256-tmsxhHt6mRWNOXDebckZSXt4L8+757NRKSDu6wVMqRE=";
azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip"
"1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm";
- azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.5.0" "zip"
- "0dr8xml9zlsnag761zx7ifvdkhsv4syzxpmdn4gbf9c5qcq65dsf";
+ azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.6.0" "zip"
+ "sha256-+By1KyIHdKq5P/zyW9wX4D/YS2kWg2ZAeJ+G+/Y2uYQ=";
azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip"
"c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4";
@@ -262,14 +264,14 @@ let
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip"
"2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d";
- azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.2.0" "zip"
- "10b8y1b5qlyr666x7yimnwis9386ciphrxdnmmyzk90qg6h0niry";
+ azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "7.0.0" "zip"
+ "sha256-6abJoZs5cbodve75bApaLDWUYzp1R6YOa/y4Azhk7jg=";
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc16" "zip"
"eT5gH0K4q2Qr1lEpuqjxQhOUrA6bEsAktj+PKsfMXTo=";
- azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip"
- "05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6";
+ azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip"
+ "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82";
azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip"
"1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r";
@@ -280,8 +282,8 @@ let
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip"
"0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m";
- azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "16.0.0" "zip"
- "2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5";
+ azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.0.0" "zip"
+ "c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc";
azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip"
"1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj";
@@ -289,11 +291,11 @@ let
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip"
"0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap";
- azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.0.0" "zip"
- "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8";
+ azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.2.0" "zip"
+ "sha256-Myxg3G0+OAk/bh4k5TOEGGJuyEBtYA2edNlbIXnWE4M=";
- azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.5.2" "tar.gz"
- "09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf";
+ azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.0" "tar.gz"
+ "sha256-2AWpGyle31IFf/qya3FBYJBUBr3V16Gj+T9s3D7ehBI=";
azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec {
version = "0.60.0";
@@ -371,12 +373,12 @@ let
});
azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs(oldAttrs: rec {
- version = "4.0.0b1";
+ version = "4.0.0b3";
src = super.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
extension = "zip";
- sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5";
+ sha256 = "sha256-d3tJWObM3plRurzfqWmHkn5CqVL9ekQfn9AeDc/KxLQ=";
};
});
@@ -415,6 +417,17 @@ let
'';
});
+ semver = super.semver.overridePythonAttrs(oldAttrs: rec {
+ version = "2.13.0";
+
+ src = super.fetchPypi {
+ inherit (oldAttrs) pname;
+ inherit version;
+ sha256 = "sha256-+g/ici7hw/V+rEeIIMOlri9iSvgmTL35AAyYD/f3Xj8=";
+ };
+ });
+
+
knack = super.knack.overridePythonAttrs(oldAttrs: rec {
version = "0.8.0rc2";
@@ -425,26 +438,6 @@ let
};
});
- msal = super.msal.overridePythonAttrs(oldAttrs: rec {
- version = "1.0.0";
-
- src = super.fetchPypi {
- inherit (oldAttrs) pname;
- inherit version;
- sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc";
- };
- });
-
- msal-extensions = super.msal-extensions.overridePythonAttrs(oldAttrs: rec {
- version = "0.1.3";
-
- src = super.fetchPypi {
- inherit (oldAttrs) pname;
- inherit version;
- sha256 = "1p05cbfksnhijx1il7s24js2ydzgxbpiasf607qdpb5sljlp3qar";
- };
- });
-
sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec {
name = "sshtunnel-${version}";
version = "0.1.5";
diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix
index bbf8d7eaeb1c..d91894f00063 100644
--- a/pkgs/tools/admin/chkcrontab/default.nix
+++ b/pkgs/tools/admin/chkcrontab/default.nix
@@ -1,6 +1,6 @@
-{ python, lib }:
+{ python3, lib }:
-with python.pkgs;
+with python3.pkgs;
buildPythonApplication rec {
pname = "chkcrontab";
diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index 1ab4795dd623..93b5433fcc0a 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clair";
- version = "4.0.3";
+ version = "4.0.4";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ztp3t55EOUQqTAEUZtHvHK8nTTVOAmYR9vN2hXLhpVw=";
+ sha256 = "sha256-KY9POvwmyUVx9jcn02Ltcz2a1ULqyKW73A9Peb6rpYE=";
};
- vendorSha256 = "sha256-+0jp/TvUjpeJJxEs2drVkUb/ua9qqqxome4M9TkpfP4=";
+ vendorSha256 = "sha256-+p3ucnvgOpSLS/uP9RAkWixCkaDoF64qCww013jPqSs=";
doCheck = false;
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index db6b1de456f7..e24f00224832 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.40.0";
+ version = "0.41.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "sha256-2kxJcQ0kzIbXUSecDR5CRlgp0y59wftFPUwU1MSHOn0=";
+ sha256 = "sha256-f4DkmIi4Uf4qJ3zkDWcpuN6nqXAwa91lj9Jd1MIskJ8=";
};
- vendorSha256 = "sha256-m+qldNgY3+DKTFjxwKo4Sbi0F7y4xomiIuR+apek61Q=";
+ vendorSha256 = "sha256-G6rOmI1Q+bMRqOrkByff2q1AtuUN4hBfFzYaFq4TsxY=";
doCheck = false;
diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix
new file mode 100644
index 000000000000..2c04eef21607
--- /dev/null
+++ b/pkgs/tools/admin/fioctl/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "fioctl";
+ version = "0.14.1";
+
+ src = fetchFromGitHub {
+ owner = "foundriesio";
+ repo = "fioctl";
+ rev = "v${version}";
+ sha256 = "1jbj2w2s78wcnrwyr80jyc11ipjysv5aab3486kphx8ysvvgcwfs";
+ };
+
+ vendorSha256 = "1a3x6cv18f0n01f4ac1kprzmby8dphygnwsdl98pmzs3gqqnh284";
+
+ runVend = true;
+
+ buildFlagsArray = ''
+ -ldflags=-s -w -X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev}
+ '';
+
+ meta = with lib; {
+ description = "A simple CLI to manage your Foundries Factory ";
+ homepage = "https://github.com/foundriesio/fioctl";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ nixinator matthewcroughan ];
+ };
+}
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 1d585514f7e0..1d70fa24fb5a 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
- sha256 = "sha256-aHFwcynt4xQ0T1J+OTSxgttU9W3VFJAqCwmQSdVg8Fk=";
+ sha256 = "09jhcv0ysq37k06b4rw3f9w33spvkkxx7fydraikm3zzvy28l58x";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
- sha256 = "sha256-MfldToK7ZfdWZiZnI1qKI1o/dSiUcysxzUkTYMVZ5u4=";
+ sha256 = "1971fz8cv69y7kvirgw9n0xr7z9b1yyh4y43mg10lvv3glx46xcy";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
- version = "328.0.0";
+ version = "332.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
@@ -81,7 +81,8 @@ in stdenv.mkDerivation rec {
# setup bash completion
mkdir -p $out/share/bash-completion/completions
- mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud.inc
+ mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud
+ ln -s $out/share/bash-completion/completions/gcloud $out/share/bash-completion/completions/gsutil
# This directory contains compiled mac binaries. We used crcmod from
# nixpkgs instead.
diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index afdbbbe9450b..1f86affa8c3b 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "procs";
- version = "0.11.3";
+ version = "0.11.4";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-OaHsNxrOrPlAwtFDY3Tnx+nOabax98xcGQeNds32iOA=";
+ sha256 = "sha256-jqcI0ne6fZkgr4bWJ0ysVNvB7q9ErYbsmZoXI38XUng=";
};
- cargoSha256 = "sha256-miOfm1Sw6tIICkT9T2V82cdGG2STo9vuLPWsAN/8wuM=";
+ cargoSha256 = "sha256-0s5MeWX+rXTyftwg6sReNMRgBzhUMIdHu5buKwg1Yi4=";
nativeBuildInputs = [ installShellFiles ];
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
done
'';
- buildInputs = lib.optional stdenv.isDarwin Security;
+ buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
meta = with lib; {
description = "A modern replacement for ps written in Rust";
diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index 6d8a068d48ba..5cb9eb241c60 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -1,20 +1,20 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
- version = "2.21.2";
+ version = "2.22.0";
pulumiPkgs = {
x86_64-linux = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v2.21.2-linux-x64.tar.gz";
- sha256 = "1zspkrfrrgkk8yhsa8lccky9as1v0nmz7wqxkfnx707nc986w5a3";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v2.22.0-linux-x64.tar.gz";
+ sha256 = "14czj8xc4l014bc1bgpf1rlw4qkf4q6nrw9f0b1xp5zrhvjiky1k";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.8.1-linux-amd64.tar.gz";
sha256 = "0yzz24fhkd1ij3gvsgi48czpm30lwbzdswsfir1mdq0a6wwhll4w";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.30.1-linux-amd64.tar.gz";
- sha256 = "1ml980mxhah193k4w75nvh7yzlc0j4k1sm9f51pvihxzmq5hjzgz";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.32.0-linux-amd64.tar.gz";
+ sha256 = "1pnh43asg2f8gs85i8y666f626q4vpsqj96ni10kpfalkby6b8fd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.13.1-linux-amd64.tar.gz";
@@ -91,16 +91,16 @@
];
x86_64-darwin = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v2.21.2-darwin-x64.tar.gz";
- sha256 = "0wijdxlhinjmn2rf7k02iwg1i14xd1v3cxvxssik56yk0mhkm42b";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v2.22.0-darwin-x64.tar.gz";
+ sha256 = "18qp2da7hnycbzhzy91kypybr08x969zszzm3lqrrawqapgx4ig5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.8.1-darwin-amd64.tar.gz";
sha256 = "00d66lmsd9ph7dpyrsdini8phlc197ssinfnkl3cj3j5v6hnzah1";
}
{
- url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.30.1-darwin-amd64.tar.gz";
- sha256 = "1p3rp2fq7lfqj03w1y8p21arvrvbbdwcd1nxnnqjnjwq3ahfvwnm";
+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.32.0-darwin-amd64.tar.gz";
+ sha256 = "166ca370fwnfq73pj3q6qw1gm2rf3g71p46nwqawi0cf3cxvf6ys";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.13.1-darwin-amd64.tar.gz";
diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh
index 061f3b1438ec..3fd8130a9a05 100755
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/pkgs/tools/admin/pulumi/update.sh
@@ -3,13 +3,13 @@
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
-VERSION="2.21.2"
+VERSION="2.22.0"
# Grab latest release ${VERSION} from
# https://github.com/pulumi/pulumi-${NAME}/releases
plugins=(
"auth0=1.8.1"
- "aws=3.30.1"
+ "aws=3.32.0"
"cloudflare=2.13.1"
"consul=2.8.1"
"datadog=2.16.1"
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 592f4cc76486..7df6e94e46bd 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -7,11 +7,11 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "salt";
- version = "3002.5";
+ version = "3002.6";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1bqranhanxcxjc1qcc6cm95f4xxag0ic9g61dq352hqh6m1l1ay8";
+ sha256 = "/8R4VpNj4dF7ajoMQh6q6cB5u+q8THcloiLQ+/kDoKU=";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -39,8 +39,8 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
meta = with lib; {
- homepage = "https://saltstack.com/";
- changelog = "https://docs.saltstack.com/en/latest/topics/releases/${version}.html";
+ homepage = "https://saltproject.io/";
+ changelog = "https://docs.saltproject.io/en/latest/topics/releases/${version}.html";
description = "Portable, distributed, remote execution and configuration management system";
maintainers = with maintainers; [ Flakebi ];
license = licenses.asl20;
diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix
index 3d91847a9a69..347a936c3a9d 100644
--- a/pkgs/tools/admin/stripe-cli/default.nix
+++ b/pkgs/tools/admin/stripe-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "stripe-cli";
- version = "1.5.9";
+ version = "1.5.10";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-fR4MFEytYZA4zt4WFGnEp9YDCtX6peQoI+NynqyReT8=";
+ sha256 = "sha256-cedreUdLjUONA8iVlQ/OfOJtM8EgCI8zaKDCbruUIVo=";
};
- vendorSha256 = "sha256-GQACtHTid1Aq5iSQqks10hmGS+VUlwNoM1LG+liynhU=";
+ vendorSha256 = "sha256-hYvW5xAbnxOEapFc70wOF9ybbDv7hLGljKqHI+1Itaw=";
subPackages = [
"cmd/stripe"
diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix
index df45e6f10b86..33d248ffde88 100644
--- a/pkgs/tools/admin/turbovnc/default.nix
+++ b/pkgs/tools/admin/turbovnc/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, nixosTests
# Dependencies
, cmake
@@ -21,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "turbovnc";
- version = "2.2.5";
+ version = "2.2.6";
src = fetchFromGitHub {
owner = "TurboVNC";
repo = "turbovnc";
rev = version;
- sha256 = "0r2lk5lza7a9h02g4z5j59d8qj0x1q1my665d1x1plny4g46vam0";
+ sha256 = "sha256-HSppHPBBkTf+88ZBaYG6JK4A/5lOBCxPFv6898TD7PE=";
};
# TODO:
@@ -101,6 +102,8 @@ stdenv.mkDerivation rec {
--prefix PATH : ${lib.makeBinPath [ openssh ]}
'';
+ passthru.tests.turbovnc-headless-server = nixosTests.turbovnc-headless-server;
+
meta = {
homepage = "https://turbovnc.org/";
license = lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix
new file mode 100644
index 000000000000..63e603353409
--- /dev/null
+++ b/pkgs/tools/archivers/7zz/default.nix
@@ -0,0 +1,47 @@
+{ lib, stdenv, fetchurl, autoPatchelfHook }:
+
+let platform = if stdenv.isi686 then "x86"
+ else if stdenv.isx86_64 then "x64"
+ else if stdenv.isAarch32 then "arm"
+ else if stdenv.isAarch64 then "arm64"
+ else throw "Unsupported architecture";
+
+ url = "https://7-zip.org/a/7z2101-linux-${platform}.tar.xz";
+
+ hashes = {
+ x86 = "0k6vg85ld8i2pcv5sv3xbvf3swqh9qj8hf2jcpadssys3yyidqyj";
+ x64 = "1yfanx98fizj8d2s87yxgsy30zydx7h5w9wf4wy3blgsp0vkbjb3";
+ arm = "04iah9vijm86r8rbkhxig86fx3lpag4xi7i3vq7gfrlwkymclhm1";
+ arm64 = "0a26ginpb22aydcyvffxpbi7lxh4sgs9gb6cj96qqx7cnf7bk2ri";
+ };
+ sha256 = hashes."${platform}";
+
+in stdenv.mkDerivation {
+ pname = "7zz";
+ version = "21.01";
+
+ src = fetchurl { inherit url sha256; };
+ sourceRoot = ".";
+
+ nativeBuildInputs = [ autoPatchelfHook ];
+ buildInputs = [ stdenv.cc.cc.lib ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+ install -D -t $out/bin 7zz
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Command line archiver utility";
+ homepage = "https://www.7-zip.org";
+
+ # source not released yet. will be under LGPL 2.1+ with RAR exception
+ license = licenses.unfree;
+
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
+ maintainers = with maintainers; [ anna328p ];
+ };
+}
diff --git a/pkgs/tools/archivers/rpm2targz/default.nix b/pkgs/tools/archivers/rpm2targz/default.nix
new file mode 100644
index 000000000000..1c4730c8de64
--- /dev/null
+++ b/pkgs/tools/archivers/rpm2targz/default.nix
@@ -0,0 +1,50 @@
+{ bzip2
+, coreutils
+, cpio
+, fetchurl
+, gnutar
+, gzip
+, lib
+, stdenv
+, xz
+, zstd
+}:
+
+stdenv.mkDerivation rec {
+ pname = "rpm2targz";
+ version = "2021.03.16";
+
+ # git repo: https://gitweb.gentoo.org/proj/rpm2targz.git/
+ src = fetchurl {
+ url = "https://dev.gentoo.org/~vapier/dist/${pname}-${version}.tar.xz";
+ hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ=";
+ };
+
+ postPatch = let
+ shdeps = [
+ bzip2
+ coreutils
+ cpio
+ gnutar
+ gzip
+ xz
+ zstd
+ ];
+ in ''
+ substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\""
+ # rpm2targz relies on the executable name
+ # to guess what compressor it should use
+ # this is more reliable than wrapProgram
+ sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz
+ '';
+
+ installFlags = [ "prefix=$(out)" ];
+
+ meta = with lib; {
+ description = "Convert a .rpm file to a .tar.gz archive";
+ homepage = "http://slackware.com/config/packages.php";
+ license = licenses.bsd1;
+ maintainers = with maintainers; [ zseri ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 7c9f9ac7d632..a7663bbd2315 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
};
- nativeBuildInputs = [ perl /* for pod2man */ ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ perl /* for pod2man */ unzip ];
preBuild = let
CPPFLAGS = with stdenv; ""
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 1ff204babc12..c2f214ea2a62 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
sourceRoot = ".";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildPhase = ''
g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index a3eedf3ea47e..ef47578ac578 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -73,7 +73,7 @@ let
};
pluginsWithoutDeps = [
- "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart"
+ "bareasc" "bench" "bpd" "bpm" "bucket" "duplicates" "edit" "embedart"
"export" "filefilter" "fish" "freedesktop" "fromfilename" "ftintitle" "fuzzy"
"hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs"
"mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "parentwork" "permissions" "play"
@@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec {
# unstable does not require bs1770gain[2].
# [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
# [2]: https://github.com/NixOS/nixpkgs/pull/90504
- version = "unstable-2021-03-08";
+ version = "unstable-2021-03-24";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
- rev = "debd382837ef1d30574c2234710d536bb299f979";
- sha256 = "sha256-I6ejW3f72fdzWoz7g4n8pDYz2NiHGrorLegUQhQOSiI=";
+ rev = "854b4ab48324afe8884fcd11fa47bd6258d2f4f7";
+ sha256 = "sha256-y5EWVNF4bd9fNvU6VkucMpenyFZuqdPkrqQDgG9ZPJY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix
new file mode 100644
index 000000000000..11f228ea6919
--- /dev/null
+++ b/pkgs/tools/audio/botamusique/default.nix
@@ -0,0 +1,150 @@
+{ pkgs
+, lib
+, stdenv
+, fetchFromGitHub
+, python3Packages
+, ffmpeg
+, makeWrapper
+
+# For the update script
+, coreutils
+, nix-prefetch-git
+, jq
+, nodePackages
+}:
+let
+ nodejs = pkgs.nodejs-12_x;
+ nodeEnv = import ../../../development/node-packages/node-env.nix {
+ inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+ inherit pkgs nodejs;
+ libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+ };
+ botamusiqueNodePackages = import ./node-packages.nix {
+ inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+ inherit nodeEnv;
+ };
+
+ srcJson = lib.importJSON ./src.json;
+ src = fetchFromGitHub {
+ owner = "azlux";
+ repo = "botamusique";
+ inherit (srcJson) rev sha256;
+ };
+
+ nodeDependencies = (botamusiqueNodePackages.shell.override (old: {
+ src = src + "/web";
+ })).nodeDependencies;
+
+ # Python needed to instantiate the html templates
+ buildPython = python3Packages.python.withPackages (ps: [ ps.jinja2 ]);
+in
+stdenv.mkDerivation rec {
+ pname = "botamusique";
+ version = "unstable-${lib.substring 0 10 srcJson.date}";
+
+ inherit src;
+
+ patches = [
+ # botamusique by default resolves relative state paths by first checking
+ # whether it exists in the working directory, then falls back to using the
+ # installation directory. With Nix however, the installation directory is
+ # not writable, so that won't work. So we change this so that it uses
+ # relative paths unconditionally, whether they exist or not.
+ ./unconditional-relative-state-paths.patch
+
+ # We can't update the package at runtime with NixOS, so this patch makes
+ # the !update command mention that
+ ./no-runtime-update.patch
+ ];
+
+ postPatch = ''
+ # However, the function that's patched above is also used for
+ # configuration.default.ini, which is in the installation directory
+ # after all. So we need to counter-patch it here so it can find it absolutely
+ substituteInPlace mumbleBot.py \
+ --replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini"
+ '';
+
+ nativeBuildInputs = [
+ python3Packages.wrapPython
+ nodejs
+ makeWrapper
+ ];
+
+ pythonPath = with python3Packages; [
+ pymumble
+ packaging
+ magic
+ requests
+ youtube-dl
+ flask
+ mutagen
+ pillow
+ pyradios
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ # Generates artifacts in ./static
+ (
+ cd web
+ ln -s ${nodeDependencies}/lib/node_modules ./node_modules
+ export PATH="${nodeDependencies}/bin:$PATH"
+
+ npm run build
+ )
+
+ # Fills out http templates
+ ${buildPython}/bin/python scripts/translate_templates.py --lang-dir lang/ --template-dir templates/
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share $out/bin
+ cp -r . $out/share/botamusique
+ chmod +x $out/share/botamusique/mumbleBot.py
+ wrapPythonProgramsIn $out/share/botamusique "$out $pythonPath"
+
+ # Convenience binary and wrap with ffmpeg dependency
+ makeWrapper $out/share/botamusique/mumbleBot.py $out/bin/botamusique \
+ --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
+
+ runHook postInstall
+ '';
+
+ passthru.updateScript = pkgs.writeShellScript "botamusique-updater" ''
+ export PATH=${lib.makeBinPath [ coreutils nix-prefetch-git jq nodePackages.node2nix ]}
+
+ nix-prefetch-git https://github.com/azlux/botamusique > ${toString ./src.json}
+ path=$(jq '.path' -r < ${toString ./src.json})
+
+ tmp=$(mktemp -d)
+ trap 'rm -rf "$tmp"' exit
+
+ # botamusique doesn't have a version in its package.json
+ # But that's needed for node2nix
+ jq < "$path"/web/package.json > "$tmp/package.json" \
+ --arg version "0.0.0" \
+ '.version |= $version'
+
+ node2nix \
+ --input "$tmp"/package.json \
+ --lock "$path"/web/package-lock.json \
+ --no-copy-node-env \
+ --development \
+ --composition /dev/null \
+ --output ${toString ./node-packages.nix}
+ '';
+
+ meta = with lib; {
+ description = "Bot to play youtube / soundcloud / radio / local music on Mumble";
+ homepage = "https://github.com/azlux/botamusique";
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ infinisil ];
+ };
+}
diff --git a/pkgs/tools/audio/botamusique/no-runtime-update.patch b/pkgs/tools/audio/botamusique/no-runtime-update.patch
new file mode 100644
index 000000000000..8fc8580fce83
--- /dev/null
+++ b/pkgs/tools/audio/botamusique/no-runtime-update.patch
@@ -0,0 +1,12 @@
+diff --git a/util.py b/util.py
+index bfec1ed..5147757 100644
+--- a/util.py
++++ b/util.py
+@@ -132,6 +132,7 @@ def check_update(current_version):
+
+
+ def update(current_version):
++ return "Can't update Nix installation at runtime"
+ global log
+
+ target = var.config.get('bot', 'target_version')
diff --git a/pkgs/tools/audio/botamusique/node-packages.nix b/pkgs/tools/audio/botamusique/node-packages.nix
new file mode 100644
index 000000000000..3f9e2dcdfd02
--- /dev/null
+++ b/pkgs/tools/audio/botamusique/node-packages.nix
@@ -0,0 +1,5247 @@
+# This file has been generated by node2nix 1.9.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+
+let
+ sources = {
+ "@babel/code-frame-7.10.4" = {
+ name = "_at_babel_slash_code-frame";
+ packageName = "@babel/code-frame";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";
+ sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
+ };
+ };
+ "@babel/compat-data-7.12.7" = {
+ name = "_at_babel_slash_compat-data";
+ packageName = "@babel/compat-data";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz";
+ sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
+ };
+ };
+ "@babel/core-7.12.9" = {
+ name = "_at_babel_slash_core";
+ packageName = "@babel/core";
+ version = "7.12.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz";
+ sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==";
+ };
+ };
+ "@babel/eslint-parser-7.12.1" = {
+ name = "_at_babel_slash_eslint-parser";
+ packageName = "@babel/eslint-parser";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.12.1.tgz";
+ sha512 = "cc7WQHnHQY3++/bghgbDtPx+5bf6xTsokyGzV6Qzh65NLz/unv+mPQuACkQ9GFhIhcTFv6yqwNaEcfX7EkOEsg==";
+ };
+ };
+ "@babel/eslint-plugin-7.12.1" = {
+ name = "_at_babel_slash_eslint-plugin";
+ packageName = "@babel/eslint-plugin";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.12.1.tgz";
+ sha512 = "rOjrD5yupTYCO4x0kEbQmi/NsaD+VGOD/9Cvso64WMVPY2y6o5Nvw2sqFWdeSEBdR1Dsa07YjplBs067x5YbXg==";
+ };
+ };
+ "@babel/generator-7.12.5" = {
+ name = "_at_babel_slash_generator";
+ packageName = "@babel/generator";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz";
+ sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==";
+ };
+ };
+ "@babel/helper-annotate-as-pure-7.10.4" = {
+ name = "_at_babel_slash_helper-annotate-as-pure";
+ packageName = "@babel/helper-annotate-as-pure";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz";
+ sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==";
+ };
+ };
+ "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = {
+ name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor";
+ packageName = "@babel/helper-builder-binary-assignment-operator-visitor";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz";
+ sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==";
+ };
+ };
+ "@babel/helper-compilation-targets-7.12.5" = {
+ name = "_at_babel_slash_helper-compilation-targets";
+ packageName = "@babel/helper-compilation-targets";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz";
+ sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==";
+ };
+ };
+ "@babel/helper-create-class-features-plugin-7.12.1" = {
+ name = "_at_babel_slash_helper-create-class-features-plugin";
+ packageName = "@babel/helper-create-class-features-plugin";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz";
+ sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==";
+ };
+ };
+ "@babel/helper-create-regexp-features-plugin-7.12.7" = {
+ name = "_at_babel_slash_helper-create-regexp-features-plugin";
+ packageName = "@babel/helper-create-regexp-features-plugin";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz";
+ sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==";
+ };
+ };
+ "@babel/helper-define-map-7.10.5" = {
+ name = "_at_babel_slash_helper-define-map";
+ packageName = "@babel/helper-define-map";
+ version = "7.10.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz";
+ sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==";
+ };
+ };
+ "@babel/helper-explode-assignable-expression-7.12.1" = {
+ name = "_at_babel_slash_helper-explode-assignable-expression";
+ packageName = "@babel/helper-explode-assignable-expression";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz";
+ sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==";
+ };
+ };
+ "@babel/helper-function-name-7.10.4" = {
+ name = "_at_babel_slash_helper-function-name";
+ packageName = "@babel/helper-function-name";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
+ sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
+ };
+ };
+ "@babel/helper-get-function-arity-7.10.4" = {
+ name = "_at_babel_slash_helper-get-function-arity";
+ packageName = "@babel/helper-get-function-arity";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
+ sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
+ };
+ };
+ "@babel/helper-hoist-variables-7.10.4" = {
+ name = "_at_babel_slash_helper-hoist-variables";
+ packageName = "@babel/helper-hoist-variables";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz";
+ sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==";
+ };
+ };
+ "@babel/helper-member-expression-to-functions-7.12.7" = {
+ name = "_at_babel_slash_helper-member-expression-to-functions";
+ packageName = "@babel/helper-member-expression-to-functions";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
+ sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==";
+ };
+ };
+ "@babel/helper-module-imports-7.12.5" = {
+ name = "_at_babel_slash_helper-module-imports";
+ packageName = "@babel/helper-module-imports";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
+ sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==";
+ };
+ };
+ "@babel/helper-module-transforms-7.12.1" = {
+ name = "_at_babel_slash_helper-module-transforms";
+ packageName = "@babel/helper-module-transforms";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
+ sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
+ };
+ };
+ "@babel/helper-optimise-call-expression-7.12.7" = {
+ name = "_at_babel_slash_helper-optimise-call-expression";
+ packageName = "@babel/helper-optimise-call-expression";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz";
+ sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==";
+ };
+ };
+ "@babel/helper-plugin-utils-7.10.4" = {
+ name = "_at_babel_slash_helper-plugin-utils";
+ packageName = "@babel/helper-plugin-utils";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz";
+ sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==";
+ };
+ };
+ "@babel/helper-remap-async-to-generator-7.12.1" = {
+ name = "_at_babel_slash_helper-remap-async-to-generator";
+ packageName = "@babel/helper-remap-async-to-generator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz";
+ sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
+ };
+ };
+ "@babel/helper-replace-supers-7.12.5" = {
+ name = "_at_babel_slash_helper-replace-supers";
+ packageName = "@babel/helper-replace-supers";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
+ sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==";
+ };
+ };
+ "@babel/helper-simple-access-7.12.1" = {
+ name = "_at_babel_slash_helper-simple-access";
+ packageName = "@babel/helper-simple-access";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
+ sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
+ };
+ };
+ "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = {
+ name = "_at_babel_slash_helper-skip-transparent-expression-wrappers";
+ packageName = "@babel/helper-skip-transparent-expression-wrappers";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz";
+ sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==";
+ };
+ };
+ "@babel/helper-split-export-declaration-7.11.0" = {
+ name = "_at_babel_slash_helper-split-export-declaration";
+ packageName = "@babel/helper-split-export-declaration";
+ version = "7.11.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
+ sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
+ };
+ };
+ "@babel/helper-validator-identifier-7.10.4" = {
+ name = "_at_babel_slash_helper-validator-identifier";
+ packageName = "@babel/helper-validator-identifier";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
+ sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
+ };
+ };
+ "@babel/helper-validator-option-7.12.1" = {
+ name = "_at_babel_slash_helper-validator-option";
+ packageName = "@babel/helper-validator-option";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz";
+ sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==";
+ };
+ };
+ "@babel/helper-wrap-function-7.12.3" = {
+ name = "_at_babel_slash_helper-wrap-function";
+ packageName = "@babel/helper-wrap-function";
+ version = "7.12.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz";
+ sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==";
+ };
+ };
+ "@babel/helpers-7.12.5" = {
+ name = "_at_babel_slash_helpers";
+ packageName = "@babel/helpers";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz";
+ sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==";
+ };
+ };
+ "@babel/highlight-7.10.4" = {
+ name = "_at_babel_slash_highlight";
+ packageName = "@babel/highlight";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz";
+ sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
+ };
+ };
+ "@babel/parser-7.12.7" = {
+ name = "_at_babel_slash_parser";
+ packageName = "@babel/parser";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz";
+ sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==";
+ };
+ };
+ "@babel/plugin-proposal-async-generator-functions-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-async-generator-functions";
+ packageName = "@babel/plugin-proposal-async-generator-functions";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz";
+ sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==";
+ };
+ };
+ "@babel/plugin-proposal-class-properties-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-class-properties";
+ packageName = "@babel/plugin-proposal-class-properties";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz";
+ sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==";
+ };
+ };
+ "@babel/plugin-proposal-dynamic-import-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-dynamic-import";
+ packageName = "@babel/plugin-proposal-dynamic-import";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz";
+ sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==";
+ };
+ };
+ "@babel/plugin-proposal-export-namespace-from-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-export-namespace-from";
+ packageName = "@babel/plugin-proposal-export-namespace-from";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz";
+ sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==";
+ };
+ };
+ "@babel/plugin-proposal-json-strings-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-json-strings";
+ packageName = "@babel/plugin-proposal-json-strings";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz";
+ sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==";
+ };
+ };
+ "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-logical-assignment-operators";
+ packageName = "@babel/plugin-proposal-logical-assignment-operators";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz";
+ sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==";
+ };
+ };
+ "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator";
+ packageName = "@babel/plugin-proposal-nullish-coalescing-operator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz";
+ sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
+ };
+ };
+ "@babel/plugin-proposal-numeric-separator-7.12.7" = {
+ name = "_at_babel_slash_plugin-proposal-numeric-separator";
+ packageName = "@babel/plugin-proposal-numeric-separator";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz";
+ sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==";
+ };
+ };
+ "@babel/plugin-proposal-object-rest-spread-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-object-rest-spread";
+ packageName = "@babel/plugin-proposal-object-rest-spread";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz";
+ sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==";
+ };
+ };
+ "@babel/plugin-proposal-optional-catch-binding-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-optional-catch-binding";
+ packageName = "@babel/plugin-proposal-optional-catch-binding";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz";
+ sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==";
+ };
+ };
+ "@babel/plugin-proposal-optional-chaining-7.12.7" = {
+ name = "_at_babel_slash_plugin-proposal-optional-chaining";
+ packageName = "@babel/plugin-proposal-optional-chaining";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz";
+ sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==";
+ };
+ };
+ "@babel/plugin-proposal-private-methods-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-private-methods";
+ packageName = "@babel/plugin-proposal-private-methods";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz";
+ sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==";
+ };
+ };
+ "@babel/plugin-proposal-unicode-property-regex-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-unicode-property-regex";
+ packageName = "@babel/plugin-proposal-unicode-property-regex";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz";
+ sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==";
+ };
+ };
+ "@babel/plugin-syntax-async-generators-7.8.4" = {
+ name = "_at_babel_slash_plugin-syntax-async-generators";
+ packageName = "@babel/plugin-syntax-async-generators";
+ version = "7.8.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz";
+ sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==";
+ };
+ };
+ "@babel/plugin-syntax-class-properties-7.12.1" = {
+ name = "_at_babel_slash_plugin-syntax-class-properties";
+ packageName = "@babel/plugin-syntax-class-properties";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz";
+ sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==";
+ };
+ };
+ "@babel/plugin-syntax-dynamic-import-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-dynamic-import";
+ packageName = "@babel/plugin-syntax-dynamic-import";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz";
+ sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==";
+ };
+ };
+ "@babel/plugin-syntax-export-namespace-from-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-export-namespace-from";
+ packageName = "@babel/plugin-syntax-export-namespace-from";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz";
+ sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==";
+ };
+ };
+ "@babel/plugin-syntax-json-strings-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-json-strings";
+ packageName = "@babel/plugin-syntax-json-strings";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz";
+ sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==";
+ };
+ };
+ "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = {
+ name = "_at_babel_slash_plugin-syntax-logical-assignment-operators";
+ packageName = "@babel/plugin-syntax-logical-assignment-operators";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz";
+ sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==";
+ };
+ };
+ "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator";
+ packageName = "@babel/plugin-syntax-nullish-coalescing-operator";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz";
+ sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==";
+ };
+ };
+ "@babel/plugin-syntax-numeric-separator-7.10.4" = {
+ name = "_at_babel_slash_plugin-syntax-numeric-separator";
+ packageName = "@babel/plugin-syntax-numeric-separator";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz";
+ sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==";
+ };
+ };
+ "@babel/plugin-syntax-object-rest-spread-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-object-rest-spread";
+ packageName = "@babel/plugin-syntax-object-rest-spread";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz";
+ sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==";
+ };
+ };
+ "@babel/plugin-syntax-optional-catch-binding-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-optional-catch-binding";
+ packageName = "@babel/plugin-syntax-optional-catch-binding";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz";
+ sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==";
+ };
+ };
+ "@babel/plugin-syntax-optional-chaining-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-optional-chaining";
+ packageName = "@babel/plugin-syntax-optional-chaining";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz";
+ sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==";
+ };
+ };
+ "@babel/plugin-syntax-top-level-await-7.12.1" = {
+ name = "_at_babel_slash_plugin-syntax-top-level-await";
+ packageName = "@babel/plugin-syntax-top-level-await";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz";
+ sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==";
+ };
+ };
+ "@babel/plugin-transform-arrow-functions-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-arrow-functions";
+ packageName = "@babel/plugin-transform-arrow-functions";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz";
+ sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==";
+ };
+ };
+ "@babel/plugin-transform-async-to-generator-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-async-to-generator";
+ packageName = "@babel/plugin-transform-async-to-generator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz";
+ sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==";
+ };
+ };
+ "@babel/plugin-transform-block-scoped-functions-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-block-scoped-functions";
+ packageName = "@babel/plugin-transform-block-scoped-functions";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz";
+ sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==";
+ };
+ };
+ "@babel/plugin-transform-block-scoping-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-block-scoping";
+ packageName = "@babel/plugin-transform-block-scoping";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz";
+ sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==";
+ };
+ };
+ "@babel/plugin-transform-classes-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-classes";
+ packageName = "@babel/plugin-transform-classes";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz";
+ sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==";
+ };
+ };
+ "@babel/plugin-transform-computed-properties-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-computed-properties";
+ packageName = "@babel/plugin-transform-computed-properties";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz";
+ sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==";
+ };
+ };
+ "@babel/plugin-transform-destructuring-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-destructuring";
+ packageName = "@babel/plugin-transform-destructuring";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz";
+ sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==";
+ };
+ };
+ "@babel/plugin-transform-dotall-regex-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-dotall-regex";
+ packageName = "@babel/plugin-transform-dotall-regex";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz";
+ sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==";
+ };
+ };
+ "@babel/plugin-transform-duplicate-keys-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-duplicate-keys";
+ packageName = "@babel/plugin-transform-duplicate-keys";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz";
+ sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==";
+ };
+ };
+ "@babel/plugin-transform-exponentiation-operator-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-exponentiation-operator";
+ packageName = "@babel/plugin-transform-exponentiation-operator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz";
+ sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==";
+ };
+ };
+ "@babel/plugin-transform-for-of-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-for-of";
+ packageName = "@babel/plugin-transform-for-of";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz";
+ sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==";
+ };
+ };
+ "@babel/plugin-transform-function-name-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-function-name";
+ packageName = "@babel/plugin-transform-function-name";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz";
+ sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==";
+ };
+ };
+ "@babel/plugin-transform-literals-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-literals";
+ packageName = "@babel/plugin-transform-literals";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz";
+ sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==";
+ };
+ };
+ "@babel/plugin-transform-member-expression-literals-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-member-expression-literals";
+ packageName = "@babel/plugin-transform-member-expression-literals";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz";
+ sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==";
+ };
+ };
+ "@babel/plugin-transform-modules-amd-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-modules-amd";
+ packageName = "@babel/plugin-transform-modules-amd";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz";
+ sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==";
+ };
+ };
+ "@babel/plugin-transform-modules-commonjs-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-modules-commonjs";
+ packageName = "@babel/plugin-transform-modules-commonjs";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz";
+ sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==";
+ };
+ };
+ "@babel/plugin-transform-modules-systemjs-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-modules-systemjs";
+ packageName = "@babel/plugin-transform-modules-systemjs";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz";
+ sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==";
+ };
+ };
+ "@babel/plugin-transform-modules-umd-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-modules-umd";
+ packageName = "@babel/plugin-transform-modules-umd";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz";
+ sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==";
+ };
+ };
+ "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex";
+ packageName = "@babel/plugin-transform-named-capturing-groups-regex";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz";
+ sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==";
+ };
+ };
+ "@babel/plugin-transform-new-target-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-new-target";
+ packageName = "@babel/plugin-transform-new-target";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz";
+ sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==";
+ };
+ };
+ "@babel/plugin-transform-object-super-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-object-super";
+ packageName = "@babel/plugin-transform-object-super";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz";
+ sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==";
+ };
+ };
+ "@babel/plugin-transform-parameters-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-parameters";
+ packageName = "@babel/plugin-transform-parameters";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz";
+ sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==";
+ };
+ };
+ "@babel/plugin-transform-property-literals-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-property-literals";
+ packageName = "@babel/plugin-transform-property-literals";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz";
+ sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==";
+ };
+ };
+ "@babel/plugin-transform-regenerator-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-regenerator";
+ packageName = "@babel/plugin-transform-regenerator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz";
+ sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==";
+ };
+ };
+ "@babel/plugin-transform-reserved-words-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-reserved-words";
+ packageName = "@babel/plugin-transform-reserved-words";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz";
+ sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==";
+ };
+ };
+ "@babel/plugin-transform-shorthand-properties-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-shorthand-properties";
+ packageName = "@babel/plugin-transform-shorthand-properties";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz";
+ sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==";
+ };
+ };
+ "@babel/plugin-transform-spread-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-spread";
+ packageName = "@babel/plugin-transform-spread";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz";
+ sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==";
+ };
+ };
+ "@babel/plugin-transform-sticky-regex-7.12.7" = {
+ name = "_at_babel_slash_plugin-transform-sticky-regex";
+ packageName = "@babel/plugin-transform-sticky-regex";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz";
+ sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==";
+ };
+ };
+ "@babel/plugin-transform-template-literals-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-template-literals";
+ packageName = "@babel/plugin-transform-template-literals";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz";
+ sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==";
+ };
+ };
+ "@babel/plugin-transform-typeof-symbol-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-typeof-symbol";
+ packageName = "@babel/plugin-transform-typeof-symbol";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz";
+ sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==";
+ };
+ };
+ "@babel/plugin-transform-unicode-escapes-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-unicode-escapes";
+ packageName = "@babel/plugin-transform-unicode-escapes";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz";
+ sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==";
+ };
+ };
+ "@babel/plugin-transform-unicode-regex-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-unicode-regex";
+ packageName = "@babel/plugin-transform-unicode-regex";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz";
+ sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
+ };
+ };
+ "@babel/preset-env-7.12.7" = {
+ name = "_at_babel_slash_preset-env";
+ packageName = "@babel/preset-env";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz";
+ sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==";
+ };
+ };
+ "@babel/preset-modules-0.1.4" = {
+ name = "_at_babel_slash_preset-modules";
+ packageName = "@babel/preset-modules";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz";
+ sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==";
+ };
+ };
+ "@babel/runtime-7.12.5" = {
+ name = "_at_babel_slash_runtime";
+ packageName = "@babel/runtime";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz";
+ sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
+ };
+ };
+ "@babel/template-7.12.7" = {
+ name = "_at_babel_slash_template";
+ packageName = "@babel/template";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz";
+ sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
+ };
+ };
+ "@babel/traverse-7.12.9" = {
+ name = "_at_babel_slash_traverse";
+ packageName = "@babel/traverse";
+ version = "7.12.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz";
+ sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==";
+ };
+ };
+ "@babel/types-7.12.7" = {
+ name = "_at_babel_slash_types";
+ packageName = "@babel/types";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz";
+ sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==";
+ };
+ };
+ "@eslint/eslintrc-0.2.1" = {
+ name = "_at_eslint_slash_eslintrc";
+ packageName = "@eslint/eslintrc";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz";
+ sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==";
+ };
+ };
+ "@fortawesome/fontawesome-common-types-0.2.32" = {
+ name = "_at_fortawesome_slash_fontawesome-common-types";
+ packageName = "@fortawesome/fontawesome-common-types";
+ version = "0.2.32";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz";
+ sha512 = "ux2EDjKMpcdHBVLi/eWZynnPxs0BtFVXJkgHIxXRl+9ZFaHPvYamAfCzeeQFqHRjuJtX90wVnMRaMQAAlctz3w==";
+ };
+ };
+ "@fortawesome/fontawesome-svg-core-1.2.32" = {
+ name = "_at_fortawesome_slash_fontawesome-svg-core";
+ packageName = "@fortawesome/fontawesome-svg-core";
+ version = "1.2.32";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz";
+ sha512 = "XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ==";
+ };
+ };
+ "@fortawesome/free-regular-svg-icons-5.15.1" = {
+ name = "_at_fortawesome_slash_free-regular-svg-icons";
+ packageName = "@fortawesome/free-regular-svg-icons";
+ version = "5.15.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.1.tgz";
+ sha512 = "eD9NWFy89e7SVVtrLedJUxIpCBGhd4x7s7dhesokjyo1Tw62daqN5UcuAGu1NrepLLq1IeAYUVfWwnOjZ/j3HA==";
+ };
+ };
+ "@fortawesome/free-solid-svg-icons-5.15.1" = {
+ name = "_at_fortawesome_slash_free-solid-svg-icons";
+ packageName = "@fortawesome/free-solid-svg-icons";
+ version = "5.15.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz";
+ sha512 = "EFMuKtzRMNbvjab/SvJBaOOpaqJfdSap/Nl6hst7CgrJxwfORR1drdTV6q1Ib/JVzq4xObdTDcT6sqTaXMqfdg==";
+ };
+ };
+ "@types/anymatch-1.3.1" = {
+ name = "_at_types_slash_anymatch";
+ packageName = "@types/anymatch";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz";
+ sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==";
+ };
+ };
+ "@types/eslint-7.2.5" = {
+ name = "_at_types_slash_eslint";
+ packageName = "@types/eslint";
+ version = "7.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.5.tgz";
+ sha512 = "Dc6ar9x16BdaR3NSxSF7T4IjL9gxxViJq8RmFd+2UAyA+K6ck2W+gUwfgpG/y9TPyUuBL35109bbULpEynvltA==";
+ };
+ };
+ "@types/eslint-scope-3.7.0" = {
+ name = "_at_types_slash_eslint-scope";
+ packageName = "@types/eslint-scope";
+ version = "3.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz";
+ sha512 = "O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==";
+ };
+ };
+ "@types/estree-0.0.45" = {
+ name = "_at_types_slash_estree";
+ packageName = "@types/estree";
+ version = "0.0.45";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz";
+ sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==";
+ };
+ };
+ "@types/html-minifier-terser-5.1.1" = {
+ name = "_at_types_slash_html-minifier-terser";
+ packageName = "@types/html-minifier-terser";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz";
+ sha512 = "giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==";
+ };
+ };
+ "@types/json-schema-7.0.6" = {
+ name = "_at_types_slash_json-schema";
+ packageName = "@types/json-schema";
+ version = "7.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz";
+ sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==";
+ };
+ };
+ "@types/json5-0.0.29" = {
+ name = "_at_types_slash_json5";
+ packageName = "@types/json5";
+ version = "0.0.29";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz";
+ sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee";
+ };
+ };
+ "@types/node-14.14.9" = {
+ name = "_at_types_slash_node";
+ packageName = "@types/node";
+ version = "14.14.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/node/-/node-14.14.9.tgz";
+ sha512 = "JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw==";
+ };
+ };
+ "@types/parse-json-4.0.0" = {
+ name = "_at_types_slash_parse-json";
+ packageName = "@types/parse-json";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz";
+ sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==";
+ };
+ };
+ "@types/source-list-map-0.1.2" = {
+ name = "_at_types_slash_source-list-map";
+ packageName = "@types/source-list-map";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz";
+ sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==";
+ };
+ };
+ "@types/tapable-1.0.6" = {
+ name = "_at_types_slash_tapable";
+ packageName = "@types/tapable";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz";
+ sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==";
+ };
+ };
+ "@types/uglify-js-3.11.1" = {
+ name = "_at_types_slash_uglify-js";
+ packageName = "@types/uglify-js";
+ version = "3.11.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz";
+ sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==";
+ };
+ };
+ "@types/webpack-4.41.25" = {
+ name = "_at_types_slash_webpack";
+ packageName = "@types/webpack";
+ version = "4.41.25";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz";
+ sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==";
+ };
+ };
+ "@types/webpack-sources-2.0.0" = {
+ name = "_at_types_slash_webpack-sources";
+ packageName = "@types/webpack-sources";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz";
+ sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==";
+ };
+ };
+ "@webassemblyjs/ast-1.9.0" = {
+ name = "_at_webassemblyjs_slash_ast";
+ packageName = "@webassemblyjs/ast";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz";
+ sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==";
+ };
+ };
+ "@webassemblyjs/floating-point-hex-parser-1.9.0" = {
+ name = "_at_webassemblyjs_slash_floating-point-hex-parser";
+ packageName = "@webassemblyjs/floating-point-hex-parser";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz";
+ sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==";
+ };
+ };
+ "@webassemblyjs/helper-api-error-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-api-error";
+ packageName = "@webassemblyjs/helper-api-error";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz";
+ sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==";
+ };
+ };
+ "@webassemblyjs/helper-buffer-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-buffer";
+ packageName = "@webassemblyjs/helper-buffer";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz";
+ sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==";
+ };
+ };
+ "@webassemblyjs/helper-code-frame-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-code-frame";
+ packageName = "@webassemblyjs/helper-code-frame";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz";
+ sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==";
+ };
+ };
+ "@webassemblyjs/helper-fsm-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-fsm";
+ packageName = "@webassemblyjs/helper-fsm";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz";
+ sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==";
+ };
+ };
+ "@webassemblyjs/helper-module-context-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-module-context";
+ packageName = "@webassemblyjs/helper-module-context";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz";
+ sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==";
+ };
+ };
+ "@webassemblyjs/helper-wasm-bytecode-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
+ packageName = "@webassemblyjs/helper-wasm-bytecode";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz";
+ sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==";
+ };
+ };
+ "@webassemblyjs/helper-wasm-section-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-wasm-section";
+ packageName = "@webassemblyjs/helper-wasm-section";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz";
+ sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==";
+ };
+ };
+ "@webassemblyjs/ieee754-1.9.0" = {
+ name = "_at_webassemblyjs_slash_ieee754";
+ packageName = "@webassemblyjs/ieee754";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz";
+ sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==";
+ };
+ };
+ "@webassemblyjs/leb128-1.9.0" = {
+ name = "_at_webassemblyjs_slash_leb128";
+ packageName = "@webassemblyjs/leb128";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz";
+ sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==";
+ };
+ };
+ "@webassemblyjs/utf8-1.9.0" = {
+ name = "_at_webassemblyjs_slash_utf8";
+ packageName = "@webassemblyjs/utf8";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz";
+ sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==";
+ };
+ };
+ "@webassemblyjs/wasm-edit-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wasm-edit";
+ packageName = "@webassemblyjs/wasm-edit";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz";
+ sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==";
+ };
+ };
+ "@webassemblyjs/wasm-gen-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wasm-gen";
+ packageName = "@webassemblyjs/wasm-gen";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz";
+ sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==";
+ };
+ };
+ "@webassemblyjs/wasm-opt-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wasm-opt";
+ packageName = "@webassemblyjs/wasm-opt";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz";
+ sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==";
+ };
+ };
+ "@webassemblyjs/wasm-parser-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wasm-parser";
+ packageName = "@webassemblyjs/wasm-parser";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz";
+ sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==";
+ };
+ };
+ "@webassemblyjs/wast-parser-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wast-parser";
+ packageName = "@webassemblyjs/wast-parser";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz";
+ sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==";
+ };
+ };
+ "@webassemblyjs/wast-printer-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wast-printer";
+ packageName = "@webassemblyjs/wast-printer";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz";
+ sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==";
+ };
+ };
+ "@webpack-cli/info-1.1.0" = {
+ name = "_at_webpack-cli_slash_info";
+ packageName = "@webpack-cli/info";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.1.0.tgz";
+ sha512 = "uNWSdaYHc+f3LdIZNwhdhkjjLDDl3jP2+XBqAq9H8DjrJUvlOKdP8TNruy1yEaDfgpAIgbSAN7pye4FEHg9tYQ==";
+ };
+ };
+ "@webpack-cli/serve-1.1.0" = {
+ name = "_at_webpack-cli_slash_serve";
+ packageName = "@webpack-cli/serve";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.1.0.tgz";
+ sha512 = "7RfnMXCpJ/NThrhq4gYQYILB18xWyoQcBey81oIyVbmgbc6m5ZHHyFK+DyH7pLHJf0p14MxL4mTsoPAgBSTpIg==";
+ };
+ };
+ "@xtuc/ieee754-1.2.0" = {
+ name = "_at_xtuc_slash_ieee754";
+ packageName = "@xtuc/ieee754";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz";
+ sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==";
+ };
+ };
+ "@xtuc/long-4.2.2" = {
+ name = "_at_xtuc_slash_long";
+ packageName = "@xtuc/long";
+ version = "4.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz";
+ sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==";
+ };
+ };
+ "acorn-7.4.1" = {
+ name = "acorn";
+ packageName = "acorn";
+ version = "7.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz";
+ sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
+ };
+ };
+ "acorn-8.0.4" = {
+ name = "acorn";
+ packageName = "acorn";
+ version = "8.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-8.0.4.tgz";
+ sha512 = "XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ==";
+ };
+ };
+ "acorn-jsx-5.3.1" = {
+ name = "acorn-jsx";
+ packageName = "acorn-jsx";
+ version = "5.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz";
+ sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==";
+ };
+ };
+ "ajv-6.12.6" = {
+ name = "ajv";
+ packageName = "ajv";
+ version = "6.12.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
+ sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
+ };
+ };
+ "ajv-keywords-3.5.2" = {
+ name = "ajv-keywords";
+ packageName = "ajv-keywords";
+ version = "3.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz";
+ sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==";
+ };
+ };
+ "ansi-colors-4.1.1" = {
+ name = "ansi-colors";
+ packageName = "ansi-colors";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz";
+ sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==";
+ };
+ };
+ "ansi-regex-2.1.1" = {
+ name = "ansi-regex";
+ packageName = "ansi-regex";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+ sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+ };
+ };
+ "ansi-regex-4.1.0" = {
+ name = "ansi-regex";
+ packageName = "ansi-regex";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
+ sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+ };
+ };
+ "ansi-regex-5.0.0" = {
+ name = "ansi-regex";
+ packageName = "ansi-regex";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz";
+ sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==";
+ };
+ };
+ "ansi-styles-3.2.1" = {
+ name = "ansi-styles";
+ packageName = "ansi-styles";
+ version = "3.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
+ sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+ };
+ };
+ "ansi-styles-4.3.0" = {
+ name = "ansi-styles";
+ packageName = "ansi-styles";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
+ sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
+ };
+ };
+ "anymatch-3.1.1" = {
+ name = "anymatch";
+ packageName = "anymatch";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz";
+ sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==";
+ };
+ };
+ "argparse-1.0.10" = {
+ name = "argparse";
+ packageName = "argparse";
+ version = "1.0.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
+ sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
+ };
+ };
+ "array-back-4.0.1" = {
+ name = "array-back";
+ packageName = "array-back";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz";
+ sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg==";
+ };
+ };
+ "array-includes-3.1.2" = {
+ name = "array-includes";
+ packageName = "array-includes";
+ version = "3.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz";
+ sha512 = "w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==";
+ };
+ };
+ "array.prototype.flat-1.2.4" = {
+ name = "array.prototype.flat";
+ packageName = "array.prototype.flat";
+ version = "1.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz";
+ sha512 = "4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==";
+ };
+ };
+ "astral-regex-1.0.0" = {
+ name = "astral-regex";
+ packageName = "astral-regex";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
+ sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
+ };
+ };
+ "autoprefixer-10.0.2" = {
+ name = "autoprefixer";
+ packageName = "autoprefixer";
+ version = "10.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.2.tgz";
+ sha512 = "okBmu9OMdt6DNEcZmnl0IYVv8Xl/xYWRSnc2OJ9UJEOt1u30opG1B8aLsViqKryBaYv1SKB4f85fOGZs5zYxHQ==";
+ };
+ };
+ "babel-loader-8.2.1" = {
+ name = "babel-loader";
+ packageName = "babel-loader";
+ version = "8.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz";
+ sha512 = "dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==";
+ };
+ };
+ "babel-plugin-dynamic-import-node-2.3.3" = {
+ name = "babel-plugin-dynamic-import-node";
+ packageName = "babel-plugin-dynamic-import-node";
+ version = "2.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz";
+ sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==";
+ };
+ };
+ "balanced-match-1.0.0" = {
+ name = "balanced-match";
+ packageName = "balanced-match";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+ sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+ };
+ };
+ "big.js-5.2.2" = {
+ name = "big.js";
+ packageName = "big.js";
+ version = "5.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz";
+ sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
+ };
+ };
+ "binary-extensions-2.1.0" = {
+ name = "binary-extensions";
+ packageName = "binary-extensions";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz";
+ sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==";
+ };
+ };
+ "boolbase-1.0.0" = {
+ name = "boolbase";
+ packageName = "boolbase";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
+ sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
+ };
+ };
+ "bootstrap-4.5.3" = {
+ name = "bootstrap";
+ packageName = "bootstrap";
+ version = "4.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.3.tgz";
+ sha512 = "o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==";
+ };
+ };
+ "bootswatch-4.5.3" = {
+ name = "bootswatch";
+ packageName = "bootswatch";
+ version = "4.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bootswatch/-/bootswatch-4.5.3.tgz";
+ sha512 = "gaB3gBSAegmYbk97aVELKcSKVdPjWsSY4yCITkUt/SqbqjtMU/HtIUszb4O9vzdbrfuVXThc/qCXzjoJaAPgiQ==";
+ };
+ };
+ "brace-expansion-1.1.11" = {
+ name = "brace-expansion";
+ packageName = "brace-expansion";
+ version = "1.1.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+ sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+ };
+ };
+ "braces-3.0.2" = {
+ name = "braces";
+ packageName = "braces";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
+ sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
+ };
+ };
+ "browserslist-4.14.7" = {
+ name = "browserslist";
+ packageName = "browserslist";
+ version = "4.14.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz";
+ sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==";
+ };
+ };
+ "buffer-from-1.1.1" = {
+ name = "buffer-from";
+ packageName = "buffer-from";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
+ sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+ };
+ };
+ "call-bind-1.0.0" = {
+ name = "call-bind";
+ packageName = "call-bind";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz";
+ sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==";
+ };
+ };
+ "callsites-3.1.0" = {
+ name = "callsites";
+ packageName = "callsites";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz";
+ sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
+ };
+ };
+ "camel-case-4.1.1" = {
+ name = "camel-case";
+ packageName = "camel-case";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz";
+ sha512 = "7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==";
+ };
+ };
+ "camelcase-6.2.0" = {
+ name = "camelcase";
+ packageName = "camelcase";
+ version = "6.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz";
+ sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
+ };
+ };
+ "caniuse-lite-1.0.30001161" = {
+ name = "caniuse-lite";
+ packageName = "caniuse-lite";
+ version = "1.0.30001161";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz";
+ sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g==";
+ };
+ };
+ "chalk-2.4.2" = {
+ name = "chalk";
+ packageName = "chalk";
+ version = "2.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
+ sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
+ };
+ };
+ "chalk-4.1.0" = {
+ name = "chalk";
+ packageName = "chalk";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz";
+ sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==";
+ };
+ };
+ "chokidar-3.4.3" = {
+ name = "chokidar";
+ packageName = "chokidar";
+ version = "3.4.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz";
+ sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
+ };
+ };
+ "chrome-trace-event-1.0.2" = {
+ name = "chrome-trace-event";
+ packageName = "chrome-trace-event";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz";
+ sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==";
+ };
+ };
+ "clean-css-4.2.3" = {
+ name = "clean-css";
+ packageName = "clean-css";
+ version = "4.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz";
+ sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==";
+ };
+ };
+ "color-convert-1.9.3" = {
+ name = "color-convert";
+ packageName = "color-convert";
+ version = "1.9.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
+ sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
+ };
+ };
+ "color-convert-2.0.1" = {
+ name = "color-convert";
+ packageName = "color-convert";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz";
+ sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==";
+ };
+ };
+ "color-name-1.1.3" = {
+ name = "color-name";
+ packageName = "color-name";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
+ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+ };
+ };
+ "color-name-1.1.4" = {
+ name = "color-name";
+ packageName = "color-name";
+ version = "1.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz";
+ sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
+ };
+ };
+ "colorette-1.2.1" = {
+ name = "colorette";
+ packageName = "colorette";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz";
+ sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==";
+ };
+ };
+ "command-line-usage-6.1.1" = {
+ name = "command-line-usage";
+ packageName = "command-line-usage";
+ version = "6.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz";
+ sha512 = "F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA==";
+ };
+ };
+ "commander-2.20.3" = {
+ name = "commander";
+ packageName = "commander";
+ version = "2.20.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
+ sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
+ };
+ };
+ "commander-4.1.1" = {
+ name = "commander";
+ packageName = "commander";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz";
+ sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==";
+ };
+ };
+ "commander-6.2.0" = {
+ name = "commander";
+ packageName = "commander";
+ version = "6.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz";
+ sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==";
+ };
+ };
+ "comment-parser-0.7.6" = {
+ name = "comment-parser";
+ packageName = "comment-parser";
+ version = "0.7.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz";
+ sha512 = "GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==";
+ };
+ };
+ "commondir-1.0.1" = {
+ name = "commondir";
+ packageName = "commondir";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz";
+ sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b";
+ };
+ };
+ "concat-map-0.0.1" = {
+ name = "concat-map";
+ packageName = "concat-map";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+ sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+ };
+ };
+ "contains-path-0.1.0" = {
+ name = "contains-path";
+ packageName = "contains-path";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz";
+ sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a";
+ };
+ };
+ "convert-source-map-1.7.0" = {
+ name = "convert-source-map";
+ packageName = "convert-source-map";
+ version = "1.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz";
+ sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==";
+ };
+ };
+ "core-js-3.7.0" = {
+ name = "core-js";
+ packageName = "core-js";
+ version = "3.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz";
+ sha512 = "NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==";
+ };
+ };
+ "core-js-compat-3.7.0" = {
+ name = "core-js-compat";
+ packageName = "core-js-compat";
+ version = "3.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz";
+ sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==";
+ };
+ };
+ "cosmiconfig-7.0.0" = {
+ name = "cosmiconfig";
+ packageName = "cosmiconfig";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz";
+ sha512 = "pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==";
+ };
+ };
+ "cross-spawn-7.0.3" = {
+ name = "cross-spawn";
+ packageName = "cross-spawn";
+ version = "7.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz";
+ sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==";
+ };
+ };
+ "css-loader-5.0.1" = {
+ name = "css-loader";
+ packageName = "css-loader";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz";
+ sha512 = "cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==";
+ };
+ };
+ "css-select-1.2.0" = {
+ name = "css-select";
+ packageName = "css-select";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
+ sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
+ };
+ };
+ "css-what-2.1.3" = {
+ name = "css-what";
+ packageName = "css-what";
+ version = "2.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz";
+ sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
+ };
+ };
+ "cssesc-3.0.0" = {
+ name = "cssesc";
+ packageName = "cssesc";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz";
+ sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==";
+ };
+ };
+ "debug-2.6.9" = {
+ name = "debug";
+ packageName = "debug";
+ version = "2.6.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+ sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+ };
+ };
+ "debug-4.3.1" = {
+ name = "debug";
+ packageName = "debug";
+ version = "4.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz";
+ sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
+ };
+ };
+ "deep-extend-0.6.0" = {
+ name = "deep-extend";
+ packageName = "deep-extend";
+ version = "0.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
+ sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
+ };
+ };
+ "deep-is-0.1.3" = {
+ name = "deep-is";
+ packageName = "deep-is";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+ sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+ };
+ };
+ "define-properties-1.1.3" = {
+ name = "define-properties";
+ packageName = "define-properties";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
+ sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
+ };
+ };
+ "doctrine-1.5.0" = {
+ name = "doctrine";
+ packageName = "doctrine";
+ version = "1.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz";
+ sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa";
+ };
+ };
+ "doctrine-3.0.0" = {
+ name = "doctrine";
+ packageName = "doctrine";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz";
+ sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==";
+ };
+ };
+ "dom-converter-0.2.0" = {
+ name = "dom-converter";
+ packageName = "dom-converter";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz";
+ sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==";
+ };
+ };
+ "dom-serializer-0.2.2" = {
+ name = "dom-serializer";
+ packageName = "dom-serializer";
+ version = "0.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz";
+ sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
+ };
+ };
+ "domelementtype-1.3.1" = {
+ name = "domelementtype";
+ packageName = "domelementtype";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz";
+ sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
+ };
+ };
+ "domelementtype-2.0.2" = {
+ name = "domelementtype";
+ packageName = "domelementtype";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz";
+ sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==";
+ };
+ };
+ "domhandler-2.4.2" = {
+ name = "domhandler";
+ packageName = "domhandler";
+ version = "2.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz";
+ sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
+ };
+ };
+ "domutils-1.5.1" = {
+ name = "domutils";
+ packageName = "domutils";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+ sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+ };
+ };
+ "dot-case-3.0.3" = {
+ name = "dot-case";
+ packageName = "dot-case";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz";
+ sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==";
+ };
+ };
+ "electron-to-chromium-1.3.607" = {
+ name = "electron-to-chromium";
+ packageName = "electron-to-chromium";
+ version = "1.3.607";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz";
+ sha512 = "h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g==";
+ };
+ };
+ "emoji-regex-7.0.3" = {
+ name = "emoji-regex";
+ packageName = "emoji-regex";
+ version = "7.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
+ sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
+ };
+ };
+ "emojis-list-3.0.0" = {
+ name = "emojis-list";
+ packageName = "emojis-list";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz";
+ sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==";
+ };
+ };
+ "end-of-stream-1.4.4" = {
+ name = "end-of-stream";
+ packageName = "end-of-stream";
+ version = "1.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz";
+ sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
+ };
+ };
+ "enhanced-resolve-5.3.2" = {
+ name = "enhanced-resolve";
+ packageName = "enhanced-resolve";
+ version = "5.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.2.tgz";
+ sha512 = "G28GCrglCAH6+EqMN2D+Q2wCUS1O1vVQJBn8ME2I/Api41YBe4vLWWRBOUbwDH7vwzSZdljxwTRVqnf+sm6XqQ==";
+ };
+ };
+ "enquirer-2.3.6" = {
+ name = "enquirer";
+ packageName = "enquirer";
+ version = "2.3.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz";
+ sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==";
+ };
+ };
+ "entities-1.1.2" = {
+ name = "entities";
+ packageName = "entities";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz";
+ sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==";
+ };
+ };
+ "entities-2.1.0" = {
+ name = "entities";
+ packageName = "entities";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz";
+ sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==";
+ };
+ };
+ "envinfo-7.7.3" = {
+ name = "envinfo";
+ packageName = "envinfo";
+ version = "7.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz";
+ sha512 = "46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==";
+ };
+ };
+ "error-ex-1.3.2" = {
+ name = "error-ex";
+ packageName = "error-ex";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
+ sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
+ };
+ };
+ "es-abstract-1.17.7" = {
+ name = "es-abstract";
+ packageName = "es-abstract";
+ version = "1.17.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz";
+ sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==";
+ };
+ };
+ "es-abstract-1.18.0-next.1" = {
+ name = "es-abstract";
+ packageName = "es-abstract";
+ version = "1.18.0-next.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz";
+ sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==";
+ };
+ };
+ "es-to-primitive-1.2.1" = {
+ name = "es-to-primitive";
+ packageName = "es-to-primitive";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
+ sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
+ };
+ };
+ "escalade-3.1.1" = {
+ name = "escalade";
+ packageName = "escalade";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz";
+ sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==";
+ };
+ };
+ "escape-string-regexp-1.0.5" = {
+ name = "escape-string-regexp";
+ packageName = "escape-string-regexp";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+ };
+ };
+ "eslint-7.14.0" = {
+ name = "eslint";
+ packageName = "eslint";
+ version = "7.14.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz";
+ sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
+ };
+ };
+ "eslint-import-resolver-node-0.3.4" = {
+ name = "eslint-import-resolver-node";
+ packageName = "eslint-import-resolver-node";
+ version = "0.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz";
+ sha512 = "ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==";
+ };
+ };
+ "eslint-module-utils-2.6.0" = {
+ name = "eslint-module-utils";
+ packageName = "eslint-module-utils";
+ version = "2.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz";
+ sha512 = "6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==";
+ };
+ };
+ "eslint-plugin-import-2.22.1" = {
+ name = "eslint-plugin-import";
+ packageName = "eslint-plugin-import";
+ version = "2.22.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz";
+ sha512 = "8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==";
+ };
+ };
+ "eslint-plugin-jquery-1.5.1" = {
+ name = "eslint-plugin-jquery";
+ packageName = "eslint-plugin-jquery";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-plugin-jquery/-/eslint-plugin-jquery-1.5.1.tgz";
+ sha512 = "L7v1eaK5t80C0lvUXPFP9MKnBOqPSKhCOYyzy4LZ0+iK+TJwN8S9gAkzzP1AOhypRIwA88HF6phQ9C7jnOpW8w==";
+ };
+ };
+ "eslint-plugin-jsdoc-30.7.8" = {
+ name = "eslint-plugin-jsdoc";
+ packageName = "eslint-plugin-jsdoc";
+ version = "30.7.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.8.tgz";
+ sha512 = "OWm2AYvXjCl7nRbpcw5xisfSVkpVAyp4lGqL9T+DeK4kaPm6ecnmTc/G5s1PtcRrwbaI8bIWGzwScqv5CdGyxA==";
+ };
+ };
+ "eslint-rule-composer-0.3.0" = {
+ name = "eslint-rule-composer";
+ packageName = "eslint-rule-composer";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz";
+ sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==";
+ };
+ };
+ "eslint-scope-5.1.0" = {
+ name = "eslint-scope";
+ packageName = "eslint-scope";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz";
+ sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==";
+ };
+ };
+ "eslint-scope-5.1.1" = {
+ name = "eslint-scope";
+ packageName = "eslint-scope";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz";
+ sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==";
+ };
+ };
+ "eslint-utils-2.1.0" = {
+ name = "eslint-utils";
+ packageName = "eslint-utils";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz";
+ sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==";
+ };
+ };
+ "eslint-visitor-keys-1.3.0" = {
+ name = "eslint-visitor-keys";
+ packageName = "eslint-visitor-keys";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz";
+ sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==";
+ };
+ };
+ "eslint-visitor-keys-2.0.0" = {
+ name = "eslint-visitor-keys";
+ packageName = "eslint-visitor-keys";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz";
+ sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==";
+ };
+ };
+ "espree-7.3.0" = {
+ name = "espree";
+ packageName = "espree";
+ version = "7.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz";
+ sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==";
+ };
+ };
+ "esprima-4.0.1" = {
+ name = "esprima";
+ packageName = "esprima";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
+ sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
+ };
+ };
+ "esquery-1.3.1" = {
+ name = "esquery";
+ packageName = "esquery";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz";
+ sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==";
+ };
+ };
+ "esrecurse-4.3.0" = {
+ name = "esrecurse";
+ packageName = "esrecurse";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz";
+ sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==";
+ };
+ };
+ "estraverse-4.3.0" = {
+ name = "estraverse";
+ packageName = "estraverse";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
+ sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
+ };
+ };
+ "estraverse-5.2.0" = {
+ name = "estraverse";
+ packageName = "estraverse";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz";
+ sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==";
+ };
+ };
+ "esutils-2.0.3" = {
+ name = "esutils";
+ packageName = "esutils";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz";
+ sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
+ };
+ };
+ "events-3.2.0" = {
+ name = "events";
+ packageName = "events";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz";
+ sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==";
+ };
+ };
+ "execa-4.1.0" = {
+ name = "execa";
+ packageName = "execa";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz";
+ sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==";
+ };
+ };
+ "fast-deep-equal-3.1.3" = {
+ name = "fast-deep-equal";
+ packageName = "fast-deep-equal";
+ version = "3.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
+ sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
+ };
+ };
+ "fast-json-stable-stringify-2.1.0" = {
+ name = "fast-json-stable-stringify";
+ packageName = "fast-json-stable-stringify";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+ sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
+ };
+ };
+ "fast-levenshtein-2.0.6" = {
+ name = "fast-levenshtein";
+ packageName = "fast-levenshtein";
+ version = "2.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+ };
+ };
+ "file-entry-cache-5.0.1" = {
+ name = "file-entry-cache";
+ packageName = "file-entry-cache";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
+ sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
+ };
+ };
+ "fill-range-7.0.1" = {
+ name = "fill-range";
+ packageName = "fill-range";
+ version = "7.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
+ sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
+ };
+ };
+ "find-cache-dir-2.1.0" = {
+ name = "find-cache-dir";
+ packageName = "find-cache-dir";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz";
+ sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==";
+ };
+ };
+ "find-up-2.1.0" = {
+ name = "find-up";
+ packageName = "find-up";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
+ sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+ };
+ };
+ "find-up-3.0.0" = {
+ name = "find-up";
+ packageName = "find-up";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
+ sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
+ };
+ };
+ "find-up-4.1.0" = {
+ name = "find-up";
+ packageName = "find-up";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz";
+ sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
+ };
+ };
+ "flat-cache-2.0.1" = {
+ name = "flat-cache";
+ packageName = "flat-cache";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz";
+ sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
+ };
+ };
+ "flatted-2.0.2" = {
+ name = "flatted";
+ packageName = "flatted";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz";
+ sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
+ };
+ };
+ "fs.realpath-1.0.0" = {
+ name = "fs.realpath";
+ packageName = "fs.realpath";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+ };
+ };
+ "fsevents-2.1.3" = {
+ name = "fsevents";
+ packageName = "fsevents";
+ version = "2.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz";
+ sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
+ };
+ };
+ "function-bind-1.1.1" = {
+ name = "function-bind";
+ packageName = "function-bind";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
+ sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+ };
+ };
+ "functional-red-black-tree-1.0.1" = {
+ name = "functional-red-black-tree";
+ packageName = "functional-red-black-tree";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz";
+ sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
+ };
+ };
+ "gensync-1.0.0-beta.2" = {
+ name = "gensync";
+ packageName = "gensync";
+ version = "1.0.0-beta.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
+ sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
+ };
+ };
+ "get-intrinsic-1.0.1" = {
+ name = "get-intrinsic";
+ packageName = "get-intrinsic";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz";
+ sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==";
+ };
+ };
+ "get-stream-5.2.0" = {
+ name = "get-stream";
+ packageName = "get-stream";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz";
+ sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==";
+ };
+ };
+ "glob-7.1.6" = {
+ name = "glob";
+ packageName = "glob";
+ version = "7.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
+ sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+ };
+ };
+ "glob-parent-5.1.1" = {
+ name = "glob-parent";
+ packageName = "glob-parent";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
+ sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
+ };
+ };
+ "glob-to-regexp-0.4.1" = {
+ name = "glob-to-regexp";
+ packageName = "glob-to-regexp";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz";
+ sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==";
+ };
+ };
+ "globals-11.12.0" = {
+ name = "globals";
+ packageName = "globals";
+ version = "11.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz";
+ sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
+ };
+ };
+ "globals-12.4.0" = {
+ name = "globals";
+ packageName = "globals";
+ version = "12.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz";
+ sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==";
+ };
+ };
+ "graceful-fs-4.2.4" = {
+ name = "graceful-fs";
+ packageName = "graceful-fs";
+ version = "4.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
+ sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
+ };
+ };
+ "has-1.0.3" = {
+ name = "has";
+ packageName = "has";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
+ sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+ };
+ };
+ "has-flag-3.0.0" = {
+ name = "has-flag";
+ packageName = "has-flag";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
+ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+ };
+ };
+ "has-flag-4.0.0" = {
+ name = "has-flag";
+ packageName = "has-flag";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz";
+ sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
+ };
+ };
+ "has-symbols-1.0.1" = {
+ name = "has-symbols";
+ packageName = "has-symbols";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
+ sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
+ };
+ };
+ "he-1.2.0" = {
+ name = "he";
+ packageName = "he";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz";
+ sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";
+ };
+ };
+ "hosted-git-info-2.8.8" = {
+ name = "hosted-git-info";
+ packageName = "hosted-git-info";
+ version = "2.8.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+ sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
+ };
+ };
+ "html-minifier-terser-5.1.1" = {
+ name = "html-minifier-terser";
+ packageName = "html-minifier-terser";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz";
+ sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==";
+ };
+ };
+ "html-webpack-plugin-4.5.0" = {
+ name = "html-webpack-plugin";
+ packageName = "html-webpack-plugin";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz";
+ sha512 = "MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw==";
+ };
+ };
+ "htmlparser2-3.10.1" = {
+ name = "htmlparser2";
+ packageName = "htmlparser2";
+ version = "3.10.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz";
+ sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==";
+ };
+ };
+ "human-signals-1.1.1" = {
+ name = "human-signals";
+ packageName = "human-signals";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz";
+ sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==";
+ };
+ };
+ "icss-utils-5.1.0" = {
+ name = "icss-utils";
+ packageName = "icss-utils";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz";
+ sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==";
+ };
+ };
+ "ignore-4.0.6" = {
+ name = "ignore";
+ packageName = "ignore";
+ version = "4.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz";
+ sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
+ };
+ };
+ "import-fresh-3.2.2" = {
+ name = "import-fresh";
+ packageName = "import-fresh";
+ version = "3.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz";
+ sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
+ };
+ };
+ "import-local-3.0.2" = {
+ name = "import-local";
+ packageName = "import-local";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz";
+ sha512 = "vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==";
+ };
+ };
+ "imurmurhash-0.1.4" = {
+ name = "imurmurhash";
+ packageName = "imurmurhash";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
+ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+ };
+ };
+ "indexes-of-1.0.1" = {
+ name = "indexes-of";
+ packageName = "indexes-of";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz";
+ sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607";
+ };
+ };
+ "inflight-1.0.6" = {
+ name = "inflight";
+ packageName = "inflight";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+ sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+ };
+ };
+ "inherits-2.0.4" = {
+ name = "inherits";
+ packageName = "inherits";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
+ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+ };
+ };
+ "interpret-2.2.0" = {
+ name = "interpret";
+ packageName = "interpret";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz";
+ sha512 = "Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==";
+ };
+ };
+ "is-arrayish-0.2.1" = {
+ name = "is-arrayish";
+ packageName = "is-arrayish";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
+ sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
+ };
+ };
+ "is-binary-path-2.1.0" = {
+ name = "is-binary-path";
+ packageName = "is-binary-path";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
+ sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
+ };
+ };
+ "is-callable-1.2.2" = {
+ name = "is-callable";
+ packageName = "is-callable";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
+ sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
+ };
+ };
+ "is-core-module-2.1.0" = {
+ name = "is-core-module";
+ packageName = "is-core-module";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz";
+ sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==";
+ };
+ };
+ "is-date-object-1.0.2" = {
+ name = "is-date-object";
+ packageName = "is-date-object";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
+ sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
+ };
+ };
+ "is-extglob-2.1.1" = {
+ name = "is-extglob";
+ packageName = "is-extglob";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+ sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+ };
+ };
+ "is-fullwidth-code-point-2.0.0" = {
+ name = "is-fullwidth-code-point";
+ packageName = "is-fullwidth-code-point";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+ sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+ };
+ };
+ "is-glob-4.0.1" = {
+ name = "is-glob";
+ packageName = "is-glob";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
+ sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+ };
+ };
+ "is-negative-zero-2.0.0" = {
+ name = "is-negative-zero";
+ packageName = "is-negative-zero";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz";
+ sha1 = "9553b121b0fac28869da9ed459e20c7543788461";
+ };
+ };
+ "is-number-7.0.0" = {
+ name = "is-number";
+ packageName = "is-number";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
+ sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
+ };
+ };
+ "is-regex-1.1.1" = {
+ name = "is-regex";
+ packageName = "is-regex";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
+ sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
+ };
+ };
+ "is-stream-2.0.0" = {
+ name = "is-stream";
+ packageName = "is-stream";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz";
+ sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
+ };
+ };
+ "is-string-1.0.5" = {
+ name = "is-string";
+ packageName = "is-string";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz";
+ sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==";
+ };
+ };
+ "is-symbol-1.0.3" = {
+ name = "is-symbol";
+ packageName = "is-symbol";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
+ sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
+ };
+ };
+ "isarray-1.0.0" = {
+ name = "isarray";
+ packageName = "isarray";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+ sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+ };
+ };
+ "isexe-2.0.0" = {
+ name = "isexe";
+ packageName = "isexe";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+ sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+ };
+ };
+ "jest-worker-26.6.2" = {
+ name = "jest-worker";
+ packageName = "jest-worker";
+ version = "26.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz";
+ sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==";
+ };
+ };
+ "jquery-3.5.1" = {
+ name = "jquery";
+ packageName = "jquery";
+ version = "3.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz";
+ sha512 = "XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==";
+ };
+ };
+ "jquery-migrate-3.3.2" = {
+ name = "jquery-migrate";
+ packageName = "jquery-migrate";
+ version = "3.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.3.2.tgz";
+ sha512 = "L3gYhr7yEtLUSAeqXSicVa0vRD4aGwjw/bWY8YzrO2o/qDY1BaMyP3oB3bZf5Auy3Hu9ynliio0CTyDWCBPVDw==";
+ };
+ };
+ "js-tokens-4.0.0" = {
+ name = "js-tokens";
+ packageName = "js-tokens";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz";
+ sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
+ };
+ };
+ "js-yaml-3.14.0" = {
+ name = "js-yaml";
+ packageName = "js-yaml";
+ version = "3.14.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
+ sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
+ };
+ };
+ "jsdoctypeparser-9.0.0" = {
+ name = "jsdoctypeparser";
+ packageName = "jsdoctypeparser";
+ version = "9.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz";
+ sha512 = "jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==";
+ };
+ };
+ "jsesc-0.5.0" = {
+ name = "jsesc";
+ packageName = "jsesc";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz";
+ sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
+ };
+ };
+ "jsesc-2.5.2" = {
+ name = "jsesc";
+ packageName = "jsesc";
+ version = "2.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz";
+ sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
+ };
+ };
+ "json-parse-better-errors-1.0.2" = {
+ name = "json-parse-better-errors";
+ packageName = "json-parse-better-errors";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz";
+ sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==";
+ };
+ };
+ "json-parse-even-better-errors-2.3.1" = {
+ name = "json-parse-even-better-errors";
+ packageName = "json-parse-even-better-errors";
+ version = "2.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz";
+ sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==";
+ };
+ };
+ "json-schema-traverse-0.4.1" = {
+ name = "json-schema-traverse";
+ packageName = "json-schema-traverse";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+ sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
+ };
+ };
+ "json-stable-stringify-without-jsonify-1.0.1" = {
+ name = "json-stable-stringify-without-jsonify";
+ packageName = "json-stable-stringify-without-jsonify";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
+ sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651";
+ };
+ };
+ "json5-1.0.1" = {
+ name = "json5";
+ packageName = "json5";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz";
+ sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
+ };
+ };
+ "json5-2.1.3" = {
+ name = "json5";
+ packageName = "json5";
+ version = "2.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz";
+ sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==";
+ };
+ };
+ "klona-2.0.4" = {
+ name = "klona";
+ packageName = "klona";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz";
+ sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==";
+ };
+ };
+ "leven-3.1.0" = {
+ name = "leven";
+ packageName = "leven";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz";
+ sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==";
+ };
+ };
+ "levn-0.4.1" = {
+ name = "levn";
+ packageName = "levn";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz";
+ sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==";
+ };
+ };
+ "lines-and-columns-1.1.6" = {
+ name = "lines-and-columns";
+ packageName = "lines-and-columns";
+ version = "1.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz";
+ sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00";
+ };
+ };
+ "load-json-file-2.0.0" = {
+ name = "load-json-file";
+ packageName = "load-json-file";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+ sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+ };
+ };
+ "loader-runner-4.1.0" = {
+ name = "loader-runner";
+ packageName = "loader-runner";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.1.0.tgz";
+ sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA==";
+ };
+ };
+ "loader-utils-1.4.0" = {
+ name = "loader-utils";
+ packageName = "loader-utils";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";
+ sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
+ };
+ };
+ "loader-utils-2.0.0" = {
+ name = "loader-utils";
+ packageName = "loader-utils";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz";
+ sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==";
+ };
+ };
+ "locate-path-2.0.0" = {
+ name = "locate-path";
+ packageName = "locate-path";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
+ sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+ };
+ };
+ "locate-path-3.0.0" = {
+ name = "locate-path";
+ packageName = "locate-path";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
+ sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
+ };
+ };
+ "locate-path-5.0.0" = {
+ name = "locate-path";
+ packageName = "locate-path";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz";
+ sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
+ };
+ };
+ "lodash-4.17.20" = {
+ name = "lodash";
+ packageName = "lodash";
+ version = "4.17.20";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
+ sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
+ };
+ };
+ "lower-case-2.0.1" = {
+ name = "lower-case";
+ packageName = "lower-case";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz";
+ sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==";
+ };
+ };
+ "make-dir-2.1.0" = {
+ name = "make-dir";
+ packageName = "make-dir";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
+ sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
+ };
+ };
+ "merge-stream-2.0.0" = {
+ name = "merge-stream";
+ packageName = "merge-stream";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz";
+ sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==";
+ };
+ };
+ "mime-db-1.44.0" = {
+ name = "mime-db";
+ packageName = "mime-db";
+ version = "1.44.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
+ sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
+ };
+ };
+ "mime-types-2.1.27" = {
+ name = "mime-types";
+ packageName = "mime-types";
+ version = "2.1.27";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+ sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
+ };
+ };
+ "mimic-fn-2.1.0" = {
+ name = "mimic-fn";
+ packageName = "mimic-fn";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+ sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+ };
+ };
+ "mini-css-extract-plugin-1.3.1" = {
+ name = "mini-css-extract-plugin";
+ packageName = "mini-css-extract-plugin";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.1.tgz";
+ sha512 = "jIOheqh9EU98rqj6ZaFTYNNDSFqdakNqaUZfkYwaXPjI9batmXVXX+K71NrqRAgtoGefELBMld1EQ7dqSAD5SQ==";
+ };
+ };
+ "minimatch-3.0.4" = {
+ name = "minimatch";
+ packageName = "minimatch";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+ sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+ };
+ };
+ "minimist-1.2.5" = {
+ name = "minimist";
+ packageName = "minimist";
+ version = "1.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+ sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+ };
+ };
+ "mkdirp-0.5.5" = {
+ name = "mkdirp";
+ packageName = "mkdirp";
+ version = "0.5.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
+ sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
+ };
+ };
+ "ms-2.0.0" = {
+ name = "ms";
+ packageName = "ms";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+ sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+ };
+ };
+ "ms-2.1.2" = {
+ name = "ms";
+ packageName = "ms";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+ sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+ };
+ };
+ "nanoid-3.1.18" = {
+ name = "nanoid";
+ packageName = "nanoid";
+ version = "3.1.18";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz";
+ sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA==";
+ };
+ };
+ "natural-compare-1.4.0" = {
+ name = "natural-compare";
+ packageName = "natural-compare";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz";
+ sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7";
+ };
+ };
+ "neo-async-2.6.2" = {
+ name = "neo-async";
+ packageName = "neo-async";
+ version = "2.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz";
+ sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==";
+ };
+ };
+ "no-case-3.0.3" = {
+ name = "no-case";
+ packageName = "no-case";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz";
+ sha512 = "ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==";
+ };
+ };
+ "node-releases-1.1.67" = {
+ name = "node-releases";
+ packageName = "node-releases";
+ version = "1.1.67";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz";
+ sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==";
+ };
+ };
+ "normalize-package-data-2.5.0" = {
+ name = "normalize-package-data";
+ packageName = "normalize-package-data";
+ version = "2.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
+ sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
+ };
+ };
+ "normalize-path-3.0.0" = {
+ name = "normalize-path";
+ packageName = "normalize-path";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
+ sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
+ };
+ };
+ "normalize-range-0.1.2" = {
+ name = "normalize-range";
+ packageName = "normalize-range";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz";
+ sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942";
+ };
+ };
+ "npm-run-path-4.0.1" = {
+ name = "npm-run-path";
+ packageName = "npm-run-path";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz";
+ sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==";
+ };
+ };
+ "nth-check-1.0.2" = {
+ name = "nth-check";
+ packageName = "nth-check";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz";
+ sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==";
+ };
+ };
+ "num2fraction-1.2.2" = {
+ name = "num2fraction";
+ packageName = "num2fraction";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz";
+ sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede";
+ };
+ };
+ "object-inspect-1.8.0" = {
+ name = "object-inspect";
+ packageName = "object-inspect";
+ version = "1.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
+ sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
+ };
+ };
+ "object-keys-1.1.1" = {
+ name = "object-keys";
+ packageName = "object-keys";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
+ sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
+ };
+ };
+ "object.assign-4.1.2" = {
+ name = "object.assign";
+ packageName = "object.assign";
+ version = "4.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+ sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
+ };
+ };
+ "object.getownpropertydescriptors-2.1.0" = {
+ name = "object.getownpropertydescriptors";
+ packageName = "object.getownpropertydescriptors";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+ sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
+ };
+ };
+ "object.values-1.1.1" = {
+ name = "object.values";
+ packageName = "object.values";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz";
+ sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==";
+ };
+ };
+ "once-1.4.0" = {
+ name = "once";
+ packageName = "once";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+ sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+ };
+ };
+ "onetime-5.1.2" = {
+ name = "onetime";
+ packageName = "onetime";
+ version = "5.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz";
+ sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";
+ };
+ };
+ "optionator-0.9.1" = {
+ name = "optionator";
+ packageName = "optionator";
+ version = "0.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz";
+ sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==";
+ };
+ };
+ "p-limit-1.3.0" = {
+ name = "p-limit";
+ packageName = "p-limit";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
+ sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
+ };
+ };
+ "p-limit-2.3.0" = {
+ name = "p-limit";
+ packageName = "p-limit";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
+ sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
+ };
+ };
+ "p-limit-3.0.2" = {
+ name = "p-limit";
+ packageName = "p-limit";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz";
+ sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==";
+ };
+ };
+ "p-locate-2.0.0" = {
+ name = "p-locate";
+ packageName = "p-locate";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
+ sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+ };
+ };
+ "p-locate-3.0.0" = {
+ name = "p-locate";
+ packageName = "p-locate";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
+ sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
+ };
+ };
+ "p-locate-4.1.0" = {
+ name = "p-locate";
+ packageName = "p-locate";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz";
+ sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
+ };
+ };
+ "p-try-1.0.0" = {
+ name = "p-try";
+ packageName = "p-try";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
+ sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
+ };
+ };
+ "p-try-2.2.0" = {
+ name = "p-try";
+ packageName = "p-try";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+ sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+ };
+ };
+ "param-case-3.0.3" = {
+ name = "param-case";
+ packageName = "param-case";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz";
+ sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==";
+ };
+ };
+ "parent-module-1.0.1" = {
+ name = "parent-module";
+ packageName = "parent-module";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz";
+ sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==";
+ };
+ };
+ "parse-json-2.2.0" = {
+ name = "parse-json";
+ packageName = "parse-json";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
+ sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
+ };
+ };
+ "parse-json-5.1.0" = {
+ name = "parse-json";
+ packageName = "parse-json";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz";
+ sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==";
+ };
+ };
+ "pascal-case-3.1.1" = {
+ name = "pascal-case";
+ packageName = "pascal-case";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz";
+ sha512 = "XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==";
+ };
+ };
+ "path-exists-3.0.0" = {
+ name = "path-exists";
+ packageName = "path-exists";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
+ sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+ };
+ };
+ "path-exists-4.0.0" = {
+ name = "path-exists";
+ packageName = "path-exists";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
+ sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
+ };
+ };
+ "path-is-absolute-1.0.1" = {
+ name = "path-is-absolute";
+ packageName = "path-is-absolute";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+ };
+ };
+ "path-key-3.1.1" = {
+ name = "path-key";
+ packageName = "path-key";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz";
+ sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==";
+ };
+ };
+ "path-parse-1.0.6" = {
+ name = "path-parse";
+ packageName = "path-parse";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
+ sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
+ };
+ };
+ "path-type-2.0.0" = {
+ name = "path-type";
+ packageName = "path-type";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+ sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+ };
+ };
+ "path-type-4.0.0" = {
+ name = "path-type";
+ packageName = "path-type";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz";
+ sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
+ };
+ };
+ "picomatch-2.2.2" = {
+ name = "picomatch";
+ packageName = "picomatch";
+ version = "2.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
+ sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
+ };
+ };
+ "pify-2.3.0" = {
+ name = "pify";
+ packageName = "pify";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
+ sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+ };
+ };
+ "pify-4.0.1" = {
+ name = "pify";
+ packageName = "pify";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz";
+ sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==";
+ };
+ };
+ "pkg-dir-2.0.0" = {
+ name = "pkg-dir";
+ packageName = "pkg-dir";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz";
+ sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b";
+ };
+ };
+ "pkg-dir-3.0.0" = {
+ name = "pkg-dir";
+ packageName = "pkg-dir";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz";
+ sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==";
+ };
+ };
+ "pkg-dir-4.2.0" = {
+ name = "pkg-dir";
+ packageName = "pkg-dir";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz";
+ sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==";
+ };
+ };
+ "popper.js-1.16.1" = {
+ name = "popper.js";
+ packageName = "popper.js";
+ version = "1.16.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz";
+ sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==";
+ };
+ };
+ "postcss-8.1.10" = {
+ name = "postcss";
+ packageName = "postcss";
+ version = "8.1.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz";
+ sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==";
+ };
+ };
+ "postcss-loader-4.1.0" = {
+ name = "postcss-loader";
+ packageName = "postcss-loader";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.1.0.tgz";
+ sha512 = "vbCkP70F3Q9PIk6d47aBwjqAMI4LfkXCoyxj+7NPNuVIwfTGdzv2KVQes59/RuxMniIgsYQCFSY42P3+ykJfaw==";
+ };
+ };
+ "postcss-modules-extract-imports-3.0.0" = {
+ name = "postcss-modules-extract-imports";
+ packageName = "postcss-modules-extract-imports";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz";
+ sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==";
+ };
+ };
+ "postcss-modules-local-by-default-4.0.0" = {
+ name = "postcss-modules-local-by-default";
+ packageName = "postcss-modules-local-by-default";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz";
+ sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==";
+ };
+ };
+ "postcss-modules-scope-3.0.0" = {
+ name = "postcss-modules-scope";
+ packageName = "postcss-modules-scope";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz";
+ sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==";
+ };
+ };
+ "postcss-modules-values-4.0.0" = {
+ name = "postcss-modules-values";
+ packageName = "postcss-modules-values";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz";
+ sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==";
+ };
+ };
+ "postcss-selector-parser-6.0.4" = {
+ name = "postcss-selector-parser";
+ packageName = "postcss-selector-parser";
+ version = "6.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz";
+ sha512 = "gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==";
+ };
+ };
+ "postcss-value-parser-4.1.0" = {
+ name = "postcss-value-parser";
+ packageName = "postcss-value-parser";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz";
+ sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==";
+ };
+ };
+ "prelude-ls-1.2.1" = {
+ name = "prelude-ls";
+ packageName = "prelude-ls";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz";
+ sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==";
+ };
+ };
+ "pretty-error-2.1.2" = {
+ name = "pretty-error";
+ packageName = "pretty-error";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz";
+ sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==";
+ };
+ };
+ "progress-2.0.3" = {
+ name = "progress";
+ packageName = "progress";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz";
+ sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
+ };
+ };
+ "pump-3.0.0" = {
+ name = "pump";
+ packageName = "pump";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
+ sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
+ };
+ };
+ "punycode-2.1.1" = {
+ name = "punycode";
+ packageName = "punycode";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
+ sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+ };
+ };
+ "randombytes-2.1.0" = {
+ name = "randombytes";
+ packageName = "randombytes";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
+ sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
+ };
+ };
+ "read-pkg-2.0.0" = {
+ name = "read-pkg";
+ packageName = "read-pkg";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+ sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+ };
+ };
+ "read-pkg-up-2.0.0" = {
+ name = "read-pkg-up";
+ packageName = "read-pkg-up";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+ sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+ };
+ };
+ "readable-stream-3.6.0" = {
+ name = "readable-stream";
+ packageName = "readable-stream";
+ version = "3.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
+ sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
+ };
+ };
+ "readdirp-3.5.0" = {
+ name = "readdirp";
+ packageName = "readdirp";
+ version = "3.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
+ sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
+ };
+ };
+ "rechoir-0.7.0" = {
+ name = "rechoir";
+ packageName = "rechoir";
+ version = "0.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz";
+ sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==";
+ };
+ };
+ "reduce-flatten-2.0.0" = {
+ name = "reduce-flatten";
+ packageName = "reduce-flatten";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz";
+ sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==";
+ };
+ };
+ "regenerate-1.4.2" = {
+ name = "regenerate";
+ packageName = "regenerate";
+ version = "1.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz";
+ sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==";
+ };
+ };
+ "regenerate-unicode-properties-8.2.0" = {
+ name = "regenerate-unicode-properties";
+ packageName = "regenerate-unicode-properties";
+ version = "8.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz";
+ sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==";
+ };
+ };
+ "regenerator-runtime-0.13.7" = {
+ name = "regenerator-runtime";
+ packageName = "regenerator-runtime";
+ version = "0.13.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz";
+ sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==";
+ };
+ };
+ "regenerator-transform-0.14.5" = {
+ name = "regenerator-transform";
+ packageName = "regenerator-transform";
+ version = "0.14.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz";
+ sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==";
+ };
+ };
+ "regexpp-3.1.0" = {
+ name = "regexpp";
+ packageName = "regexpp";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz";
+ sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==";
+ };
+ };
+ "regexpu-core-4.7.1" = {
+ name = "regexpu-core";
+ packageName = "regexpu-core";
+ version = "4.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz";
+ sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==";
+ };
+ };
+ "regextras-0.7.1" = {
+ name = "regextras";
+ packageName = "regextras";
+ version = "0.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz";
+ sha512 = "9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==";
+ };
+ };
+ "regjsgen-0.5.2" = {
+ name = "regjsgen";
+ packageName = "regjsgen";
+ version = "0.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz";
+ sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
+ };
+ };
+ "regjsparser-0.6.4" = {
+ name = "regjsparser";
+ packageName = "regjsparser";
+ version = "0.6.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
+ sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
+ };
+ };
+ "relateurl-0.2.7" = {
+ name = "relateurl";
+ packageName = "relateurl";
+ version = "0.2.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz";
+ sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
+ };
+ };
+ "renderkid-2.0.4" = {
+ name = "renderkid";
+ packageName = "renderkid";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz";
+ sha512 = "K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==";
+ };
+ };
+ "resolve-1.19.0" = {
+ name = "resolve";
+ packageName = "resolve";
+ version = "1.19.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+ sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+ };
+ };
+ "resolve-cwd-3.0.0" = {
+ name = "resolve-cwd";
+ packageName = "resolve-cwd";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz";
+ sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==";
+ };
+ };
+ "resolve-from-4.0.0" = {
+ name = "resolve-from";
+ packageName = "resolve-from";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz";
+ sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==";
+ };
+ };
+ "resolve-from-5.0.0" = {
+ name = "resolve-from";
+ packageName = "resolve-from";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz";
+ sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==";
+ };
+ };
+ "rimraf-2.6.3" = {
+ name = "rimraf";
+ packageName = "rimraf";
+ version = "2.6.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
+ sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
+ };
+ };
+ "safe-buffer-5.1.2" = {
+ name = "safe-buffer";
+ packageName = "safe-buffer";
+ version = "5.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+ sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+ };
+ };
+ "safe-buffer-5.2.1" = {
+ name = "safe-buffer";
+ packageName = "safe-buffer";
+ version = "5.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
+ sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
+ };
+ };
+ "sass-1.29.0" = {
+ name = "sass";
+ packageName = "sass";
+ version = "1.29.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz";
+ sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==";
+ };
+ };
+ "sass-loader-10.1.0" = {
+ name = "sass-loader";
+ packageName = "sass-loader";
+ version = "10.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.0.tgz";
+ sha512 = "ZCKAlczLBbFd3aGAhowpYEy69Te3Z68cg8bnHHl6WnSCvnKpbM6pQrz957HWMa8LKVuhnD9uMplmMAHwGQtHeg==";
+ };
+ };
+ "schema-utils-2.7.1" = {
+ name = "schema-utils";
+ packageName = "schema-utils";
+ version = "2.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz";
+ sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==";
+ };
+ };
+ "schema-utils-3.0.0" = {
+ name = "schema-utils";
+ packageName = "schema-utils";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz";
+ sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==";
+ };
+ };
+ "semver-5.7.1" = {
+ name = "semver";
+ packageName = "semver";
+ version = "5.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+ sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+ };
+ };
+ "semver-6.3.0" = {
+ name = "semver";
+ packageName = "semver";
+ version = "6.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz";
+ sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
+ };
+ };
+ "semver-7.0.0" = {
+ name = "semver";
+ packageName = "semver";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz";
+ sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
+ };
+ };
+ "semver-7.3.2" = {
+ name = "semver";
+ packageName = "semver";
+ version = "7.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz";
+ sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==";
+ };
+ };
+ "serialize-javascript-5.0.1" = {
+ name = "serialize-javascript";
+ packageName = "serialize-javascript";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz";
+ sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==";
+ };
+ };
+ "shebang-command-2.0.0" = {
+ name = "shebang-command";
+ packageName = "shebang-command";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz";
+ sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==";
+ };
+ };
+ "shebang-regex-3.0.0" = {
+ name = "shebang-regex";
+ packageName = "shebang-regex";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz";
+ sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==";
+ };
+ };
+ "signal-exit-3.0.3" = {
+ name = "signal-exit";
+ packageName = "signal-exit";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
+ sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
+ };
+ };
+ "slice-ansi-2.1.0" = {
+ name = "slice-ansi";
+ packageName = "slice-ansi";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz";
+ sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==";
+ };
+ };
+ "source-list-map-2.0.1" = {
+ name = "source-list-map";
+ packageName = "source-list-map";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz";
+ sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==";
+ };
+ };
+ "source-map-0.5.7" = {
+ name = "source-map";
+ packageName = "source-map";
+ version = "0.5.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+ sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+ };
+ };
+ "source-map-0.6.1" = {
+ name = "source-map";
+ packageName = "source-map";
+ version = "0.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+ sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+ };
+ };
+ "source-map-0.7.3" = {
+ name = "source-map";
+ packageName = "source-map";
+ version = "0.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz";
+ sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==";
+ };
+ };
+ "source-map-support-0.5.19" = {
+ name = "source-map-support";
+ packageName = "source-map-support";
+ version = "0.5.19";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz";
+ sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==";
+ };
+ };
+ "spdx-correct-3.1.1" = {
+ name = "spdx-correct";
+ packageName = "spdx-correct";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz";
+ sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==";
+ };
+ };
+ "spdx-exceptions-2.3.0" = {
+ name = "spdx-exceptions";
+ packageName = "spdx-exceptions";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
+ sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
+ };
+ };
+ "spdx-expression-parse-3.0.1" = {
+ name = "spdx-expression-parse";
+ packageName = "spdx-expression-parse";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
+ sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
+ };
+ };
+ "spdx-license-ids-3.0.6" = {
+ name = "spdx-license-ids";
+ packageName = "spdx-license-ids";
+ version = "3.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
+ sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==";
+ };
+ };
+ "sprintf-js-1.0.3" = {
+ name = "sprintf-js";
+ packageName = "sprintf-js";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+ sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+ };
+ };
+ "string-width-3.1.0" = {
+ name = "string-width";
+ packageName = "string-width";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
+ sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
+ };
+ };
+ "string.prototype.trimend-1.0.3" = {
+ name = "string.prototype.trimend";
+ packageName = "string.prototype.trimend";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
+ sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
+ };
+ };
+ "string.prototype.trimstart-1.0.3" = {
+ name = "string.prototype.trimstart";
+ packageName = "string.prototype.trimstart";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
+ sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
+ };
+ };
+ "string_decoder-1.3.0" = {
+ name = "string_decoder";
+ packageName = "string_decoder";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
+ sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
+ };
+ };
+ "strip-ansi-3.0.1" = {
+ name = "strip-ansi";
+ packageName = "strip-ansi";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+ sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+ };
+ };
+ "strip-ansi-5.2.0" = {
+ name = "strip-ansi";
+ packageName = "strip-ansi";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
+ sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
+ };
+ };
+ "strip-ansi-6.0.0" = {
+ name = "strip-ansi";
+ packageName = "strip-ansi";
+ version = "6.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz";
+ sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==";
+ };
+ };
+ "strip-bom-3.0.0" = {
+ name = "strip-bom";
+ packageName = "strip-bom";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+ sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+ };
+ };
+ "strip-final-newline-2.0.0" = {
+ name = "strip-final-newline";
+ packageName = "strip-final-newline";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz";
+ sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==";
+ };
+ };
+ "strip-json-comments-3.1.1" = {
+ name = "strip-json-comments";
+ packageName = "strip-json-comments";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz";
+ sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==";
+ };
+ };
+ "supports-color-5.5.0" = {
+ name = "supports-color";
+ packageName = "supports-color";
+ version = "5.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
+ sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
+ };
+ };
+ "supports-color-7.2.0" = {
+ name = "supports-color";
+ packageName = "supports-color";
+ version = "7.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz";
+ sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==";
+ };
+ };
+ "table-5.4.6" = {
+ name = "table";
+ packageName = "table";
+ version = "5.4.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz";
+ sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
+ };
+ };
+ "table-layout-1.0.1" = {
+ name = "table-layout";
+ packageName = "table-layout";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz";
+ sha512 = "dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q==";
+ };
+ };
+ "tapable-1.1.3" = {
+ name = "tapable";
+ packageName = "tapable";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz";
+ sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
+ };
+ };
+ "tapable-2.1.1" = {
+ name = "tapable";
+ packageName = "tapable";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tapable/-/tapable-2.1.1.tgz";
+ sha512 = "Wib1S8m2wdpLbmQz0RBEVosIyvb/ykfKXf3ZIDqvWoMg/zTNm6G/tDSuUM61J1kNCDXWJrLHGSFeMhAG+gAGpQ==";
+ };
+ };
+ "terser-4.8.0" = {
+ name = "terser";
+ packageName = "terser";
+ version = "4.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz";
+ sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
+ };
+ };
+ "terser-5.5.0" = {
+ name = "terser";
+ packageName = "terser";
+ version = "5.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/terser/-/terser-5.5.0.tgz";
+ sha512 = "eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g==";
+ };
+ };
+ "terser-webpack-plugin-5.0.3" = {
+ name = "terser-webpack-plugin";
+ packageName = "terser-webpack-plugin";
+ version = "5.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz";
+ sha512 = "zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ==";
+ };
+ };
+ "text-table-0.2.0" = {
+ name = "text-table";
+ packageName = "text-table";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
+ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+ };
+ };
+ "to-fast-properties-2.0.0" = {
+ name = "to-fast-properties";
+ packageName = "to-fast-properties";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz";
+ sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e";
+ };
+ };
+ "to-regex-range-5.0.1" = {
+ name = "to-regex-range";
+ packageName = "to-regex-range";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
+ sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
+ };
+ };
+ "tsconfig-paths-3.9.0" = {
+ name = "tsconfig-paths";
+ packageName = "tsconfig-paths";
+ version = "3.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz";
+ sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==";
+ };
+ };
+ "tslib-1.14.1" = {
+ name = "tslib";
+ packageName = "tslib";
+ version = "1.14.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
+ sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
+ };
+ };
+ "type-check-0.4.0" = {
+ name = "type-check";
+ packageName = "type-check";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz";
+ sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==";
+ };
+ };
+ "type-fest-0.8.1" = {
+ name = "type-fest";
+ packageName = "type-fest";
+ version = "0.8.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz";
+ sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==";
+ };
+ };
+ "typical-5.2.0" = {
+ name = "typical";
+ packageName = "typical";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz";
+ sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==";
+ };
+ };
+ "unicode-canonical-property-names-ecmascript-1.0.4" = {
+ name = "unicode-canonical-property-names-ecmascript";
+ packageName = "unicode-canonical-property-names-ecmascript";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz";
+ sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==";
+ };
+ };
+ "unicode-match-property-ecmascript-1.0.4" = {
+ name = "unicode-match-property-ecmascript";
+ packageName = "unicode-match-property-ecmascript";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz";
+ sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==";
+ };
+ };
+ "unicode-match-property-value-ecmascript-1.2.0" = {
+ name = "unicode-match-property-value-ecmascript";
+ packageName = "unicode-match-property-value-ecmascript";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz";
+ sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==";
+ };
+ };
+ "unicode-property-aliases-ecmascript-1.1.0" = {
+ name = "unicode-property-aliases-ecmascript";
+ packageName = "unicode-property-aliases-ecmascript";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz";
+ sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==";
+ };
+ };
+ "uniq-1.0.1" = {
+ name = "uniq";
+ packageName = "uniq";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz";
+ sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
+ };
+ };
+ "uri-js-4.4.0" = {
+ name = "uri-js";
+ packageName = "uri-js";
+ version = "4.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
+ sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
+ };
+ };
+ "util-deprecate-1.0.2" = {
+ name = "util-deprecate";
+ packageName = "util-deprecate";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+ };
+ };
+ "util.promisify-1.0.0" = {
+ name = "util.promisify";
+ packageName = "util.promisify";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
+ sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==";
+ };
+ };
+ "utila-0.4.0" = {
+ name = "utila";
+ packageName = "utila";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz";
+ sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c";
+ };
+ };
+ "v8-compile-cache-2.2.0" = {
+ name = "v8-compile-cache";
+ packageName = "v8-compile-cache";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+ sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==";
+ };
+ };
+ "validate-npm-package-license-3.0.4" = {
+ name = "validate-npm-package-license";
+ packageName = "validate-npm-package-license";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
+ sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
+ };
+ };
+ "vfile-location-3.2.0" = {
+ name = "vfile-location";
+ packageName = "vfile-location";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz";
+ sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==";
+ };
+ };
+ "watchpack-2.0.1" = {
+ name = "watchpack";
+ packageName = "watchpack";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/watchpack/-/watchpack-2.0.1.tgz";
+ sha512 = "vO8AKGX22ZRo6PiOFM9dC0re8IcKh8Kd/aH2zeqUc6w4/jBGlTy2P7fTC6ekT0NjVeGjgU2dGC5rNstKkeLEQg==";
+ };
+ };
+ "webpack-5.6.0" = {
+ name = "webpack";
+ packageName = "webpack";
+ version = "5.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack/-/webpack-5.6.0.tgz";
+ sha512 = "SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA==";
+ };
+ };
+ "webpack-cli-4.2.0" = {
+ name = "webpack-cli";
+ packageName = "webpack-cli";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.2.0.tgz";
+ sha512 = "EIl3k88vaF4fSxWSgtAQR+VwicfLMTZ9amQtqS4o+TDPW9HGaEpbFBbAZ4A3ZOT5SOnMxNOzROsSTPiE8tBJPA==";
+ };
+ };
+ "webpack-merge-4.2.2" = {
+ name = "webpack-merge";
+ packageName = "webpack-merge";
+ version = "4.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz";
+ sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==";
+ };
+ };
+ "webpack-sources-1.4.3" = {
+ name = "webpack-sources";
+ packageName = "webpack-sources";
+ version = "1.4.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz";
+ sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
+ };
+ };
+ "webpack-sources-2.2.0" = {
+ name = "webpack-sources";
+ packageName = "webpack-sources";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz";
+ sha512 = "bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==";
+ };
+ };
+ "which-2.0.2" = {
+ name = "which";
+ packageName = "which";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz";
+ sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==";
+ };
+ };
+ "word-wrap-1.2.3" = {
+ name = "word-wrap";
+ packageName = "word-wrap";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";
+ sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==";
+ };
+ };
+ "wordwrapjs-4.0.0" = {
+ name = "wordwrapjs";
+ packageName = "wordwrapjs";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.0.tgz";
+ sha512 = "Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ==";
+ };
+ };
+ "wrappy-1.0.2" = {
+ name = "wrappy";
+ packageName = "wrappy";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+ };
+ };
+ "write-1.0.3" = {
+ name = "write";
+ packageName = "write";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz";
+ sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==";
+ };
+ };
+ "yaml-1.10.0" = {
+ name = "yaml";
+ packageName = "yaml";
+ version = "1.10.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz";
+ sha512 = "yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==";
+ };
+ };
+ };
+ args = {
+ name = "botamusique";
+ packageName = "botamusique";
+ version = "0.0.0";
+ src = ../../../../../../../../run/user/1000/tmp.ioJA7NbZmp;
+ dependencies = [
+ sources."@babel/code-frame-7.10.4"
+ sources."@babel/compat-data-7.12.7"
+ sources."@babel/core-7.12.9"
+ (sources."@babel/eslint-parser-7.12.1" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."@babel/eslint-plugin-7.12.1"
+ sources."@babel/generator-7.12.5"
+ sources."@babel/helper-annotate-as-pure-7.10.4"
+ sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
+ sources."@babel/helper-compilation-targets-7.12.5"
+ sources."@babel/helper-create-class-features-plugin-7.12.1"
+ sources."@babel/helper-create-regexp-features-plugin-7.12.7"
+ sources."@babel/helper-define-map-7.10.5"
+ sources."@babel/helper-explode-assignable-expression-7.12.1"
+ sources."@babel/helper-function-name-7.10.4"
+ sources."@babel/helper-get-function-arity-7.10.4"
+ sources."@babel/helper-hoist-variables-7.10.4"
+ sources."@babel/helper-member-expression-to-functions-7.12.7"
+ sources."@babel/helper-module-imports-7.12.5"
+ sources."@babel/helper-module-transforms-7.12.1"
+ sources."@babel/helper-optimise-call-expression-7.12.7"
+ sources."@babel/helper-plugin-utils-7.10.4"
+ sources."@babel/helper-remap-async-to-generator-7.12.1"
+ sources."@babel/helper-replace-supers-7.12.5"
+ sources."@babel/helper-simple-access-7.12.1"
+ sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
+ sources."@babel/helper-split-export-declaration-7.11.0"
+ sources."@babel/helper-validator-identifier-7.10.4"
+ sources."@babel/helper-validator-option-7.12.1"
+ sources."@babel/helper-wrap-function-7.12.3"
+ sources."@babel/helpers-7.12.5"
+ sources."@babel/highlight-7.10.4"
+ sources."@babel/parser-7.12.7"
+ sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
+ sources."@babel/plugin-proposal-class-properties-7.12.1"
+ sources."@babel/plugin-proposal-dynamic-import-7.12.1"
+ sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
+ sources."@babel/plugin-proposal-json-strings-7.12.1"
+ sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
+ sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
+ sources."@babel/plugin-proposal-numeric-separator-7.12.7"
+ sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
+ sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
+ sources."@babel/plugin-proposal-optional-chaining-7.12.7"
+ sources."@babel/plugin-proposal-private-methods-7.12.1"
+ sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
+ sources."@babel/plugin-syntax-async-generators-7.8.4"
+ sources."@babel/plugin-syntax-class-properties-7.12.1"
+ sources."@babel/plugin-syntax-dynamic-import-7.8.3"
+ sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
+ sources."@babel/plugin-syntax-json-strings-7.8.3"
+ sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4"
+ sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
+ sources."@babel/plugin-syntax-numeric-separator-7.10.4"
+ sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
+ sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
+ sources."@babel/plugin-syntax-optional-chaining-7.8.3"
+ sources."@babel/plugin-syntax-top-level-await-7.12.1"
+ sources."@babel/plugin-transform-arrow-functions-7.12.1"
+ sources."@babel/plugin-transform-async-to-generator-7.12.1"
+ sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
+ sources."@babel/plugin-transform-block-scoping-7.12.1"
+ sources."@babel/plugin-transform-classes-7.12.1"
+ sources."@babel/plugin-transform-computed-properties-7.12.1"
+ sources."@babel/plugin-transform-destructuring-7.12.1"
+ sources."@babel/plugin-transform-dotall-regex-7.12.1"
+ sources."@babel/plugin-transform-duplicate-keys-7.12.1"
+ sources."@babel/plugin-transform-exponentiation-operator-7.12.1"
+ sources."@babel/plugin-transform-for-of-7.12.1"
+ sources."@babel/plugin-transform-function-name-7.12.1"
+ sources."@babel/plugin-transform-literals-7.12.1"
+ sources."@babel/plugin-transform-member-expression-literals-7.12.1"
+ sources."@babel/plugin-transform-modules-amd-7.12.1"
+ sources."@babel/plugin-transform-modules-commonjs-7.12.1"
+ sources."@babel/plugin-transform-modules-systemjs-7.12.1"
+ sources."@babel/plugin-transform-modules-umd-7.12.1"
+ sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1"
+ sources."@babel/plugin-transform-new-target-7.12.1"
+ sources."@babel/plugin-transform-object-super-7.12.1"
+ sources."@babel/plugin-transform-parameters-7.12.1"
+ sources."@babel/plugin-transform-property-literals-7.12.1"
+ sources."@babel/plugin-transform-regenerator-7.12.1"
+ sources."@babel/plugin-transform-reserved-words-7.12.1"
+ sources."@babel/plugin-transform-shorthand-properties-7.12.1"
+ sources."@babel/plugin-transform-spread-7.12.1"
+ sources."@babel/plugin-transform-sticky-regex-7.12.7"
+ sources."@babel/plugin-transform-template-literals-7.12.1"
+ sources."@babel/plugin-transform-typeof-symbol-7.12.1"
+ sources."@babel/plugin-transform-unicode-escapes-7.12.1"
+ sources."@babel/plugin-transform-unicode-regex-7.12.1"
+ sources."@babel/preset-env-7.12.7"
+ sources."@babel/preset-modules-0.1.4"
+ sources."@babel/runtime-7.12.5"
+ sources."@babel/template-7.12.7"
+ sources."@babel/traverse-7.12.9"
+ sources."@babel/types-7.12.7"
+ (sources."@eslint/eslintrc-0.2.1" // {
+ dependencies = [
+ sources."globals-12.4.0"
+ ];
+ })
+ sources."@fortawesome/fontawesome-common-types-0.2.32"
+ sources."@fortawesome/fontawesome-svg-core-1.2.32"
+ sources."@fortawesome/free-regular-svg-icons-5.15.1"
+ sources."@fortawesome/free-solid-svg-icons-5.15.1"
+ sources."@types/anymatch-1.3.1"
+ sources."@types/eslint-7.2.5"
+ sources."@types/eslint-scope-3.7.0"
+ sources."@types/estree-0.0.45"
+ sources."@types/html-minifier-terser-5.1.1"
+ sources."@types/json-schema-7.0.6"
+ sources."@types/json5-0.0.29"
+ sources."@types/node-14.14.9"
+ sources."@types/parse-json-4.0.0"
+ sources."@types/source-list-map-0.1.2"
+ sources."@types/tapable-1.0.6"
+ (sources."@types/uglify-js-3.11.1" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ (sources."@types/webpack-4.41.25" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ (sources."@types/webpack-sources-2.0.0" // {
+ dependencies = [
+ sources."source-map-0.7.3"
+ ];
+ })
+ sources."@webassemblyjs/ast-1.9.0"
+ sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
+ sources."@webassemblyjs/helper-api-error-1.9.0"
+ sources."@webassemblyjs/helper-buffer-1.9.0"
+ sources."@webassemblyjs/helper-code-frame-1.9.0"
+ sources."@webassemblyjs/helper-fsm-1.9.0"
+ sources."@webassemblyjs/helper-module-context-1.9.0"
+ sources."@webassemblyjs/helper-wasm-bytecode-1.9.0"
+ sources."@webassemblyjs/helper-wasm-section-1.9.0"
+ sources."@webassemblyjs/ieee754-1.9.0"
+ sources."@webassemblyjs/leb128-1.9.0"
+ sources."@webassemblyjs/utf8-1.9.0"
+ sources."@webassemblyjs/wasm-edit-1.9.0"
+ sources."@webassemblyjs/wasm-gen-1.9.0"
+ sources."@webassemblyjs/wasm-opt-1.9.0"
+ sources."@webassemblyjs/wasm-parser-1.9.0"
+ sources."@webassemblyjs/wast-parser-1.9.0"
+ sources."@webassemblyjs/wast-printer-1.9.0"
+ sources."@webpack-cli/info-1.1.0"
+ sources."@webpack-cli/serve-1.1.0"
+ sources."@xtuc/ieee754-1.2.0"
+ sources."@xtuc/long-4.2.2"
+ sources."acorn-7.4.1"
+ sources."acorn-jsx-5.3.1"
+ sources."ajv-6.12.6"
+ sources."ajv-keywords-3.5.2"
+ sources."ansi-colors-4.1.1"
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-3.2.1"
+ sources."anymatch-3.1.1"
+ sources."argparse-1.0.10"
+ sources."array-back-4.0.1"
+ sources."array-includes-3.1.2"
+ sources."array.prototype.flat-1.2.4"
+ sources."astral-regex-1.0.0"
+ sources."autoprefixer-10.0.2"
+ sources."babel-loader-8.2.1"
+ sources."babel-plugin-dynamic-import-node-2.3.3"
+ sources."balanced-match-1.0.0"
+ sources."big.js-5.2.2"
+ sources."binary-extensions-2.1.0"
+ sources."boolbase-1.0.0"
+ sources."bootstrap-4.5.3"
+ sources."bootswatch-4.5.3"
+ sources."brace-expansion-1.1.11"
+ sources."braces-3.0.2"
+ sources."browserslist-4.14.7"
+ sources."buffer-from-1.1.1"
+ sources."call-bind-1.0.0"
+ sources."callsites-3.1.0"
+ sources."camel-case-4.1.1"
+ sources."camelcase-6.2.0"
+ sources."caniuse-lite-1.0.30001161"
+ sources."chalk-2.4.2"
+ sources."chokidar-3.4.3"
+ sources."chrome-trace-event-1.0.2"
+ (sources."clean-css-4.2.3" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."colorette-1.2.1"
+ sources."command-line-usage-6.1.1"
+ sources."commander-4.1.1"
+ sources."comment-parser-0.7.6"
+ sources."commondir-1.0.1"
+ sources."concat-map-0.0.1"
+ sources."contains-path-0.1.0"
+ sources."convert-source-map-1.7.0"
+ sources."core-js-3.7.0"
+ (sources."core-js-compat-3.7.0" // {
+ dependencies = [
+ sources."semver-7.0.0"
+ ];
+ })
+ sources."cosmiconfig-7.0.0"
+ sources."cross-spawn-7.0.3"
+ (sources."css-loader-5.0.1" // {
+ dependencies = [
+ sources."loader-utils-2.0.0"
+ sources."schema-utils-3.0.0"
+ sources."semver-7.3.2"
+ ];
+ })
+ sources."css-select-1.2.0"
+ sources."css-what-2.1.3"
+ sources."cssesc-3.0.0"
+ sources."debug-4.3.1"
+ sources."deep-extend-0.6.0"
+ sources."deep-is-0.1.3"
+ sources."define-properties-1.1.3"
+ sources."doctrine-3.0.0"
+ sources."dom-converter-0.2.0"
+ (sources."dom-serializer-0.2.2" // {
+ dependencies = [
+ sources."domelementtype-2.0.2"
+ ];
+ })
+ sources."domelementtype-1.3.1"
+ sources."domhandler-2.4.2"
+ sources."domutils-1.5.1"
+ sources."dot-case-3.0.3"
+ sources."electron-to-chromium-1.3.607"
+ sources."emoji-regex-7.0.3"
+ sources."emojis-list-3.0.0"
+ sources."end-of-stream-1.4.4"
+ (sources."enhanced-resolve-5.3.2" // {
+ dependencies = [
+ sources."tapable-2.1.1"
+ ];
+ })
+ sources."enquirer-2.3.6"
+ sources."entities-2.1.0"
+ sources."envinfo-7.7.3"
+ sources."error-ex-1.3.2"
+ sources."es-abstract-1.18.0-next.1"
+ sources."es-to-primitive-1.2.1"
+ sources."escalade-3.1.1"
+ sources."escape-string-regexp-1.0.5"
+ (sources."eslint-7.14.0" // {
+ dependencies = [
+ sources."ansi-styles-4.3.0"
+ sources."chalk-4.1.0"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
+ sources."eslint-scope-5.1.1"
+ sources."eslint-visitor-keys-2.0.0"
+ sources."globals-12.4.0"
+ sources."has-flag-4.0.0"
+ sources."semver-7.3.2"
+ sources."supports-color-7.2.0"
+ ];
+ })
+ (sources."eslint-import-resolver-node-0.3.4" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."ms-2.0.0"
+ ];
+ })
+ (sources."eslint-module-utils-2.6.0" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."ms-2.0.0"
+ ];
+ })
+ (sources."eslint-plugin-import-2.22.1" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."doctrine-1.5.0"
+ sources."ms-2.0.0"
+ ];
+ })
+ sources."eslint-plugin-jquery-1.5.1"
+ (sources."eslint-plugin-jsdoc-30.7.8" // {
+ dependencies = [
+ sources."semver-7.3.2"
+ ];
+ })
+ sources."eslint-rule-composer-0.3.0"
+ sources."eslint-scope-5.1.0"
+ sources."eslint-utils-2.1.0"
+ sources."eslint-visitor-keys-1.3.0"
+ sources."espree-7.3.0"
+ sources."esprima-4.0.1"
+ (sources."esquery-1.3.1" // {
+ dependencies = [
+ sources."estraverse-5.2.0"
+ ];
+ })
+ (sources."esrecurse-4.3.0" // {
+ dependencies = [
+ sources."estraverse-5.2.0"
+ ];
+ })
+ sources."estraverse-4.3.0"
+ sources."esutils-2.0.3"
+ sources."events-3.2.0"
+ sources."execa-4.1.0"
+ sources."fast-deep-equal-3.1.3"
+ sources."fast-json-stable-stringify-2.1.0"
+ sources."fast-levenshtein-2.0.6"
+ sources."file-entry-cache-5.0.1"
+ sources."fill-range-7.0.1"
+ (sources."find-cache-dir-2.1.0" // {
+ dependencies = [
+ sources."find-up-3.0.0"
+ sources."locate-path-3.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-3.0.0"
+ sources."p-try-2.2.0"
+ sources."pkg-dir-3.0.0"
+ ];
+ })
+ sources."find-up-2.1.0"
+ sources."flat-cache-2.0.1"
+ sources."flatted-2.0.2"
+ sources."fs.realpath-1.0.0"
+ sources."fsevents-2.1.3"
+ sources."function-bind-1.1.1"
+ sources."functional-red-black-tree-1.0.1"
+ sources."gensync-1.0.0-beta.2"
+ sources."get-intrinsic-1.0.1"
+ sources."get-stream-5.2.0"
+ sources."glob-7.1.6"
+ sources."glob-parent-5.1.1"
+ sources."glob-to-regexp-0.4.1"
+ sources."globals-11.12.0"
+ sources."graceful-fs-4.2.4"
+ sources."has-1.0.3"
+ sources."has-flag-3.0.0"
+ sources."has-symbols-1.0.1"
+ sources."he-1.2.0"
+ sources."hosted-git-info-2.8.8"
+ sources."html-minifier-terser-5.1.1"
+ sources."html-webpack-plugin-4.5.0"
+ (sources."htmlparser2-3.10.1" // {
+ dependencies = [
+ sources."entities-1.1.2"
+ ];
+ })
+ sources."human-signals-1.1.1"
+ sources."icss-utils-5.1.0"
+ sources."ignore-4.0.6"
+ sources."import-fresh-3.2.2"
+ (sources."import-local-3.0.2" // {
+ dependencies = [
+ sources."find-up-4.1.0"
+ sources."locate-path-5.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-4.1.0"
+ sources."p-try-2.2.0"
+ sources."path-exists-4.0.0"
+ sources."pkg-dir-4.2.0"
+ ];
+ })
+ sources."imurmurhash-0.1.4"
+ sources."indexes-of-1.0.1"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.4"
+ sources."interpret-2.2.0"
+ sources."is-arrayish-0.2.1"
+ sources."is-binary-path-2.1.0"
+ sources."is-callable-1.2.2"
+ sources."is-core-module-2.1.0"
+ sources."is-date-object-1.0.2"
+ sources."is-extglob-2.1.1"
+ sources."is-fullwidth-code-point-2.0.0"
+ sources."is-glob-4.0.1"
+ sources."is-negative-zero-2.0.0"
+ sources."is-number-7.0.0"
+ sources."is-regex-1.1.1"
+ sources."is-stream-2.0.0"
+ sources."is-string-1.0.5"
+ sources."is-symbol-1.0.3"
+ sources."isarray-1.0.0"
+ sources."isexe-2.0.0"
+ (sources."jest-worker-26.6.2" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ ];
+ })
+ sources."jquery-3.5.1"
+ sources."jquery-migrate-3.3.2"
+ sources."js-tokens-4.0.0"
+ sources."js-yaml-3.14.0"
+ sources."jsdoctypeparser-9.0.0"
+ sources."jsesc-2.5.2"
+ sources."json-parse-better-errors-1.0.2"
+ sources."json-parse-even-better-errors-2.3.1"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-stable-stringify-without-jsonify-1.0.1"
+ sources."json5-2.1.3"
+ sources."klona-2.0.4"
+ sources."leven-3.1.0"
+ sources."levn-0.4.1"
+ sources."lines-and-columns-1.1.6"
+ (sources."load-json-file-2.0.0" // {
+ dependencies = [
+ sources."parse-json-2.2.0"
+ sources."pify-2.3.0"
+ ];
+ })
+ sources."loader-runner-4.1.0"
+ (sources."loader-utils-1.4.0" // {
+ dependencies = [
+ sources."json5-1.0.1"
+ ];
+ })
+ sources."locate-path-2.0.0"
+ sources."lodash-4.17.20"
+ sources."lower-case-2.0.1"
+ sources."make-dir-2.1.0"
+ sources."merge-stream-2.0.0"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
+ sources."mimic-fn-2.1.0"
+ (sources."mini-css-extract-plugin-1.3.1" // {
+ dependencies = [
+ sources."loader-utils-2.0.0"
+ sources."schema-utils-3.0.0"
+ ];
+ })
+ sources."minimatch-3.0.4"
+ sources."minimist-1.2.5"
+ sources."mkdirp-0.5.5"
+ sources."ms-2.1.2"
+ sources."nanoid-3.1.18"
+ sources."natural-compare-1.4.0"
+ sources."neo-async-2.6.2"
+ sources."no-case-3.0.3"
+ sources."node-releases-1.1.67"
+ sources."normalize-package-data-2.5.0"
+ sources."normalize-path-3.0.0"
+ sources."normalize-range-0.1.2"
+ sources."npm-run-path-4.0.1"
+ sources."nth-check-1.0.2"
+ sources."num2fraction-1.2.2"
+ sources."object-inspect-1.8.0"
+ sources."object-keys-1.1.1"
+ sources."object.assign-4.1.2"
+ (sources."object.getownpropertydescriptors-2.1.0" // {
+ dependencies = [
+ sources."es-abstract-1.17.7"
+ ];
+ })
+ (sources."object.values-1.1.1" // {
+ dependencies = [
+ sources."es-abstract-1.17.7"
+ ];
+ })
+ sources."once-1.4.0"
+ sources."onetime-5.1.2"
+ sources."optionator-0.9.1"
+ sources."p-limit-1.3.0"
+ sources."p-locate-2.0.0"
+ sources."p-try-1.0.0"
+ sources."param-case-3.0.3"
+ sources."parent-module-1.0.1"
+ sources."parse-json-5.1.0"
+ sources."pascal-case-3.1.1"
+ sources."path-exists-3.0.0"
+ sources."path-is-absolute-1.0.1"
+ sources."path-key-3.1.1"
+ sources."path-parse-1.0.6"
+ sources."path-type-4.0.0"
+ sources."picomatch-2.2.2"
+ sources."pify-4.0.1"
+ sources."pkg-dir-2.0.0"
+ sources."popper.js-1.16.1"
+ (sources."postcss-8.1.10" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ (sources."postcss-loader-4.1.0" // {
+ dependencies = [
+ sources."loader-utils-2.0.0"
+ sources."schema-utils-3.0.0"
+ sources."semver-7.3.2"
+ ];
+ })
+ sources."postcss-modules-extract-imports-3.0.0"
+ sources."postcss-modules-local-by-default-4.0.0"
+ sources."postcss-modules-scope-3.0.0"
+ sources."postcss-modules-values-4.0.0"
+ sources."postcss-selector-parser-6.0.4"
+ sources."postcss-value-parser-4.1.0"
+ sources."prelude-ls-1.2.1"
+ sources."pretty-error-2.1.2"
+ sources."progress-2.0.3"
+ sources."pump-3.0.0"
+ sources."punycode-2.1.1"
+ sources."randombytes-2.1.0"
+ (sources."read-pkg-2.0.0" // {
+ dependencies = [
+ sources."path-type-2.0.0"
+ sources."pify-2.3.0"
+ ];
+ })
+ sources."read-pkg-up-2.0.0"
+ sources."readable-stream-3.6.0"
+ sources."readdirp-3.5.0"
+ sources."rechoir-0.7.0"
+ sources."reduce-flatten-2.0.0"
+ sources."regenerate-1.4.2"
+ sources."regenerate-unicode-properties-8.2.0"
+ sources."regenerator-runtime-0.13.7"
+ sources."regenerator-transform-0.14.5"
+ sources."regexpp-3.1.0"
+ sources."regexpu-core-4.7.1"
+ sources."regextras-0.7.1"
+ sources."regjsgen-0.5.2"
+ (sources."regjsparser-0.6.4" // {
+ dependencies = [
+ sources."jsesc-0.5.0"
+ ];
+ })
+ sources."relateurl-0.2.7"
+ (sources."renderkid-2.0.4" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ sources."strip-ansi-3.0.1"
+ ];
+ })
+ sources."resolve-1.19.0"
+ (sources."resolve-cwd-3.0.0" // {
+ dependencies = [
+ sources."resolve-from-5.0.0"
+ ];
+ })
+ sources."resolve-from-4.0.0"
+ sources."rimraf-2.6.3"
+ sources."safe-buffer-5.1.2"
+ sources."sass-1.29.0"
+ (sources."sass-loader-10.1.0" // {
+ dependencies = [
+ sources."loader-utils-2.0.0"
+ sources."schema-utils-3.0.0"
+ sources."semver-7.3.2"
+ ];
+ })
+ sources."schema-utils-2.7.1"
+ sources."semver-5.7.1"
+ sources."serialize-javascript-5.0.1"
+ sources."shebang-command-2.0.0"
+ sources."shebang-regex-3.0.0"
+ sources."signal-exit-3.0.3"
+ sources."slice-ansi-2.1.0"
+ sources."source-list-map-2.0.1"
+ sources."source-map-0.5.7"
+ (sources."source-map-support-0.5.19" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ 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."sprintf-js-1.0.3"
+ (sources."string-width-3.1.0" // {
+ dependencies = [
+ sources."ansi-regex-4.1.0"
+ sources."strip-ansi-5.2.0"
+ ];
+ })
+ sources."string.prototype.trimend-1.0.3"
+ sources."string.prototype.trimstart-1.0.3"
+ (sources."string_decoder-1.3.0" // {
+ dependencies = [
+ sources."safe-buffer-5.2.1"
+ ];
+ })
+ sources."strip-ansi-6.0.0"
+ sources."strip-bom-3.0.0"
+ sources."strip-final-newline-2.0.0"
+ sources."strip-json-comments-3.1.1"
+ sources."supports-color-5.5.0"
+ sources."table-5.4.6"
+ sources."table-layout-1.0.1"
+ sources."tapable-1.1.3"
+ (sources."terser-4.8.0" // {
+ dependencies = [
+ sources."commander-2.20.3"
+ sources."source-map-0.6.1"
+ ];
+ })
+ (sources."terser-webpack-plugin-5.0.3" // {
+ dependencies = [
+ sources."commander-2.20.3"
+ sources."p-limit-3.0.2"
+ sources."p-try-2.2.0"
+ sources."schema-utils-3.0.0"
+ sources."source-map-0.6.1"
+ (sources."terser-5.5.0" // {
+ dependencies = [
+ sources."source-map-0.7.3"
+ ];
+ })
+ ];
+ })
+ sources."text-table-0.2.0"
+ sources."to-fast-properties-2.0.0"
+ sources."to-regex-range-5.0.1"
+ (sources."tsconfig-paths-3.9.0" // {
+ dependencies = [
+ sources."json5-1.0.1"
+ ];
+ })
+ sources."tslib-1.14.1"
+ sources."type-check-0.4.0"
+ sources."type-fest-0.8.1"
+ sources."typical-5.2.0"
+ sources."unicode-canonical-property-names-ecmascript-1.0.4"
+ sources."unicode-match-property-ecmascript-1.0.4"
+ sources."unicode-match-property-value-ecmascript-1.2.0"
+ sources."unicode-property-aliases-ecmascript-1.1.0"
+ sources."uniq-1.0.1"
+ sources."uri-js-4.4.0"
+ sources."util-deprecate-1.0.2"
+ sources."util.promisify-1.0.0"
+ sources."utila-0.4.0"
+ sources."v8-compile-cache-2.2.0"
+ sources."validate-npm-package-license-3.0.4"
+ sources."vfile-location-3.2.0"
+ sources."watchpack-2.0.1"
+ (sources."webpack-5.6.0" // {
+ dependencies = [
+ sources."acorn-8.0.4"
+ sources."eslint-scope-5.1.1"
+ sources."find-up-4.1.0"
+ sources."locate-path-5.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-4.1.0"
+ sources."p-try-2.2.0"
+ sources."path-exists-4.0.0"
+ sources."pkg-dir-4.2.0"
+ sources."schema-utils-3.0.0"
+ sources."source-map-0.6.1"
+ sources."tapable-2.1.1"
+ sources."webpack-sources-2.2.0"
+ ];
+ })
+ (sources."webpack-cli-4.2.0" // {
+ dependencies = [
+ sources."commander-6.2.0"
+ ];
+ })
+ sources."webpack-merge-4.2.2"
+ (sources."webpack-sources-1.4.3" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ sources."which-2.0.2"
+ sources."word-wrap-1.2.3"
+ sources."wordwrapjs-4.0.0"
+ sources."wrappy-1.0.2"
+ sources."write-1.0.3"
+ sources."yaml-1.10.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ homepage = "https://github.com/azlux/botamusique#readme";
+ license = "MIT";
+ };
+ production = false;
+ bypassCache = true;
+ reconstructLock = false;
+ };
+in
+{
+ args = args;
+ sources = sources;
+ tarball = nodeEnv.buildNodeSourceDist args;
+ package = nodeEnv.buildNodePackage args;
+ shell = nodeEnv.buildNodeShell args;
+ nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
+ src = stdenv.mkDerivation {
+ name = args.name + "-package-json";
+ src = nix-gitignore.gitignoreSourcePure [
+ "*"
+ "!package.json"
+ "!package-lock.json"
+ ] args.src;
+ dontBuild = true;
+ installPhase = "mkdir -p $out; cp -r ./* $out;";
+ };
+ });
+}
diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/tools/audio/botamusique/src.json
new file mode 100644
index 000000000000..7f63d480a8e4
--- /dev/null
+++ b/pkgs/tools/audio/botamusique/src.json
@@ -0,0 +1,10 @@
+{
+ "url": "https://github.com/azlux/botamusique",
+ "rev": "df38c7dbd6d59c6790cf2364d1f344b7f6f72107",
+ "date": "2021-03-13T15:44:40+08:00",
+ "path": "/nix/store/30ds4gp7aldj9rqix1xf7j2ps5blrx8w-botamusique",
+ "sha256": "06xw1pif145zcm9z8l9kzl8ayl7vy5ywr0m3a5yswybcp2fzj087",
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch b/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch
new file mode 100644
index 000000000000..3642a034fc88
--- /dev/null
+++ b/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch
@@ -0,0 +1,22 @@
+diff --git a/util.py b/util.py
+index bfec1ed..0546772 100644
+--- a/util.py
++++ b/util.py
+@@ -22,16 +22,7 @@ log = logging.getLogger("bot")
+
+
+ def solve_filepath(path):
+- if not path:
+- return ''
+-
+- if path[0] == '/':
+- return path
+- elif os.path.exists(path):
+- return path
+- else:
+- mydir = os.path.dirname(os.path.realpath(__file__))
+- return mydir + '/' + path
++ return path
+
+
+ def get_recursive_file_list_sorted(path):
diff --git a/pkgs/tools/audio/essentia-extractor/default.nix b/pkgs/tools/audio/essentia-extractor/default.nix
index a02cca6a3d65..63ebbb0ffc0b 100644
--- a/pkgs/tools/audio/essentia-extractor/default.nix
+++ b/pkgs/tools/audio/essentia-extractor/default.nix
@@ -14,13 +14,13 @@ let
arch = arch_table.${stdenv.system};
sha = sha_table.${stdenv.system};
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
pname = "essentia-extractor";
version = "2.1_beta2";
src = fetchurl {
- url =
- "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
+ url = "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
sha256 = sha;
};
diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/tools/audio/midicsv/default.nix
index f02f6ed956d6..cf55e0dd81d5 100644
--- a/pkgs/tools/audio/midicsv/default.nix
+++ b/pkgs/tools/audio/midicsv/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
};
postPatch = ''
- substituteInPlace Makefile --replace /usr/local $out
+ substituteInPlace Makefile \
+ --replace /usr/local $out \
+ --replace gcc "${stdenv.cc.targetPrefix}cc"
'';
meta = with lib; {
@@ -17,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.fourmilab.ch/webtools/midicsv/";
license = licenses.publicDomain;
maintainers = with maintainers; [ orivej ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix
index af4000dfa448..b90ab80befdc 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/pkgs/tools/audio/mpd-mpris/default.nix
@@ -29,6 +29,6 @@ buildGoModule rec {
homepage = "https://github.com/natsukagami/mpd-mpris";
license = licenses.mit;
maintainers = with maintainers; [ doronbehar ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 4b8908448f68..f07b19830de3 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,20 +1,21 @@
-{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }:
+{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }:
python3.pkgs.buildPythonApplication rec {
pname = "borgbackup";
- version = "1.1.15";
+ version = "1.1.16";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9";
+ sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw";
};
nativeBuildInputs = with python3.pkgs; [
+ setuptools-scm
# For building documentation:
sphinx guzzle_sphinx_theme
];
buildInputs = [
- libb2 lz4 zstd openssl python3.pkgs.setuptools_scm
+ libb2 lz4 zstd openssl
] ++ lib.optionals stdenv.isLinux [ acl ];
propagatedBuildInputs = with python3.pkgs; [
cython llfuse
@@ -24,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
export BORG_OPENSSL_PREFIX="${openssl.dev}"
export BORG_LZ4_PREFIX="${lz4.dev}"
export BORG_LIBB2_PREFIX="${libb2}"
- export BORG_LIBZSTD_PREFIX="${zstd}"
+ export BORG_LIBZSTD_PREFIX="${zstd.dev}"
'';
makeWrapperArgs = [
@@ -61,6 +62,10 @@ python3.pkgs.buildPythonApplication rec {
# 64 failures, needs pytest-benchmark
doCheck = false;
+ passthru.tests = {
+ inherit (nixosTests) borgbackup;
+ };
+
meta = with lib; {
description = "Deduplicating archiver with compression and encryption";
homepage = "https://www.borgbackup.org";
diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix
index 708cd85bb298..01722fa90709 100644
--- a/pkgs/tools/backup/monolith/default.nix
+++ b/pkgs/tools/backup/monolith/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "monolith";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "Y2Z";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-kCyfVeGTXBzdwmTTDJM1eaR6ANoIXAydj1ePmrZehqE=";
+ sha256 = "sha256-n89rfZwR8B6SKeLtzmbeHRyw2G9NIQ1BY6JvJuZmC/w=";
};
- cargoSha256 = "sha256-juxaL/zjfqzFMqZe9tpevdjjVU7fPK8zalksAARWHC8=";
+ cargoSha256 = "sha256-RqtJLfBF9hfPh049uyc9K+uNBh+P3VMznuA2UtOwK3M=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix
index d7967c018a26..7f59b0af9444 100644
--- a/pkgs/tools/backup/rsbep/default.nix
+++ b/pkgs/tools/backup/rsbep/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, lib, coreutils, gnused, gawk, fetchurl }:
+{ lib, stdenv, coreutils, gawk, fetchFromGitHub }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "rsbep";
- version = "0.1.0";
+ version = "0.2.0";
- src = fetchurl {
- url = "https://www.thanassis.space/rsbep-0.1.0-ttsiodras.tar.bz2";
- sha256 = "1zji34kc9srxp0h1s1m7k60mvgsir1wrx1n3wc990jszfplr32zc";
+ src = fetchFromGitHub {
+ owner = "ttsiodras";
+ repo = "rsbep-backup";
+ rev = "v${version}";
+ sha256 = "0is4jgil3wdqbvx9h66xcyzbqy84ndyydnnay2g9k81a4mcz4dns";
};
postFixup = ''
@@ -18,20 +20,27 @@ stdenv.mkDerivation {
mv rsbep_chopper $libexecDir
# Fix store dependencies in scripts
- path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gnused gawk ]}"
+ path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gawk ]}"
sed -i "2i$path" freeze.sh
sed -i "2i$path" melt.sh
- substituteInPlace freeze.sh --replace /bin/ls ls
-
# Remove unneded binary
rm poorZFS.py
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ cd $TMP
+ echo hello > input
+ $out/bin/freeze.sh input > packed
+ $out/bin/melt.sh packed > output
+ diff -u input output
+ '';
+
meta = with lib; {
description = "Create resilient backups with Reed-Solomon error correction and byte-spreading";
homepage = "https://www.thanassis.space/rsbep.html";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = [ maintainers.earvstedt ];
};
}
diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix
index 9df7ab7657f1..26768747a46c 100644
--- a/pkgs/tools/cd-dvd/cdi2iso/default.nix
+++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "cdi2iso";
@@ -9,9 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
};
+ postPatch = ''
+ substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
+ '';
+
installPhase = ''
- mkdir -p $out/bin/
- cp cdi2iso $out/bin/
+ mkdir -p $out/bin
+ cp cdi2iso $out/bin
'';
meta = with lib; {
@@ -19,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = "https://sourceforge.net/projects/cdi2iso.berlios";
license = licenses.gpl2;
maintainers = with maintainers; [ hrdinka ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix
index d37cc649d386..ac0879e32172 100644
--- a/pkgs/tools/cd-dvd/uif2iso/default.nix
+++ b/pkgs/tools/cd-dvd/uif2iso/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp";
};
- buildInputs = [unzip zlib];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [zlib];
installPhase = ''
make -C . prefix="$out" install;
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index bfaf359522f4..da37cf9fbd8c 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "bzip2";
- version = "1.0.6.0.1";
+ version = "1.0.6.0.2";
/* We use versions patched to use autotools style properly,
saving lots of trouble. */
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"ftp://ftp.mplayerhq.hu/pub/linux/suse"
"http://ftp.suse.com/pub" # the original patched version but slow
];
- sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c";
+ sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA=";
};
nativeBuildInputs = [ autoreconfHook ];
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "High-quality data compression program";
+ homepage = "https://www.sourceware.org/bzip2";
+ changelog = "https://sourceware.org/git/?p=bzip2.git;a=blob;f=CHANGES;hb=HEAD";
license = licenses.bsdOriginal;
platforms = platforms.all;
maintainers = with maintainers; [ mic92 ];
diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix
index 9e6f95aecb8e..07b6a5979a4f 100644
--- a/pkgs/tools/compression/dejsonlz4/default.nix
+++ b/pkgs/tools/compression/dejsonlz4/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
- gcc -Wall -o dejsonlz4 src/dejsonlz4.c src/lz4.c
+ ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c
'';
installPhase = ''
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/avih/dejsonlz4";
license = licenses.bsd2;
maintainers = with maintainers; [ mt-caret ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 91d59a4de0f8..6c4f2f6e854e 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, pythonPackages
+{ lib, fetchurl, python2Packages
, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield
, bzip2, xz, lzip
# unzip is handled by p7zip
@@ -11,7 +11,7 @@ let
++ lib.optional (unrarSupport) unrar
++ [ bzip2 xz lzip ]);
-in pythonPackages.buildPythonApplication rec {
+in python2Packages.buildPythonApplication rec {
pname = "dtrx";
version = "7.1";
@@ -24,6 +24,17 @@ in pythonPackages.buildPythonApplication rec {
wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}"
'';
+ checkPhase = ''
+ python2 tests/compare.py
+ '';
+
+ checkInputs = with python2Packages; [
+ pyyaml
+ ];
+
+ # custom test suite fails
+ doCheck = false;
+
meta = with lib; {
description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
homepage = "https://brettcsmith.org/2007/dtrx/";
diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix
index 78ce2d39f092..9f4f66521f66 100644
--- a/pkgs/tools/compression/lrzip/default.nix
+++ b/pkgs/tools/compression/lrzip/default.nix
@@ -1,12 +1,12 @@
{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}:
stdenv.mkDerivation rec {
- version = "0.640";
+ version = "0.641";
pname = "lrzip";
src = fetchurl {
url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz";
- sha256 = "175466drfpz8rsfr0pzfn5rqrj3wmcmcs3i2sfmw366w2kbjm4j9";
+ sha256 = "0ziyanspd96dc3lp2qdcylc7aq8dhb511jhqrhxvlp502fjqjqrc";
};
buildInputs = [ zlib lzo bzip2 lz4 nasm perl ];
diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh
deleted file mode 100644
index 03db413181d7..000000000000
--- a/pkgs/tools/compression/zdelta/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-installPhase() {
- mkdir -p $out/bin
- cp -p zdc zdu $out/bin
-}
-
-genericBuild
diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix
index 46760c913060..b30a43f33c13 100644
--- a/pkgs/tools/compression/zdelta/default.nix
+++ b/pkgs/tools/compression/zdelta/default.nix
@@ -1,16 +1,24 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "zdelta-2.1";
- builder = ./builder.sh;
+ pname = "zdelta";
+ version = "2.1";
+
src = fetchurl {
- url = "${meta.homepage}/downloads/${name}.tar.gz";
- sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3";
+ url = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/downloads/zdelta-2.1.tar.gz";
+ sha256 = "sha256-WiQKWxJkINIwRBcdiuVLMDiupQ8gOsiXOEZvHDa5iFg=";
};
+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -p zdc zdu $out/bin
+ '';
+
meta = with lib; {
- homepage = "http://cis.poly.edu/zdelta";
- platforms = platforms.linux;
+ homepage = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/";
+ platforms = platforms.all;
license = licenses.zlib;
};
}
diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix
index adf845f943ea..b5d08770ed78 100644
--- a/pkgs/tools/filesystems/apfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/apfs-fuse/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "apfs-fuse-unstable";
- version = "2019-07-23";
+ version = "2020-09-28";
src = fetchFromGitHub {
owner = "sgan81";
repo = "apfs-fuse";
- rev = "309ecb030f38edac4c10fa741a004c5eb7a23e15";
- sha256 = "0wq6rlqi00m5dp5gbzy65i1plm40j6nsm7938zvfgx5laal4wzr2";
+ rev = "ee71aa5c87c0831c1ae17048951fe9cd7579c3db";
+ sha256 = "0wvsx708km1lnhghny5y69k694x0zy8vlbndswkb7sq81j1r6kwx";
fetchSubmodules = true;
};
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = with lib; {
homepage = "https://github.com/sgan81/apfs-fuse";
description = "FUSE driver for APFS (Apple File System)";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ ealasu ];
platforms = platforms.linux;
};
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 44c5e5d0fe3b..12052100db32 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fuse, pkg-config, osxfuse }:
+{ lib, stdenv, fetchurl, fuse, pkg-config }:
stdenv.mkDerivation rec {
version = "1.15.1";
@@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = if stdenv.isDarwin
- then [ osxfuse ]
- else [ fuse ];
+ buildInputs = [ fuse ];
postFixup = ''
ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs
'';
diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix
index 6c101dbc9c0e..be9349daa27c 100644
--- a/pkgs/tools/filesystems/catcli/default.nix
+++ b/pkgs/tools/filesystems/catcli/default.nix
@@ -7,13 +7,13 @@
buildPythonApplication rec {
pname = "catcli";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "deadc0de6";
repo = pname;
rev = "v${version}";
- sha256 = "1k5xjz353ry0vbmq1ql7brb9g4wwsijzix2zh5zpd768xl8nc1z8";
+ sha256 = "0704022gbm987q6x6vcflq4b4p4hvcqm5ikiyndy5n8fj1q8lq95";
};
propagatedBuildInputs = [ docopt anytree ];
@@ -25,6 +25,6 @@ buildPythonApplication rec {
homepage = "https://github.com/deadc0de6/catcli";
license = licenses.gpl3;
maintainers = with maintainers; [ petersjt014 ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix
index 2aa63208e008..a439e29358f7 100644
--- a/pkgs/tools/filesystems/cpcfs/default.nix
+++ b/pkgs/tools/filesystems/cpcfs/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/derikz/cpcfs/" ;
license = licenses.bsd2;
maintainers = [ ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix
index 3777c4e7cb16..eec257c44b73 100644
--- a/pkgs/tools/filesystems/cryfs/default.nix
+++ b/pkgs/tools/filesystems/cryfs/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
-, cmake, pkg-config, python, gtest
+, cmake, pkg-config, python3, gtest
, boost, cryptopp, curl, fuse, openssl
}:
@@ -44,9 +44,11 @@ stdenv.mkDerivation rec {
--replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)"
'';
- nativeBuildInputs = [ cmake gtest pkg-config python ];
+ nativeBuildInputs = [ cmake pkg-config python3 ];
- buildInputs = [ boost cryptopp curl fuse openssl ];
+ strictDeps = true;
+
+ buildInputs = [ boost cryptopp curl fuse openssl gtest ];
cmakeFlags = [
"-DCRYFS_UPDATE_CHECKS:BOOL=FALSE"
diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 5522b63922a4..3631e52d87d1 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-lus+1hkc4GxrTxtdfDJ0XqJp37dcjKp4/sI3CEh8cYA=";
+ sha256 = "sha256-/gdmrQhYsE4a/1sxtJ5IfVUWjh08wTVrOr4V7Fkn1i0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
index 12a0af7ea4d3..0b7ae339053c 100644
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/cpcsdk/idsk" ;
license = licenses.mit;
maintainers = [ ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix b/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix
index 9185faedc07f..8fa2bc7a0101 100644
--- a/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix
+++ b/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix
@@ -5,8 +5,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/rschroll/rmfuse.git";
- rev = "ac91d477cc32311c88aa7ecd1bebd6503e426ae7";
- sha256 = "129n00hricsf4jkgj39bq3m5nhvy4d4yg7mcvrcgwb2546wcix0n";
+ rev = "fca03bcdd6dc118f2ba981410ec9dff7f7cb88ec";
+ sha256 = "0i7dvvi2bp3hydjpzvr7vg10bx0wxz87spf7pg455aga8d0qhxgk";
};
}
);
diff --git a/pkgs/tools/filesystems/rmfuse/poetry.lock b/pkgs/tools/filesystems/rmfuse/poetry.lock
index a97b89181fb7..920fbddd0b63 100644
--- a/pkgs/tools/filesystems/rmfuse/poetry.lock
+++ b/pkgs/tools/filesystems/rmfuse/poetry.lock
@@ -1,10 +1,10 @@
[[package]]
-category = "main"
-description = "High level compatibility layer for multiple asynchronous event loop implementations"
name = "anyio"
+version = "2.2.0"
+description = "High level compatibility layer for multiple asynchronous event loop implementations"
+category = "main"
optional = false
python-versions = ">=3.6.2"
-version = "2.1.0"
[package.dependencies]
idna = ">=2.8"
@@ -13,16 +13,16 @@ sniffio = ">=1.1"
[package.extras]
curio = ["curio (>=1.4)"]
doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"]
-test = ["coverage (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "trustme", "uvloop"]
+test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "trustme", "uvloop (<0.15)", "uvloop (>=0.15)"]
trio = ["trio (>=0.16)"]
[[package]]
-category = "main"
-description = "asks - async http"
name = "asks"
+version = "2.4.12"
+description = "asks - async http"
+category = "main"
optional = false
python-versions = ">= 3.6.2"
-version = "2.4.12"
[package.dependencies]
anyio = ">=2.0,<3.0"
@@ -30,34 +30,34 @@ async_generator = "*"
h11 = "*"
[[package]]
-category = "main"
-description = "Async generators and context managers for Python 3.5+"
name = "async-generator"
+version = "1.10"
+description = "Async generators and context managers for Python 3.5+"
+category = "main"
optional = false
python-versions = ">=3.5"
-version = "1.10"
[[package]]
-category = "main"
-description = "Classes Without Boilerplate"
name = "attrs"
+version = "20.3.0"
+description = "Classes Without Boilerplate"
+category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "20.3.0"
[package.extras]
-dev = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"]
docs = ["furo", "sphinx", "zope.interface"]
-tests = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
-tests_no_zope = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"]
[[package]]
-category = "main"
-description = "The bidirectional mapping library for Python."
name = "bidict"
+version = "0.21.2"
+description = "The bidirectional mapping library for Python."
+category = "main"
optional = false
python-versions = ">=3.6"
-version = "0.21.2"
[package.extras]
coverage = ["coverage (<6)", "pytest-cov (<3)"]
@@ -67,23 +67,23 @@ precommit = ["pre-commit (<3)"]
test = ["hypothesis (<6)", "py (<2)", "pytest (<7)", "pytest-benchmark (>=3.2.0,<4)", "sortedcollections (<2)", "sortedcontainers (<3)", "Sphinx (<4)", "sphinx-autodoc-typehints (<2)"]
[[package]]
-category = "main"
-description = "Foreign Function Interface for Python calling C code."
name = "cffi"
+version = "1.14.5"
+description = "Foreign Function Interface for Python calling C code."
+category = "main"
optional = false
python-versions = "*"
-version = "1.14.5"
[package.dependencies]
pycparser = "*"
[[package]]
-category = "main"
-description = "cssselect2"
name = "cssselect2"
+version = "0.4.1"
+description = "cssselect2"
+category = "main"
optional = false
python-versions = ">=3.6"
-version = "0.4.1"
[package.dependencies]
tinycss2 = "*"
@@ -94,28 +94,28 @@ doc = ["sphinx", "sphinx-rtd-theme"]
test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"]
[[package]]
-category = "main"
-description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
name = "h11"
+version = "0.12.0"
+description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
+category = "main"
optional = false
python-versions = ">=3.6"
-version = "0.12.0"
[[package]]
-category = "main"
-description = "Internationalized Domain Names in Applications (IDNA)"
name = "idna"
+version = "3.1"
+description = "Internationalized Domain Names in Applications (IDNA)"
+category = "main"
optional = false
python-versions = ">=3.4"
-version = "3.1"
[[package]]
-category = "main"
-description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
name = "lxml"
+version = "4.6.2"
+description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
+category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*"
-version = "4.6.2"
[package.extras]
cssselect = ["cssselect (>=0.7)"]
@@ -124,69 +124,72 @@ htmlsoup = ["beautifulsoup4"]
source = ["Cython (>=0.29.7)"]
[[package]]
-category = "main"
-description = "Capture the outcome of Python function calls."
name = "outcome"
+version = "1.1.0"
+description = "Capture the outcome of Python function calls."
+category = "main"
optional = false
python-versions = ">=3.6"
-version = "1.1.0"
[package.dependencies]
attrs = ">=19.2.0"
[[package]]
-category = "main"
-description = "PDF file reader/writer library"
name = "pdfrw"
+version = "0.4"
+description = "PDF file reader/writer library"
+category = "main"
optional = false
python-versions = "*"
-version = "0.4"
[[package]]
-category = "main"
-description = "Python Imaging Library (Fork)"
name = "pillow"
+version = "8.1.2"
+description = "Python Imaging Library (Fork)"
+category = "main"
optional = false
python-versions = ">=3.6"
-version = "8.1.0"
[[package]]
-category = "main"
-description = "C parser in Python"
name = "pycparser"
+version = "2.20"
+description = "C parser in Python"
+category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.20"
[[package]]
-category = "main"
-description = "Python 3 bindings for libfuse 3 with async I/O support"
name = "pyfuse3"
+version = "3.2.0"
+description = "Python 3 bindings for libfuse 3 with async I/O support"
+category = "main"
optional = false
python-versions = ">=3.5"
-version = "3.2.0"
[package.dependencies]
trio = ">=0.15"
[[package]]
-category = "main"
-description = "The Reportlab Toolkit"
name = "reportlab"
+version = "3.5.65"
+description = "The Reportlab Toolkit"
+category = "main"
optional = false
-python-versions = "*"
-version = "3.5.59"
+python-versions = ">=2.7, >=3.6, <4"
[package.dependencies]
pillow = ">=4.0.0"
+[package.extras]
+rlpycairo = ["rlPyCairo (>=0.0.5)"]
+
[[package]]
-category = "main"
-description = "reMarkable Cloud Library"
name = "rmcl"
+version = "0.4.0"
+description = "reMarkable Cloud Library"
+category = "main"
optional = false
python-versions = ">=3.7,<4.0"
-version = "0.3.1"
[package.dependencies]
asks = ">=2.4.12,<3.0.0"
@@ -194,30 +197,38 @@ trio = ">=0.18.0,<0.19.0"
xdg = ">=5.0.1,<6.0.0"
[[package]]
-category = "main"
-description = ""
name = "rmfuse"
+version = "0.2.1"
+description = ""
+category = "main"
optional = false
python-versions = "^3.7"
-version = "0.1.1"
+develop = false
[package.dependencies]
bidict = "^0.21.2"
-pyfuse3 = "^3.2.0"
-rmcl = "^0.3.1"
-rmrl = "^0.1.2"
+pyfuse3 = {version = "^3.2.0", optional = true}
+rmcl = "^0.4.0"
+rmrl = "^0.2.1"
+xdg = "^5.0.1"
+
+[package.extras]
+pyfuse3 = ["pyfuse3 (>=3.2.0,<4.0.0)"]
+llfuse = ["llfuse (>=1.4.1,<2.0.0)"]
[package.source]
-reference = "ac91d477cc32311c88aa7ecd1bebd6503e426ae7"
type = "git"
url = "https://github.com/rschroll/rmfuse.git"
+reference = "master"
+resolved_reference = "fca03bcdd6dc118f2ba981410ec9dff7f7cb88ec"
+
[[package]]
-category = "main"
-description = "Render reMarkable documents to PDF"
name = "rmrl"
+version = "0.2.1"
+description = "Render reMarkable documents to PDF"
+category = "main"
optional = false
python-versions = ">=3.7,<4.0"
-version = "0.1.2"
[package.dependencies]
pdfrw = ">=0.4,<0.5"
@@ -226,28 +237,28 @@ svglib = ">=1.0.1,<2.0.0"
xdg = ">=5.0.1,<6.0.0"
[[package]]
-category = "main"
-description = "Sniff out which async library your code is running under"
name = "sniffio"
+version = "1.2.0"
+description = "Sniff out which async library your code is running under"
+category = "main"
optional = false
python-versions = ">=3.5"
-version = "1.2.0"
[[package]]
-category = "main"
-description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set"
name = "sortedcontainers"
+version = "2.3.0"
+description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set"
+category = "main"
optional = false
python-versions = "*"
-version = "2.3.0"
[[package]]
-category = "main"
-description = "A pure-Python library for reading and converting SVG"
name = "svglib"
+version = "1.0.1"
+description = "A pure-Python library for reading and converting SVG"
+category = "main"
optional = false
python-versions = ">=3"
-version = "1.0.1"
[package.dependencies]
cssselect2 = ">=0.2.0"
@@ -256,12 +267,12 @@ reportlab = "*"
tinycss2 = ">=0.6.0"
[[package]]
-category = "main"
-description = "tinycss2"
name = "tinycss2"
+version = "1.1.0"
+description = "tinycss2"
+category = "main"
optional = false
python-versions = ">=3.6"
-version = "1.1.0"
[package.dependencies]
webencodings = ">=0.4"
@@ -271,47 +282,47 @@ doc = ["sphinx", "sphinx-rtd-theme"]
test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"]
[[package]]
-category = "main"
-description = "A friendly Python library for async concurrency and I/O"
name = "trio"
+version = "0.18.0"
+description = "A friendly Python library for async concurrency and I/O"
+category = "main"
optional = false
python-versions = ">=3.6"
-version = "0.18.0"
[package.dependencies]
async-generator = ">=1.9"
attrs = ">=19.2.0"
-cffi = ">=1.14"
+cffi = {version = ">=1.14", markers = "os_name == \"nt\" and implementation_name != \"pypy\""}
idna = "*"
outcome = "*"
sniffio = "*"
sortedcontainers = "*"
[[package]]
-category = "main"
-description = "Character encoding aliases for legacy web content"
name = "webencodings"
+version = "0.5.1"
+description = "Character encoding aliases for legacy web content"
+category = "main"
optional = false
python-versions = "*"
-version = "0.5.1"
[[package]]
-category = "main"
-description = "Variables defined by the XDG Base Directory Specification"
name = "xdg"
+version = "5.0.1"
+description = "Variables defined by the XDG Base Directory Specification"
+category = "main"
optional = false
python-versions = ">=3.6,<4.0"
-version = "5.0.1"
[metadata]
-content-hash = "df8dfb527656dec034712b2d07aaacfdee20f89f635d38af52bb21888d7d4130"
-lock-version = "1.0"
+lock-version = "1.1"
python-versions = "^3.8"
+content-hash = "3da90f3013f1220c9081c0a11dac7d8cd05c5a47ebda40fbb4357e44503e99a3"
[metadata.files]
anyio = [
- {file = "anyio-2.1.0-py3-none-any.whl", hash = "sha256:c286818ccd5dcbd5d385b223f16a055393474527b1d5650da489828a9887d559"},
- {file = "anyio-2.1.0.tar.gz", hash = "sha256:8a56e08623dc55955a06719d4ad62de6009bb3f1dd04936e60b2104dd58da484"},
+ {file = "anyio-2.2.0-py3-none-any.whl", hash = "sha256:aa3da546ed17f097ca876c78024dea380a3b7fa80759abfdda59f12176a3dac8"},
+ {file = "anyio-2.2.0.tar.gz", hash = "sha256:4a41c5b3a65ed92e469d51b6fba3779301850ea2e352afcf9e36c46f21ee14a9"},
]
asks = [
{file = "asks-2.4.12.tar.gz", hash = "sha256:38de944eb350e7e4e3a918055fa8ff033da5f7b5ff385c1160a2d6b9d84783b0"},
@@ -427,38 +438,39 @@ pdfrw = [
{file = "pdfrw-0.4.tar.gz", hash = "sha256:0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4"},
]
pillow = [
- {file = "Pillow-8.1.0-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:d355502dce85ade85a2511b40b4c61a128902f246504f7de29bbeec1ae27933a"},
- {file = "Pillow-8.1.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:93a473b53cc6e0b3ce6bf51b1b95b7b1e7e6084be3a07e40f79b42e83503fbf2"},
- {file = "Pillow-8.1.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2353834b2c49b95e1313fb34edf18fca4d57446675d05298bb694bca4b194174"},
- {file = "Pillow-8.1.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:1d208e670abfeb41b6143537a681299ef86e92d2a3dac299d3cd6830d5c7bded"},
- {file = "Pillow-8.1.0-cp36-cp36m-win32.whl", hash = "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d"},
- {file = "Pillow-8.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:b09e10ec453de97f9a23a5aa5e30b334195e8d2ddd1ce76cc32e52ba63c8b31d"},
- {file = "Pillow-8.1.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:b02a0b9f332086657852b1f7cb380f6a42403a6d9c42a4c34a561aa4530d5234"},
- {file = "Pillow-8.1.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:ca20739e303254287138234485579b28cb0d524401f83d5129b5ff9d606cb0a8"},
- {file = "Pillow-8.1.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:604815c55fd92e735f9738f65dabf4edc3e79f88541c221d292faec1904a4b17"},
- {file = "Pillow-8.1.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cf6e33d92b1526190a1de904df21663c46a456758c0424e4f947ae9aa6088bf7"},
- {file = "Pillow-8.1.0-cp37-cp37m-win32.whl", hash = "sha256:47c0d93ee9c8b181f353dbead6530b26980fe4f5485aa18be8f1fd3c3cbc685e"},
- {file = "Pillow-8.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:96d4dc103d1a0fa6d47c6c55a47de5f5dafd5ef0114fa10c85a1fd8e0216284b"},
- {file = "Pillow-8.1.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:7916cbc94f1c6b1301ac04510d0881b9e9feb20ae34094d3615a8a7c3db0dcc0"},
- {file = "Pillow-8.1.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:3de6b2ee4f78c6b3d89d184ade5d8fa68af0848f9b6b6da2b9ab7943ec46971a"},
- {file = "Pillow-8.1.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:cdbbe7dff4a677fb555a54f9bc0450f2a21a93c5ba2b44e09e54fcb72d2bd13d"},
- {file = "Pillow-8.1.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:f50e7a98b0453f39000619d845be8b06e611e56ee6e8186f7f60c3b1e2f0feae"},
- {file = "Pillow-8.1.0-cp38-cp38-win32.whl", hash = "sha256:cb192176b477d49b0a327b2a5a4979552b7a58cd42037034316b8018ac3ebb59"},
- {file = "Pillow-8.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:6c5275bd82711cd3dcd0af8ce0bb99113ae8911fc2952805f1d012de7d600a4c"},
- {file = "Pillow-8.1.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:165c88bc9d8dba670110c689e3cc5c71dbe4bfb984ffa7cbebf1fac9554071d6"},
- {file = "Pillow-8.1.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:5e2fe3bb2363b862671eba632537cd3a823847db4d98be95690b7e382f3d6378"},
- {file = "Pillow-8.1.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7612520e5e1a371d77e1d1ca3a3ee6227eef00d0a9cddb4ef7ecb0b7396eddf7"},
- {file = "Pillow-8.1.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d673c4990acd016229a5c1c4ee8a9e6d8f481b27ade5fc3d95938697fa443ce0"},
- {file = "Pillow-8.1.0-cp39-cp39-win32.whl", hash = "sha256:dc577f4cfdda354db3ae37a572428a90ffdbe4e51eda7849bf442fb803f09c9b"},
- {file = "Pillow-8.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:22d070ca2e60c99929ef274cfced04294d2368193e935c5d6febfd8b601bf865"},
- {file = "Pillow-8.1.0-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:a3d3e086474ef12ef13d42e5f9b7bbf09d39cf6bd4940f982263d6954b13f6a9"},
- {file = "Pillow-8.1.0-pp36-pypy36_pp73-manylinux2010_i686.whl", hash = "sha256:731ca5aabe9085160cf68b2dbef95fc1991015bc0a3a6ea46a371ab88f3d0913"},
- {file = "Pillow-8.1.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:bba80df38cfc17f490ec651c73bb37cd896bc2400cfba27d078c2135223c1206"},
- {file = "Pillow-8.1.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:c3d911614b008e8a576b8e5303e3db29224b455d3d66d1b2848ba6ca83f9ece9"},
- {file = "Pillow-8.1.0-pp37-pypy37_pp73-manylinux2010_i686.whl", hash = "sha256:39725acf2d2e9c17356e6835dccebe7a697db55f25a09207e38b835d5e1bc032"},
- {file = "Pillow-8.1.0-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:81c3fa9a75d9f1afafdb916d5995633f319db09bd773cb56b8e39f1e98d90820"},
- {file = "Pillow-8.1.0-pp37-pypy37_pp73-win32.whl", hash = "sha256:b6f00ad5ebe846cc91763b1d0c6d30a8042e02b2316e27b05de04fa6ec831ec5"},
- {file = "Pillow-8.1.0.tar.gz", hash = "sha256:887668e792b7edbfb1d3c9d8b5d8c859269a0f0eba4dda562adb95500f60dbba"},
+ {file = "Pillow-8.1.2-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:5cf03b9534aca63b192856aa601c68d0764810857786ea5da652581f3a44c2b0"},
+ {file = "Pillow-8.1.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:f91b50ad88048d795c0ad004abbe1390aa1882073b1dca10bfd55d0b8cf18ec5"},
+ {file = "Pillow-8.1.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:5762ebb4436f46b566fc6351d67a9b5386b5e5de4e58fdaa18a1c83e0e20f1a8"},
+ {file = "Pillow-8.1.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:e2cd8ac157c1e5ae88b6dd790648ee5d2777e76f1e5c7d184eaddb2938594f34"},
+ {file = "Pillow-8.1.2-cp36-cp36m-win32.whl", hash = "sha256:72027ebf682abc9bafd93b43edc44279f641e8996fb2945104471419113cfc71"},
+ {file = "Pillow-8.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:d1d6bca39bb6dd94fba23cdb3eeaea5e30c7717c5343004d900e2a63b132c341"},
+ {file = "Pillow-8.1.2-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:90882c6f084ef68b71bba190209a734bf90abb82ab5e8f64444c71d5974008c6"},
+ {file = "Pillow-8.1.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:89e4c757a91b8c55d97c91fa09c69b3677c227b942fa749e9a66eef602f59c28"},
+ {file = "Pillow-8.1.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:8c4e32218c764bc27fe49b7328195579581aa419920edcc321c4cb877c65258d"},
+ {file = "Pillow-8.1.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:a01da2c266d9868c4f91a9c6faf47a251f23b9a862dce81d2ff583135206f5be"},
+ {file = "Pillow-8.1.2-cp37-cp37m-win32.whl", hash = "sha256:30d33a1a6400132e6f521640dd3f64578ac9bfb79a619416d7e8802b4ce1dd55"},
+ {file = "Pillow-8.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:71b01ee69e7df527439d7752a2ce8fb89e19a32df484a308eca3e81f673d3a03"},
+ {file = "Pillow-8.1.2-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:5a2d957eb4aba9d48170b8fe6538ec1fbc2119ffe6373782c03d8acad3323f2e"},
+ {file = "Pillow-8.1.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:87f42c976f91ca2fc21a3293e25bd3cd895918597db1b95b93cbd949f7d019ce"},
+ {file = "Pillow-8.1.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:15306d71a1e96d7e271fd2a0737038b5a92ca2978d2e38b6ced7966583e3d5af"},
+ {file = "Pillow-8.1.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:71f31ee4df3d5e0b366dd362007740106d3210fb6a56ec4b581a5324ba254f06"},
+ {file = "Pillow-8.1.2-cp38-cp38-win32.whl", hash = "sha256:98afcac3205d31ab6a10c5006b0cf040d0026a68ec051edd3517b776c1d78b09"},
+ {file = "Pillow-8.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:328240f7dddf77783e72d5ed79899a6b48bc6681f8d1f6001f55933cb4905060"},
+ {file = "Pillow-8.1.2-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:bead24c0ae3f1f6afcb915a057943ccf65fc755d11a1410a909c1fefb6c06ad1"},
+ {file = "Pillow-8.1.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:81b3716cc9744ffdf76b39afb6247eae754186838cedad0b0ac63b2571253fe6"},
+ {file = "Pillow-8.1.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:63cd413ac52ee3f67057223d363f4f82ce966e64906aea046daf46695e3c8238"},
+ {file = "Pillow-8.1.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:8565355a29655b28fdc2c666fd9a3890fe5edc6639d128814fafecfae2d70910"},
+ {file = "Pillow-8.1.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:1940fc4d361f9cc7e558d6f56ff38d7351b53052fd7911f4b60cd7bc091ea3b1"},
+ {file = "Pillow-8.1.2-cp39-cp39-win32.whl", hash = "sha256:46c2bcf8e1e75d154e78417b3e3c64e96def738c2a25435e74909e127a8cba5e"},
+ {file = "Pillow-8.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:aeab4cd016e11e7aa5cfc49dcff8e51561fa64818a0be86efa82c7038e9369d0"},
+ {file = "Pillow-8.1.2-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:74cd9aa648ed6dd25e572453eb09b08817a1e3d9f8d1bd4d8403d99e42ea790b"},
+ {file = "Pillow-8.1.2-pp36-pypy36_pp73-manylinux2010_i686.whl", hash = "sha256:e5739ae63636a52b706a0facec77b2b58e485637e1638202556156e424a02dc2"},
+ {file = "Pillow-8.1.2-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:903293320efe2466c1ab3509a33d6b866dc850cfd0c5d9cc92632014cec185fb"},
+ {file = "Pillow-8.1.2-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:5daba2b40782c1c5157a788ec4454067c6616f5a0c1b70e26ac326a880c2d328"},
+ {file = "Pillow-8.1.2-pp37-pypy37_pp73-manylinux2010_i686.whl", hash = "sha256:1f93f2fe211f1ef75e6f589327f4d4f8545d5c8e826231b042b483d8383e8a7c"},
+ {file = "Pillow-8.1.2-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:6efac40344d8f668b6c4533ae02a48d52fd852ef0654cc6f19f6ac146399c733"},
+ {file = "Pillow-8.1.2-pp37-pypy37_pp73-win32.whl", hash = "sha256:f36c3ff63d6fc509ce599a2f5b0d0732189eed653420e7294c039d342c6e204a"},
+ {file = "Pillow-8.1.2.tar.gz", hash = "sha256:b07c660e014852d98a00a91adfbe25033898a9d90a8f39beb2437d22a203fc44"},
]
pycparser = [
{file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},
@@ -468,55 +480,44 @@ pyfuse3 = [
{file = "pyfuse3-3.2.0.tar.gz", hash = "sha256:45f0053ad601b03a36e2c283a5271403674245a66a0daf50e3deaab0ea4fa82f"},
]
reportlab = [
- {file = "reportlab-3.5.59-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:1da3d7a35f918cee905facfa94bd00ae6091cadc06dca1b0b31b69ae02d41d1d"},
- {file = "reportlab-3.5.59-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:792efba0c0c6e4ee94f6dc95f305451733ee9230a1c7d51cb8e5301a549e0dfb"},
- {file = "reportlab-3.5.59-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f3d4a1a273dc141e03b72a553c11bc14dd7a27ec7654a071edcf83eb04f004bc"},
- {file = "reportlab-3.5.59-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:e2b4e33fea2ce9d3a14ea39191b169e41eb2ac995274f54ac8fd27519974bce8"},
- {file = "reportlab-3.5.59-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:b1b20208ecdfffd7ca027955c4fe8972b28b30a4b3b80cf25099a08d3b20ed7c"},
- {file = "reportlab-3.5.59-cp27-cp27m-win32.whl", hash = "sha256:5ed00894e0f8281c0b7c0494b4d3067c641fd90c8e5cf933089ec4cc9a48e491"},
- {file = "reportlab-3.5.59-cp27-cp27m-win_amd64.whl", hash = "sha256:85650446538cd2f606ca234634142a7ccd74cb6db7cfec250f76a4242e0f2431"},
- {file = "reportlab-3.5.59-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:79d63ca40231ca3860859b39a92daa5219035ba9553da89a5e1b218550744121"},
- {file = "reportlab-3.5.59-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a0c377bc45e73c3f15f55d7de69fab270d174749d5b454ab0de502b15430ec2a"},
- {file = "reportlab-3.5.59-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:cfa854bea525f8c913cb77e2bda724d94b965a0eb3bcfc4a645a9baa29bb86e2"},
- {file = "reportlab-3.5.59-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:3d7713dddaa8081ed709a1fa2456a43f6a74b0f07d605da8441fd53fef334f69"},
- {file = "reportlab-3.5.59-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:ff547cf4c1de7e104cad1a378431ff81efcb03e90e40871ee686107da5b91442"},
- {file = "reportlab-3.5.59-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19353aead39fc115a4d6c598d6fb9fa26da7e69160a0443ebb49b02903e704e8"},
- {file = "reportlab-3.5.59-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:6f3ad2b1afe99c436563cd436d8693d4a12e2c4bd45f70c7705759ff7837fe53"},
- {file = "reportlab-3.5.59-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:b26d6f416891cef93411d6d478a25db275766081a5fb66368248293ef459f3be"},
- {file = "reportlab-3.5.59-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:dd9687359e466086b9f6fe6d8069034017f8b6ca3080944fae5709767ca6814e"},
- {file = "reportlab-3.5.59-cp36-cp36m-win32.whl", hash = "sha256:b71faf3b6e4d7058e1af1b8afedaf39a962db4a219affc8177009d8244ec10d4"},
- {file = "reportlab-3.5.59-cp36-cp36m-win_amd64.whl", hash = "sha256:4ca5233a19a5ceca23546290f43addec2345789c7d65bb32f8b2668aa148351f"},
- {file = "reportlab-3.5.59-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:9da445cb79e3f740756924c053edc952cde11a65ff5af8acfda3c0a1317136ef"},
- {file = "reportlab-3.5.59-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:07bff6742fba612da8d1b1f783c436338c6fdc6962828159827d5ca7d2b67935"},
- {file = "reportlab-3.5.59-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:52f8237654acbc78ea2fa6fb4a6a06e5b023b6da93f7889adfe2deba09473fad"},
- {file = "reportlab-3.5.59-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:739b743b7ca1ba4b4d64c321de6fccb49b562d0507ea06c817d9cc4faed5cd22"},
- {file = "reportlab-3.5.59-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:33f3cfdc492575f8af3225701301a7e62fc478358729820c9e0091aff5831378"},
- {file = "reportlab-3.5.59-cp37-cp37m-win32.whl", hash = "sha256:3e2b4d69763103b9dc9b54c0952dc3cee05cedd06e28c0987fad7f84705b12c0"},
- {file = "reportlab-3.5.59-cp37-cp37m-win_amd64.whl", hash = "sha256:18a876449c9000c391dd3415ebc8454cd7bb9e488977b894886a2d7d018f16cd"},
- {file = "reportlab-3.5.59-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:04a08d284da86882ec3a41a7c719833362ef891b09ee8e2fbb47cee352aa684a"},
- {file = "reportlab-3.5.59-cp38-cp38-manylinux1_i686.whl", hash = "sha256:83b28104edd58ad65748d2d0e60e0d97e3b91b3e90b4573ea6fe60de6811972c"},
- {file = "reportlab-3.5.59-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9fabd5fbd24f5971085ffe53150d663f158f7d3050b25c95736e29ebf676d454"},
- {file = "reportlab-3.5.59-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:b4ba4c30af7044ee987e61c88a5ffb76031ca0c53666bc85d823b7de55ddbc75"},
- {file = "reportlab-3.5.59-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:a315edef5c5610b0c75790142f49487e89ea34397fc247ae8aa890fe6d6dd057"},
- {file = "reportlab-3.5.59-cp38-cp38-win32.whl", hash = "sha256:5214a289cf01ebbd65e49bae83709671dd9edb601891cf0ae8abf85f3c0b392f"},
- {file = "reportlab-3.5.59-cp38-cp38-win_amd64.whl", hash = "sha256:009fa61710647cdc62eb373345248d8ebb93583a058990f7c4f9be46d90aa5b1"},
- {file = "reportlab-3.5.59-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:09fb11ab1500e679fc1b01199d2fed24435499856e75043a9ac0d31dd48fd881"},
- {file = "reportlab-3.5.59-cp39-cp39-manylinux1_i686.whl", hash = "sha256:18eec161411026dde49767bee4e5e8eeb8014879554811a62581dc7433628d5b"},
- {file = "reportlab-3.5.59-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:a1d3f7022a920d4a5e165d264581f1862e1c1b877ceeabb96fe98cec98125ae5"},
- {file = "reportlab-3.5.59-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:1b85c20e89c22ae902ca973df2afdd2d64d27dc4ffd2b29ebad8c805a213756b"},
- {file = "reportlab-3.5.59-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:de0c675fc2998a7eaa929c356ba49c84f53a892e9ab25e8ee7d8ebbbdcb2ac16"},
- {file = "reportlab-3.5.59-cp39-cp39-win32.whl", hash = "sha256:3b0026c1129147befd4e5a8cf25da8dea1096fce371e7b2412e36d7254019c06"},
- {file = "reportlab-3.5.59-cp39-cp39-win_amd64.whl", hash = "sha256:6191961533d49c9d860964d42bada4d7ac3bb28502d984feb8034093f2012fa8"},
- {file = "reportlab-3.5.59.tar.gz", hash = "sha256:a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536"},
+ {file = "reportlab-3.5.65-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:fd6712a8a6dca12181a3a12316f97810927861e77f2a98029efd2c5cfc8546dc"},
+ {file = "reportlab-3.5.65-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:ee711804acdaf3ea7f0f2cd27f19478af993e730df8c8d923a678eb0e2572fba"},
+ {file = "reportlab-3.5.65-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4c42e85851f969e21fa4d6414587b7544e877ce685e2495d7d422589c70b6281"},
+ {file = "reportlab-3.5.65-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d8fefd07072bfae2715283a821fb1acf8fc4946cf925509d5cc2af791c611809"},
+ {file = "reportlab-3.5.65-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:bdf751289efee4891f4f354ce9122da8de8258a40f328b3f11540c4888363337"},
+ {file = "reportlab-3.5.65-cp36-cp36m-win32.whl", hash = "sha256:f0634740b099b69caed081acd89692996b5504c59f86f39781b6bebc82b267f5"},
+ {file = "reportlab-3.5.65-cp36-cp36m-win_amd64.whl", hash = "sha256:d810bffd4bcd50fdcb2bab0d1fe9ea4e6187ed5237687e41c6ade6c884b00c1e"},
+ {file = "reportlab-3.5.65-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:46745826657d35f86843487f4bc6f6f805f61260428f8ee13642bf6372f9df55"},
+ {file = "reportlab-3.5.65-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:bc62187181582772688d65c557ad6a40a4c3bb8d1f74de463d35ea81983e9b75"},
+ {file = "reportlab-3.5.65-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:58bec163f727c1c60515fc4704a961b3b4ccf2c76b4e6ec1a457ea7ed0c2d756"},
+ {file = "reportlab-3.5.65-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d92834993bf998853a04946729266a3276965e7b13f7423212f1c1abdfc4a1c7"},
+ {file = "reportlab-3.5.65-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:9ec95808b742ce70c1dab28b2c5bef9093816b92315b948419c2c6968658f9cc"},
+ {file = "reportlab-3.5.65-cp37-cp37m-win32.whl", hash = "sha256:b9494986f35d82350b0ce0c29704a49a3945421b789dff92e93fbd3de554fa34"},
+ {file = "reportlab-3.5.65-cp37-cp37m-win_amd64.whl", hash = "sha256:07f9d9c0360cb8fc780ca05264faa68b90583cd28dbdf2cda6bda34379b6e66c"},
+ {file = "reportlab-3.5.65-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:81898de0a0be2c8318468ae0ae1590f828805e9b7fd68e5a50667dce8b942171"},
+ {file = "reportlab-3.5.65-cp38-cp38-manylinux1_i686.whl", hash = "sha256:99aeee49a61c85f1af1087e9e418f3d0c2352c4dd0f0abbfac17ae6c467185aa"},
+ {file = "reportlab-3.5.65-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:3ec70873d99c14570e2a9c44b86c8c01526871e7af5ee4b2855246db15cb0c9f"},
+ {file = "reportlab-3.5.65-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:c12432575c793b8cd8552fddc219bbf2813541c64d02854ae345a108fb875b9d"},
+ {file = "reportlab-3.5.65-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:b2cf692ae7af995b499a31a3f58f2001d98e310e03f74812bcb97a08078239c0"},
+ {file = "reportlab-3.5.65-cp38-cp38-win32.whl", hash = "sha256:f92388e30bf6b5d2eceb3d7b05ee2df856635f74ce7d950a8f45d2b70c685a5b"},
+ {file = "reportlab-3.5.65-cp38-cp38-win_amd64.whl", hash = "sha256:6f007142f2b166f52cbb3e5d23319e3e496c429831e53b904e6db28c3370f279"},
+ {file = "reportlab-3.5.65-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:8707cc21a769150154bf4634dca6e9581ae24a05f0fb81a84fcc1143b1cbbfde"},
+ {file = "reportlab-3.5.65-cp39-cp39-manylinux1_i686.whl", hash = "sha256:27a831da0d17153e33c985bd7a88307e206c5a28778cddb755d5372598d12637"},
+ {file = "reportlab-3.5.65-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fe5d98cdac07dd702bcd49f5723aacdd0af8c84d70fc82a5cc3781e52aedad52"},
+ {file = "reportlab-3.5.65-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:ba2d10f368c9ea1e76c84b3bb6b9982eb5a8f243c434e821c505b75ca8d85852"},
+ {file = "reportlab-3.5.65-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:289539f7888239343ef7ebcd30c55e6204ef78d5f70e1547fdeb854a2da8bfa1"},
+ {file = "reportlab-3.5.65-cp39-cp39-win32.whl", hash = "sha256:cdf8ff72cd6fa9303744c8409fb81ef7720da2e034c369762c2fdf496462179e"},
+ {file = "reportlab-3.5.65-cp39-cp39-win_amd64.whl", hash = "sha256:4a784ecdf3008f533e5a032b96c395e8592ed5e679baaf5ef4dcc136b01c72e9"},
+ {file = "reportlab-3.5.65.tar.gz", hash = "sha256:b2c7eedb4d19db63301c27ad1076086a099fd4c8ca0a6f62f6e9ed749fa5908f"},
]
rmcl = [
- {file = "rmcl-0.3.1-py3-none-any.whl", hash = "sha256:e4ebcc3e6ce7e9efb1dec4a2d0a44c463ef3854d44e1f8919c65a2b3f9312ec7"},
- {file = "rmcl-0.3.1.tar.gz", hash = "sha256:5b5316adf53cca9e56273cad220cb7374cd56e7bac962c943868b05fc090e98c"},
+ {file = "rmcl-0.4.0-py3-none-any.whl", hash = "sha256:d2fc5d183b213797f5886a6af52c5531c87b4e1770cc720e0e8ba5992e728473"},
+ {file = "rmcl-0.4.0.tar.gz", hash = "sha256:14bd199ff2c71269c3c1ac63d10932de6c68a250a454550940dae3f06b07527a"},
]
rmfuse = []
rmrl = [
- {file = "rmrl-0.1.2-py3-none-any.whl", hash = "sha256:173231c7122a11201232ed8fe74e4a9a65192b87886ef8a98ae912aa9b875c26"},
- {file = "rmrl-0.1.2.tar.gz", hash = "sha256:8c8e757af5ca3eb7475f56803f7f37256fe4c5cad3a9ea5ad7534b2ebd172447"},
+ {file = "rmrl-0.2.1-py3-none-any.whl", hash = "sha256:c35b9f20494a6034a16e916d7351575efb3e3f77acabe9094453a7f6013eaa86"},
+ {file = "rmrl-0.2.1.tar.gz", hash = "sha256:c532bef4168350e6ab17cf37c6481dc12b6a78e007c073503f082f36215b71c9"},
]
sniffio = [
{file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"},
diff --git a/pkgs/tools/filesystems/rmfuse/pyproject.toml b/pkgs/tools/filesystems/rmfuse/pyproject.toml
index 1163e308e704..e3f1767b4cfa 100644
--- a/pkgs/tools/filesystems/rmfuse/pyproject.toml
+++ b/pkgs/tools/filesystems/rmfuse/pyproject.toml
@@ -6,7 +6,7 @@ authors = []
[tool.poetry.dependencies]
python = "^3.8"
-rmfuse = {git = "https://github.com/rschroll/rmfuse.git"}
+rmfuse = {git = "https://github.com/rschroll/rmfuse.git", extras = ["pyfuse3"]}
[tool.poetry.dev-dependencies]
diff --git a/pkgs/tools/filesystems/rmfuse/update b/pkgs/tools/filesystems/rmfuse/update
old mode 100644
new mode 100755
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix
index 650fd713a0ed..0a05a683adb1 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/pkgs/tools/filesystems/s3backer/default.nix
@@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
pname = "s3backer";
- version = "1.5.4";
+ version = "1.6.1";
src = fetchFromGitHub {
- sha256 = "1228qlfgz48k9vv72hrz488zg73zls99cppb9vmikc0pzv1xndsx";
+ sha256 = "sha256-67sVT72i8tOMdGH/+Oh1N7Vh/2/qD56ImGWI+tprMOM=";
rev = version;
repo = "s3backer";
owner = "archiecobbs";
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index e80e65303719..95b5b6ab34aa 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, osxfuse }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse }:
stdenv.mkDerivation rec {
pname = "s3fs-fuse";
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k=";
};
- buildInputs = [ curl openssl libxml2 ]
- ++ lib.optionals stdenv.isLinux [ fuse ]
- ++ lib.optionals stdenv.isDarwin [ osxfuse ];
+ buildInputs = [ curl openssl libxml2 fuse ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [
diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix
index 98f8861699f4..3bbff2903bc7 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/pkgs/tools/filesystems/smbnetfs/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "smbnetfs";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchurl {
url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2";
- sha256 = "19x9978k90w9a65lrpsphk7swsq8zkws9jc27q4zbndrm0r2snr0";
+ sha256 = "sha256-6sN7l2n76cP0uvPrZMYaa1mtTyqgXf3culoaxK301WA=";
};
nativeBuildInputs = [ pkg-config autoconf ];
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index 6af582d91a7b..6a34657d3d17 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, fuse, osxfuse }:
+{ lib, stdenv, fetchFromGitHub, cmake, fuse }:
stdenv.mkDerivation rec {
pname = "unionfs-fuse";
@@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
- --replace '/usr/local/include/osxfuse/fuse' '${osxfuse}/include/osxfuse/fuse'
- substituteInPlace src/CMakeLists.txt \
- --replace 'target_link_libraries(unionfs fuse pthread)' 'target_link_libraries(unionfs osxfuse pthread)'
+ --replace '/usr/local/include/osxfuse/fuse' '${fuse}/include/fuse'
'';
nativeBuildInputs = [ cmake ];
- buildInputs = [ (if stdenv.isDarwin then osxfuse else fuse) ];
+ buildInputs = [ fuse ];
# Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
# possible to do:
diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix
index b2cbe58ce96d..3bc87680c52f 100644
--- a/pkgs/tools/games/ajour/default.nix
+++ b/pkgs/tools/games/ajour/default.nix
@@ -34,16 +34,16 @@ let
in rustPlatform.buildRustPackage rec {
pname = "Ajour";
- version = "0.7.2";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "casperstorm";
repo = "ajour";
rev = version;
- sha256 = "052qckag9vzcx6472pyk1324jq4qib0isx33z3m1m4923ydanbcz";
+ sha256 = "sha256-u48U4WGlrSl8T3YF7cjApyjNaUI4YyyHEy0TgJw7r/Y=";
};
- cargoSha256 = "1nsvx445jrycggidnynn9glpjjm5sh8nwsvqwyyd54k9xb4rqgj1";
+ cargoSha256 = "sha256-Hdid70AB4AKtSsQBsr6K/de4nvI3rvghEWIwM7mpRIA=";
nativeBuildInputs = [
autoPatchelfHook
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix
index a0ecdde3826c..b3426722f79f 100644
--- a/pkgs/tools/graphics/blockhash/default.nix
+++ b/pkgs/tools/graphics/blockhash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python, pkg-config, imagemagick, wafHook }:
+{ lib, stdenv, fetchFromGitHub, python2, pkg-config, imagemagick, wafHook }:
stdenv.mkDerivation rec {
pname = "blockhash";
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "0m7ikppl42iicgmwsb7baajmag7v0p1ab06xckifvrr0zm21bq9p";
};
- nativeBuildInputs = [ python pkg-config wafHook ];
+ nativeBuildInputs = [ python2 pkg-config wafHook ];
buildInputs = [ imagemagick ];
+ strictDeps = true;
+
meta = with lib; {
homepage = "http://blockhash.io/";
description = ''
diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix
index 8052434ff0b8..6910f458a17d 100644
--- a/pkgs/tools/graphics/epstool/default.nix
+++ b/pkgs/tools/graphics/epstool/default.nix
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk";
};
+ makeFlags = [
+ "CC=${stdenv.cc.targetPrefix}cc"
+ "CLINK=${stdenv.cc.targetPrefix}cc"
+ "LINK=${stdenv.cc.targetPrefix}cc"
+ ];
+
installPhase = ''
make EPSTOOL_ROOT=$out install
'';
@@ -20,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm";
license = licenses.gpl2;
maintainers = [ maintainers.asppsa ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix
index 4a887688c4f5..decb92615f97 100644
--- a/pkgs/tools/graphics/escrotum/default.nix
+++ b/pkgs/tools/graphics/escrotum/default.nix
@@ -1,9 +1,7 @@
-{ lib, fetchFromGitHub, buildPythonApplication
-, pygtk
-, numpy ? null
+{ lib, python2Packages, fetchFromGitHub
}:
-buildPythonApplication {
+with python2Packages; buildPythonApplication {
name = "escrotum-2019-06-10";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix
index 865e0f141ff0..28deabb98d14 100644
--- a/pkgs/tools/graphics/fgallery/default.nix
+++ b/pkgs/tools/graphics/fgallery/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]);
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]);
installPhase = ''
mkdir -p "$out/bin"
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index 6c9a84710517..977886e90ec9 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -2,9 +2,7 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
-, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }:
-
-assert stdenv.isDarwin -> ApplicationServices != null;
+, yacc, fetchpatch, xorg ? null, ApplicationServices }:
let
inherit (lib) optional optionals optionalString;
diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix
index 8b79e3373a68..30848d7d0dc9 100644
--- a/pkgs/tools/graphics/imgurbash2/default.nix
+++ b/pkgs/tools/graphics/imgurbash2/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A shell script that uploads images to imgur";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
homepage = "https://github.com/ram-on/imgurbash2";
};
diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix
index ae07d0ced2db..5fa2d2639625 100644
--- a/pkgs/tools/graphics/nip2/default.nix
+++ b/pkgs/tools/graphics/nip2/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2,
-fftw, gsl, goffice, libgsf }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2
+, fftw, gsl, goffice, libgsf }:
stdenv.mkDerivation rec {
pname = "nip2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkg-config glib libxml2 flex bison vips
- gnome2.gtk fftw gsl goffice libgsf
+ gtk2 fftw gsl goffice libgsf
];
meta = with lib; {
diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix
index 6201b2d5888e..8350e95188d3 100644
--- a/pkgs/tools/graphics/pdfread/default.nix
+++ b/pkgs/tools/graphics/pdfread/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip python ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ python ];
broken = true; # Not found.
diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix
index cb5a37527bf6..19359698f02e 100644
--- a/pkgs/tools/graphics/spirv-cross/default.nix
+++ b/pkgs/tools/graphics/spirv-cross/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "A tool designed for parsing and converting SPIR-V to other shader languages";
homepage = "https://github.com/KhronosGroup/SPIRV-Cross";
changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/${version}";
- platforms = platforms.linux;
+ platforms = platforms.all;
license = licenses.asl20;
maintainers = with maintainers; [ Flakebi ];
};
diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix
index a4772cad3c49..5f6e655882ab 100644
--- a/pkgs/tools/graphics/structure-synth/default.nix
+++ b/pkgs/tools/graphics/structure-synth/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb";
};
- buildInputs = [ qt4 unzip libGLU ];
- nativeBuildInputs = [ qmake4Hook makeWrapper ];
+ buildInputs = [ qt4 libGLU ];
+ nativeBuildInputs = [ qmake4Hook makeWrapper unzip ];
# Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15:
patches = [ ./gcc47.patch ];
diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
index 6829de9241b4..627445136410 100644
--- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
+++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
maintainers = [ maintainers.gebner ];
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
makeFlags = [ "installpath=$(out)/share/tegaki/models/zinnia/" ];
}
diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix
index 3c51210edc7a..4b5db58c6401 100644
--- a/pkgs/tools/misc/3mux/default.nix
+++ b/pkgs/tools/misc/3mux/default.nix
@@ -1,24 +1,38 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
buildGoModule rec {
pname = "3mux";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "aaronjanse";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-auEMG3txO2JS/2dMFBtEujv9s5I0A80Vwts5kXjH600=";
+ sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag=";
};
- vendorSha256 = "sha256-rcbnyScD2GU1DLY6dTEPgFNXZfgkxXPn5lt6HRqa0d8=";
+ nativeBuildInputs = [ makeWrapper ];
+
+ vendorSha256 = "sha256-tbziQZIA1+b+ZtvA/865c8YQxn+r8HQy6Pqaac2kwcU=";
+
+ # This is a package used for internally testing 3mux. It's meant for
+ # use by 3mux maintainers/contributors only.
+ excludedPackages = [ "fuzz" ];
+
+ # 3mux needs to have itself in the path so users can run `3mux detach`.
+ # This ensures that, while inside 3mux, the binary in the path is the
+ # same version as the 3mux hosting the session. This also allows users
+ # to use 3mux via `nix run nixpkgs#_3mux` (otherwise they'd get "command
+ # not found").
+ postInstall = ''
+ wrapProgram $out/bin/3mux --prefix PATH : $out/bin
+ '';
meta = with lib; {
description = "Terminal multiplexer inspired by i3";
longDescription = ''
- 3mux is a terminal multiplexer with out-of-the-box support for search,
- mouse-controlled scrollback, and i3-like keybindings. Imagine tmux with a
- smaller learning curve and more sane defaults.
+ Terminal multiplexer with out-of-the-box support for search,
+ mouse-controlled scrollback, and i3-like keybindings
'';
homepage = "https://github.com/aaronjanse/3mux";
license = licenses.mit;
diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix
index dbba2193b14c..9493df1c66c4 100644
--- a/pkgs/tools/misc/abduco/default.nix
+++ b/pkgs/tools/misc/abduco/default.nix
@@ -1,23 +1,23 @@
{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }:
-with lib;
-
stdenv.mkDerivation rec {
- name = "abduco-2018-05-16";
+ pname = "abduco";
+ version = "2020-04-30";
src = fetchFromGitHub {
owner = "martanne";
repo = "abduco";
- rev = "8f80aa8044d7ecf0e43a0294a09007d056b20e4c";
- sha256 = "0wqcif633nbgnznn46j0sng9l0wncppw1x1c42f75b4p9hrph203";
+ rev = "8c32909a159aaa9484c82b71f05b7a73321eb491";
+ sha256 = "0a3p8xljhpk7zh203s75248blfir15smgw5jmszwbmdpy4mqzd53";
};
- configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
- preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
+ preBuild = lib.optionalString (conf != null)
+ "cp ${writeText "config.def.h" conf} config.def.h";
+ installFlags = [ "install-completion" ];
CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
- meta = {
+ meta = with lib; {
homepage = "http://brain-dump.org/projects/abduco";
license = licenses.isc;
description = "Allows programs to be run independently from its controlling terminal";
diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix
index 7d8de2c14367..d446a2cf0af6 100644
--- a/pkgs/tools/misc/apparix/default.nix
+++ b/pkgs/tools/misc/apparix/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "Add directory bookmarks, distant listing, and distant editing to the command line";
maintainers = with maintainers; [ lethalman ];
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix
index 2fd93cb33b97..7541281eeb67 100644
--- a/pkgs/tools/misc/bash_unit/default.nix
+++ b/pkgs/tools/misc/bash_unit/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Bash unit testing enterprise edition framework for professionals";
maintainers = with maintainers; [ pamplemousse ];
- platforms = platforms.linux;
+ platforms = platforms.all;
license = licenses.gpl3Plus;
};
}
diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix
index fb62b8be8947..5cd7326d7b17 100644
--- a/pkgs/tools/misc/bbe/default.nix
+++ b/pkgs/tools/misc/bbe/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
description = "A sed-like editor for binary files";
homepage = "http://bbe-.sourceforge.net/";
license = licenses.gpl2Plus;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = [ maintainers.hhm ];
};
}
diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix
index bc3bbc8276dd..099ae294bec9 100644
--- a/pkgs/tools/misc/bcunit/default.nix
+++ b/pkgs/tools/misc/bcunit/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.linphone.org/BC/public/bcunit";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ raskin jluttine ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 1a782661466a..1297b61e7f8c 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
- version = "1.201";
+ version = "1.202";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
- sha256 = "sha256-XVaROIxyNBBFoXf+K1mv4mW8wWozqMcs1cgaWj8L8Q0=";
+ sha256 = "sha256-QXjORfwPxNF9iWF29YcVyT2EAwcR4UQjF4Zv7dPMC9c=";
};
nativeBuildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/boltbrowser/default.nix b/pkgs/tools/misc/boltbrowser/default.nix
new file mode 100644
index 000000000000..29635394954d
--- /dev/null
+++ b/pkgs/tools/misc/boltbrowser/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "boltbrowser";
+ version = "2.0";
+
+ src = fetchFromGitHub {
+ owner = "br0xen";
+ repo = pname;
+ rev = version;
+ sha256 = "17v3pv80dxs285d0b6x772h5cb4f0xg9n5p9jwlir5hjbfn1635i";
+ };
+
+ vendorSha256 = "1x28m72626cchnsasyxips8jaqs0l2p9jhjrdcgws144zm6fz3hv";
+
+ meta = with lib; {
+ description = "CLI Browser for BoltDB files";
+ homepage = "https://github.com/br0xen/boltbrowser";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix
index 4b22e6493a73..2acc8dabbef9 100644
--- a/pkgs/tools/misc/broadlink-cli/default.nix
+++ b/pkgs/tools/misc/broadlink-cli/default.nix
@@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "broadlink-cli";
- version = "0.16.0";
+ version = "0.17.0";
# the tools are available as part of the source distribution from GH but
# not pypi, so we have to fetch them here.
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
owner = "mjg59";
repo = "python-broadlink";
rev = version;
- sha256 = "sha256-fdwy58AopAcDp18APzvYionEbrKfTlH/yFpT1gG5iDs=";
+ sha256 = "sha256-b3A36BdIvyl1RxNO5SyxLIpQmu1UHHekyh6vrFjwpp4=";
};
format = "other";
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index dc1a49a40bf2..372ea2decfee 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "1.8.11";
+ version = "2.0.3";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA=";
+ sha256 = "sha256-kOxA9FtVfS1lFSsV5E1+eGQF7D9C7TzhzLGw2r7LlOY=";
};
- vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY=";
+ vendorSha256 = "sha256-V05cCKQeqw6BEjLIYDeHeDePkA7rs7kjqPCys5eLefA=";
doCheck = false;
diff --git a/pkgs/tools/misc/cicero-tui/default.nix b/pkgs/tools/misc/cicero-tui/default.nix
index e00ceb9517f6..dfc79e208ac1 100644
--- a/pkgs/tools/misc/cicero-tui/default.nix
+++ b/pkgs/tools/misc/cicero-tui/default.nix
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "cicero-tui";
- version = "0.1.4";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "eyeplum";
repo = "cicero-tui";
rev = "v${version}";
- sha256 = "1bz2y37qf9c3fxc73chb42rffdivp5krczhgd9rnwq5r6n6bdgq7";
+ sha256 = "sha256-TNNPTKLO5qjSeCxWb7bB4yV1J4Seu+tBKNs0Oav/pPE=";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
freetype
];
- cargoSha256 = "04359gf9mirczqwh8jv3rf0cc4pp05r8ncqyz0n8r7x5qv77kgcp";
+ cargoSha256 = "sha256-kzU+i5DLmZULdJPURz10URE5sMUG6eQg0pCoEiyfgco=";
meta = with lib; {
description = "Unicode tool with a terminal user interface";
diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix
index 462fc51b2890..6a253a493fc4 100644
--- a/pkgs/tools/misc/code-minimap/default.nix
+++ b/pkgs/tools/misc/code-minimap/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "code-minimap";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "wfxr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8=";
+ sha256 = "sha256-5YNY0MRlKKX6u32Id6J7bIPSHRi44TISoKqpAS9T8ow=";
};
- cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s=";
+ cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw=";
meta = with lib; {
description = "A high performance code minimap render";
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
index a23675fe911f..fac8fbcfee97 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation {
description = "Multi-algo CPUMiner";
homepage = "https://github.com/wolf9466/cpuminer-multi";
license = licenses.gpl2;
- maintainers = [ maintainers.ehmry ];
# does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27
platforms = [ "x86_64-linux" ];
};
diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix
new file mode 100644
index 000000000000..29748f781be3
--- /dev/null
+++ b/pkgs/tools/misc/czkawka/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, glib
+, cairo
+, pango
+, gdk-pixbuf
+, atk
+, gtk3
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "czkawka";
+ version = "3.0.0";
+
+ src = fetchFromGitHub {
+ owner = "qarmin";
+ repo = pname;
+ rev = version;
+ sha256 = "1g5a9ns5lkiyk6hjsh08hgs41538dzj0a4lgn2c5cbad5psl0xa6";
+ };
+
+ cargoSha256 = "11ym2d7crp12w91111s3rv0gklkg2bzlq9g24cws4h7ipi0zfx5h";
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ glib
+ cairo
+ pango
+ gdk-pixbuf
+ atk
+ gtk3
+ ];
+
+ meta = with lib; {
+ description = "A simple, fast and easy to use app to remove unnecessary files from your computer";
+ homepage = "https://github.com/qarmin/czkawka";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ yanganto ];
+ };
+}
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index cbeede0cc305..b2e753342d98 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -16,8 +16,8 @@ in stdenv.mkDerivation rec {
sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
(with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);
preConfigure = ''
diff --git a/pkgs/tools/misc/digitemp/default.nix b/pkgs/tools/misc/digitemp/default.nix
new file mode 100644
index 000000000000..adf23e4bdf5e
--- /dev/null
+++ b/pkgs/tools/misc/digitemp/default.nix
@@ -0,0 +1,53 @@
+{ fetchFromGitHub, lib, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "digitemp";
+ version = "3.7.2";
+
+ src = fetchFromGitHub {
+ owner = "bcl";
+ repo = "digitemp";
+ rev = "v${version}";
+ sha256 = "19zka5fcdxhhginaspak76l984iqq9v2j6qrwvi5mvca7bcj8f72";
+ };
+
+ enableParallelBuilding = true;
+
+ makeFlags = [
+ "LOCK=no"
+ "ds9097"
+ "ds9097u"
+ ];
+
+ installPhase = ''
+ runHook preInstall
+ install -D -m555 -t $out/bin digitemp_*
+ install -D -m444 -t $out/share/doc/${pname} FAQ README
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol";
+ longDescription = ''
+ DigiTemp is a command line application used for reading 1-wire sensors like
+ the DS18S20 temperature sensor, or DS2438 battery monitor. DigiTemp supports
+ the following devices:
+
+ DS18S20 (and older DS1820) Temperature Sensor
+ DS18B20 Temperature Sensor
+ DS1822 Temperature Sensor
+ DS2438 Battery monitor
+ DS2409 1-wire coupler (used in 1-wire hubs)
+ DS2422 Counter
+ DS2423 Counter
+
+ The output format can be customized and all settings are stored in a
+ configuration file (.digitemprc) in the current directory. DigiTemp can
+ repeatedly read the sensors and output to stdout and/or to a logfile.
+ '';
+ homepage = "https://www.digitemp.com";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ zseri ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix
index 3ecb201468a4..737057059938 100644
--- a/pkgs/tools/misc/dijo/default.nix
+++ b/pkgs/tools/misc/dijo/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }:
-let version = "0.2.6"; in
+let version = "0.2.7"; in
rustPlatform.buildRustPackage {
pname = "dijo";
inherit version;
@@ -8,9 +8,9 @@ rustPlatform.buildRustPackage {
owner = "NerdyPepper";
repo = "dijo";
rev = "v${version}";
- sha256 = "sha256-fdPl+3NjgVE2MRopzeN/bxbVP6HaTnyJTGFWsLhlRoQ=";
+ sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE=";
};
- cargoSha256 = "sha256-45YfZWncT7hNiOhlAatpdFdxgBaF83sih67B/DPNHcs=";
+ cargoSha256 = "sha256-3V94bOixYMznkCQu90+E/68Sfl9GvHp9LNxwWwk4xZQ=";
meta = with lib; {
description = "Scriptable, curses-based, digital habit tracker";
diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix
index 80afcb5cd9f4..58f7da84fc00 100644
--- a/pkgs/tools/misc/disfetch/default.nix
+++ b/pkgs/tools/misc/disfetch/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "disfetch";
- version = "1.20";
+ version = "1.21";
src = fetchFromGitHub {
owner = "llathasa-veleth";
repo = "disfetch";
rev = version;
- sha256 = "sha256-P5Sq8ld6pPACHn7iOJ9Uk+zR8ZLxHVvnRyFfkfGGv6I=";
+ sha256 = "sha256-AAfpv1paEnHu1S2B8yC0hyYOj5deKTkCyLGvp6Roz64=";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix
index ecbf298132f6..3e78bc977324 100644
--- a/pkgs/tools/misc/disper/default.nix
+++ b/pkgs/tools/misc/disper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python, xorg, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, python2, xorg, makeWrapper }:
stdenv.mkDerivation rec {
pname = "disper";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ python ];
+ strictDeps = true;
+
+ buildInputs = [ python2 ];
preConfigure = ''
export makeFlags="PREFIX=$out"
diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
index 05dcd36c40ce..b0dc4f1e3df9 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/pkgs/tools/misc/ent/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
# case that happens when the archive doesn't have a subdirectory.
setSourceRoot = "sourceRoot=`pwd`";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 887671b48994..705a8a554c18 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "execline";
- version = "2.7.0.0";
- sha256 = "0kl74yix60msgw8k3shhp9ymm80n91yxxqckixj5qbbhmylpnpqd";
+ version = "2.8.0.0";
+ sha256 = "0vbn4pdazy6x6213vn42k0khcij5bvkbrcfg7nw6inhf8154nx77";
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix
index d096f903bd1a..e9efd66b2f1f 100644
--- a/pkgs/tools/misc/fdtools/default.nix
+++ b/pkgs/tools/misc/fdtools/default.nix
@@ -23,6 +23,9 @@ in stdenv.mkDerivation {
sed -e 's|gcc|$CC|' \
conf-compile/defaults/host_link.sh \
> conf-compile/host_link.sh
+ sed -e 's|gcc|$CC|' \
+ conf-compile/defaults/host_compile.sh \
+ > conf-compile/host_compile.sh
echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \
> conf-compile/depend_skalibs_sysdeps
@@ -73,7 +76,7 @@ in stdenv.mkDerivation {
homepage = "https://code.dogmap.org./fdtools/";
description = "A set of utilities for working with file descriptors";
license = lib.licenses.gpl2;
- platforms = lib.platforms.all;
+ platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.Profpatsch ];
};
}
diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix
index e53c51c33e94..e9286e6a11e9 100644
--- a/pkgs/tools/misc/fet-sh/default.nix
+++ b/pkgs/tools/misc/fet-sh/default.nix
@@ -2,26 +2,28 @@
stdenvNoCC.mkDerivation rec {
pname = "fet-sh";
- version = "1.8";
+ version = "1.9";
src = fetchFromGitHub {
owner = "6gk";
repo = "fet.sh";
rev = "v${version}";
- sha256 = "1czjsyagwzbf8l023l1saz9ssb1hc245a64nfwc8wl0cn4h9byky";
+ sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E=";
};
- dontBuild = true;
+ postPatch = ''
+ patchShebangs fet.sh
+ '';
installPhase = ''
- install -m755 -D ./fet.sh $out/bin/fet.sh
+ install -m755 -D fet.sh $out/bin/fet.sh
'';
meta = with lib; {
- description = "A fetch written in posix shell without any external commands (linux only)";
+ description = "A fetch written in posix shell without any external commands";
homepage = "https://github.com/6gk/fet.sh";
license = licenses.isc;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ elkowar ];
};
diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix
index f91acbf264a5..c6bd2c53844c 100644
--- a/pkgs/tools/misc/gams/default.nix
+++ b/pkgs/tools/misc/gams/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297";
};
unpackCmd = "unzip $src";
- buildInputs = [ unzip file ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ file ];
dontBuild = true;
installPhase = ''
diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix
index bba1bd65a54d..15dc34cd5267 100644
--- a/pkgs/tools/misc/git-fire/default.nix
+++ b/pkgs/tools/misc/git-fire/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
'';
homepage = "https://github.com/qw3rtman/git-fire";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = [ maintainers.swflint ];
};
}
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index 56f9452db7b7..88d62b896df7 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "git-town";
- version = "7.4.0";
+ version = "7.5.0";
goPackagePath = "github.com/git-town/git-town";
src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
rev = "v${version}";
- sha256 = "05s2hp4xn0bs3y6rgqkpgz0k8q8yfpwkw5m8vwim95hk6n41ps18";
+ sha256 = "sha256-RmLDlTK+JO2KRLuLvO927W3WYdDlteBIpgTgDXh8lC8=";
};
buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ];
diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix
new file mode 100644
index 000000000000..1fcaf3a47119
--- /dev/null
+++ b/pkgs/tools/misc/github-backup/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, python3
+, git
+, git-lfs
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "github-backup";
+ version = "0.39.0";
+
+ src = python3.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "71829df4bdbe5bd55c324a97008405a6b4c6113edb1a2a6a8b73a7059fe64a47";
+ };
+
+ makeWrapperArgs = [
+ "--prefix" "PATH" ":" (lib.makeBinPath [ git git-lfs ])
+ ];
+
+ # has no unit tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Backup a github user or organization";
+ homepage = "https://github.com/josegonzalez/python-github-backup";
+ changelog = "https://github.com/josegonzalez/python-github-backup/blob/${version}/CHANGES.rst";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index b164c8c0ae0a..d4c0c6e21437 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.159.0";
+ version = "0.160.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-02uM37tulJ78IwOAqXm5Ym30kHVepnMBVg+eTMj34qQ=";
+ sha256 = "sha256-XrZlDYHGexBGxEhpFVjovUYE9Cpu/QaYp11JmBnqT8o=";
};
- vendorSha256 = "sha256-whcHI/qkNBPYcR5WLWQCPdHiwYdLEOgorbAKTTYIWDk=";
+ vendorSha256 = "sha256-mzT9PLthx08Hil0DBxtw6/ouZrZZSfyElWro1iyJsTY=";
buildFlagsArray = [
"-ldflags="
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 0355fe58f485..8df7f34bb234 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -15,7 +15,7 @@ let
stdenv.mkDerivation (a // {
inherit installPhase;
dontUnpack = true;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
meta = a.meta // {
platforms = graylog.meta.platforms;
maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ];
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 19d2e862ec4b..ad7a74e8137f 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -35,7 +35,7 @@ let
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
- version = "2.04";
+ version = "2.06-rc1";
in (
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.savannah.gnu.org/grub.git";
rev = "${pname}-${version}";
- sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w";
+ sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa";
};
patches = [
diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/tools/misc/handlr/default.nix
new file mode 100644
index 000000000000..1d825c866c47
--- /dev/null
+++ b/pkgs/tools/misc/handlr/default.nix
@@ -0,0 +1,25 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "handlr";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "chmln";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1f4gmlqzgw1r8n0w9dr9lpsn94f2hlnak9bbq5xgf6jwgc9mwqzg";
+ };
+
+ cargoSha256 = "16d4dywwkgvvxw6ninrx87rqhx0whdq3yy01m27qjy4gz6z6ad8p";
+
+ # Most tests fail (at least some due to directory permissions)
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Alternative to xdg-open to manage default applications with ease";
+ homepage = "https://github.com/chmln/handlr";
+ license = licenses.mit;
+ maintainers = with maintainers; [ mredaelli ];
+ };
+}
diff --git a/pkgs/tools/misc/hidrd/default.nix b/pkgs/tools/misc/hidrd/default.nix
new file mode 100644
index 000000000000..74bb771c1d48
--- /dev/null
+++ b/pkgs/tools/misc/hidrd/default.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation {
+ pname = "hidrd";
+ version = "unstable-2019-06-03";
+
+ src = fetchFromGitHub {
+ owner = "DIGImend";
+ repo = "hidrd";
+ rev = "6c0ed39708a5777ac620f902f39c8a0e03eefe4e";
+ sha256 = "1rnhq6b0nrmphdig1qrpzpbpqlg3943gzpw0v7p5rwcdynb6bb94";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ meta = with lib; {
+ description = "HID report descriptor I/O library and conversion tool";
+ homepage = "https://github.com/DIGImend/hidrd";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ pacien ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index 117199617e14..abd8398601cd 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -18,8 +18,7 @@ stdenv.mkDerivation {
sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58";
};
- nativeBuildInputs = [ copyDesktopItems ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ copyDesktopItems unzip ];
inherit jre;
installPhase = ''
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 8c24848f4b59..34b93403487c 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -31,7 +31,7 @@ buildPythonApplication rec {
meta = with lib; {
homepage = "https://github.com/kubespray/kargo-cli";
description = "A tool helps to deploy a kubernetes cluster with Ansible";
- platforms = platforms.linux;
+ platforms = platforms.all;
license = licenses.gpl3;
maintainers = with maintainers; [ ];
};
diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index cb02d87e22ad..8c4cb5c1a759 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libcpuid";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "anrieff";
repo = "libcpuid";
rev = "v${version}";
- sha256 = "13v5x8gyka2v4kx52khwalb6ai328z7kk9jlipbbbys63p6nyddr";
+ sha256 = "sha256-m10LdtwBk1Lx31AJ4HixEYaCkT7EHpF9+tOV1rSA6VU=";
};
patches = [
diff --git a/pkgs/tools/misc/librespeed-cli/default.nix b/pkgs/tools/misc/librespeed-cli/default.nix
new file mode 100644
index 000000000000..d2396f0086c4
--- /dev/null
+++ b/pkgs/tools/misc/librespeed-cli/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "librespeed-cli";
+ version = "1.0.7";
+
+ src = fetchFromGitHub {
+ owner = "librespeed";
+ repo = "speedtest-cli";
+ rev = "v${version}";
+ sha256 = "03bhxx33fy1cgp83anm51fm8v079v0az0d0p785dz98jg14vzibl";
+ };
+
+ vendorSha256 = "1kccxmmzbkzbrxypcrz0j1zz51c0q1d5hh25lcpfbkm3498mj02c";
+
+ # Tests have additonal requirements
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Command line client for LibreSpeed";
+ homepage = "https://github.com/librespeed/speedtest-cli";
+ license = with licenses; [ lgpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix
index ad1210e95404..6c1f1759084e 100644
--- a/pkgs/tools/misc/lokalise2-cli/default.nix
+++ b/pkgs/tools/misc/lokalise2-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lokalise2-cli";
- version = "2.6.3";
+ version = "2.6.4";
src = fetchFromGitHub {
owner = "lokalise";
repo = "lokalise-cli-2-go";
rev = "v${version}";
- sha256 = "sha256-3kDaaPDRbhJyp/CblTKhB0dUeOjroCs3WkjEXL87Od4=";
+ sha256 = "sha256-D/I1I7r3IuDz1MZZrzKVMhdLIZxbN2bYeGmqJVlUU6g=";
};
vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8=";
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index d2456a08cbd7..12aa477219b6 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc=";
};
- nativeBuildInputs = [ pkg-config autoreconfHook ];
+ nativeBuildInputs = [ pkg-config autoreconfHook unzip ];
buildInputs = [
file
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
openssl
perl
slang
- unzip
zip
] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index acdde84accd4..aebff1da47f8 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "mcfly";
- version = "0.5.4";
+ version = "0.5.5";
src = fetchFromGitHub {
owner = "cantino";
repo = "mcfly";
rev = "v${version}";
- sha256 = "sha256-OYHUawlVHUlKMOWFqeJgg8EIe6Hbe+tKi57sJC5zH1U=";
+ sha256 = "sha256-4slE/11N9L9Q45w/LF5rNkOZbADjY1n4NxdoNlXPdo8=";
};
postInstall = ''
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
install -Dm644 -t $out/share/mcfly mcfly.fish
'';
- cargoSha256 = "sha256-aiOw1esERlhOTBCldxoldMCrxMxcGpYXEvjSFQ8xU8A=";
+ cargoSha256 = "sha256-MlhltJh+Z2GFHm+qCD8UDEvY+W8EprxVoBv/kj4v1Qc=";
meta = with lib; {
homepage = "https://github.com/cantino/mcfly";
diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix
index 7cf1e14dc18e..3f86a073c096 100644
--- a/pkgs/tools/misc/megacli/default.nix
+++ b/pkgs/tools/misc/megacli/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
};
- buildInputs = [rpmextract ncurses5 unzip];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [rpmextract ncurses5];
libPath =
lib.makeLibraryPath
[ stdenv.cc.cc stdenv.cc.libc ncurses5 ];
diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix
index e6945f051298..66717912599f 100644
--- a/pkgs/tools/misc/microplane/default.nix
+++ b/pkgs/tools/misc/microplane/default.nix
@@ -1,27 +1,17 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "microplane";
- version = "0.0.26";
+ version = "0.0.28";
src = fetchFromGitHub {
owner = "Clever";
repo = "microplane";
rev = "v${version}";
- sha256 = "0dba8cz13ljcsfibcwycd9vb759fzlllh2bv31vgbs2pjgcinzvm";
+ sha256 = "00ayci0a4lv67sg2bb4fw5wpdlps4pjqiiam595dar82lsjwj63j";
};
- goPackagePath = "github.com/Clever/microplane";
-
- subPackages = ["."];
-
- # Regenerate deps.nix with the following steps:
- # git clone git@github.com:Clever/microplane.git
- # cd microplane
- # git checkout v
- # dep2nix
-
- goDeps = ./deps.nix;
+ vendorSha256 = "0hn2gsm9bgmrm620fn2cx28l2gj1yfgvjix9ds50m7kwkx6q0dga";
buildFlagsArray = ''
-ldflags="-s -w -X main.version=v${version}"
diff --git a/pkgs/tools/misc/microplane/deps.nix b/pkgs/tools/misc/microplane/deps.nix
deleted file mode 100644
index 2c8266c2dc6e..000000000000
--- a/pkgs/tools/misc/microplane/deps.nix
+++ /dev/null
@@ -1,228 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "github.com/cpuguy83/go-md2man";
- fetch = {
- type = "git";
- url = "https://github.com/cpuguy83/go-md2man";
- rev = "1d903dcb749992f3741d744c0f8376b4bd7eb3e1";
- sha256 = "1p1ncq4vv244w9v144vplsb2vbl3369wdxn4gc7xbfafkjwn8bxc";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "346938d642f2ec3594ed81d874461961cd0faa76";
- sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
- };
- }
- {
- goPackagePath = "github.com/facebookgo/errgroup";
- fetch = {
- type = "git";
- url = "https://github.com/facebookgo/errgroup";
- rev = "779c8d7ef069c522bc72ee5f31a98d89a37f3fb6";
- sha256 = "1kyqrnvr158f5lgb1pbianjd8xnmxxvpgz7qilmp7zvr69gykbas";
- };
- }
- {
- goPackagePath = "github.com/fatih/color";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/color";
- rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
- sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "130e6b02ab059e7b717a096f397c5b60111cae74";
- sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s";
- };
- }
- {
- goPackagePath = "github.com/google/go-github";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-github";
- rev = "e881974953e6ab6d1a6a1610e98ed6401a3aa1ba";
- sha256 = "0qaxcm2p655r1jd59rv1hd58driadw5hxlfy7h53c7pzcsmf2546";
- };
- }
- {
- goPackagePath = "github.com/google/go-querystring";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-querystring";
- rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
- sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
- };
- }
- {
- goPackagePath = "github.com/juju/errors";
- fetch = {
- type = "git";
- url = "https://github.com/juju/errors";
- rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee";
- sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
- sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
- sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
- };
- }
- {
- goPackagePath = "github.com/nathanleiby/diffparser";
- fetch = {
- type = "git";
- url = "https://github.com/nathanleiby/diffparser";
- rev = "936553ce5db1b73e63cbcd7546416d13538e8d85";
- sha256 = "0qlxkbda4l1glwxdy52fhk3bqkyyc55si4xplf54jpi2x9khi2v4";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "792786c7400a136282c1664665ae0a8db921c6c2";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/russross/blackfriday";
- fetch = {
- type = "git";
- url = "https://github.com/russross/blackfriday";
- rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c";
- sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b";
- sha256 = "0k4xswdfd2ridj7m48ijb4klq9mxpw03g8h2rvq99yddi8vmlbvn";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
- sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
- sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
- };
- }
- {
- goPackagePath = "github.com/xanzy/go-gitlab";
- fetch = {
- type = "git";
- url = "https://github.com/xanzy/go-gitlab";
- rev = "ee3313ca5478c4786248d63dd75e4cd8e1fad2db";
- sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a";
- sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "aabf50738bcdd9b207582cbe796b59ed65d56680";
- sha256 = "0gq60lfzbyc6ggp5v3vbl6li818nmv0n32l9qf80ckpqpqkknkh5";
- };
- }
- {
- goPackagePath = "golang.org/x/oauth2";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/oauth2";
- rev = "bb50c06baba3d0c76f9d125c0719093e315b5b44";
- sha256 = "19fkbykwjhwa0833cqcphv7sfwc1538ad5wlsdkgdwr59qb9d32i";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "09787c993a3ab68e3d1f5c9b2394ab9433f391be";
- sha256 = "1nv4mwi9njkkyc7lwmxrjr8ggfh2cf1c67a9bq85dnss81vpj61y";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "28a7276518d399b9634904daad79e18b44d481bc";
- sha256 = "0qsj394qyy27iaf8srl7bkbsx7sp4aifrv3z2xllkydya8y18rv8";
- };
- }
- {
- goPackagePath = "google.golang.org/appengine";
- fetch = {
- type = "git";
- url = "https://github.com/golang/appengine";
- rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a";
- sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://github.com/go-yaml/yaml";
- rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f";
- sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6";
- };
- }
-]
diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 81437378c327..7b40e2131356 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -4,24 +4,27 @@
, fetchFromGitHub
, pkg-config
, zlib
+, libiconv
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "miniserve";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
rev = "v${version}";
- sha256 = "sha256-/vtiHRHsbF7lfn9tfgfKhm5YwofjSJniNNnKahphHFg=";
+ sha256 = "sha256-hTNwEspM1qlQkC6lD7N947tvS7O7RCIUYACvj4KYsAY=";
};
- cargoSha256 = "sha256-gwy/LeVznZyawliXnkULyyVSXATk0sjSTUZPHO2K+9o=";
+ cargoSha256 = "sha256-7G+h+g00T/aJ1cQ1SChxy8dq3CWWdHlx5DAH77xM9Oc=";
nativeBuildInputs = [ pkg-config zlib ];
- buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+
+ checkFlags = [ "--skip=cant_navigate_up_the_root" ];
meta = with lib; {
description = "For when you really just want to serve some files over HTTP right now!";
diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix
index 68670599c1ee..0cd3ff3a5c1f 100644
--- a/pkgs/tools/misc/ministat/default.nix
+++ b/pkgs/tools/misc/ministat/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git";
license = licenses.beerware;
maintainers = [ maintainers.dezgeg ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix
index 4469f130b589..4c03172d9aff 100644
--- a/pkgs/tools/misc/nncp/default.nix
+++ b/pkgs/tools/misc/nncp/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, go
, fetchurl
+, redo-apenwarr
, curl
, perl
, genericUpdater
@@ -9,24 +10,33 @@
stdenv.mkDerivation rec {
pname = "nncp";
- version = "5.3.3";
+ version = "6.2.0";
src = fetchurl {
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
- sha256 = "1l35ndzrvpfim29jn1p0bwmc8w892z44nsrdnay28k229r9dhz3h";
+ sha256 = "1zj0v82zqigcxhpc50mvafvi1ihs92ck35vjfrwb7wzzd7nysb17";
};
- nativeBuildInputs = [ go ];
+ nativeBuildInputs = [ go redo-apenwarr ];
- preConfigure = ''
+ buildPhase = ''
+ runHook preBuild
export GOCACHE=$PWD/.cache
+ export CFGPATH=/etc/nncp.hjson
+ export SENDMAIL=sendmail # default value for generated config file
+ redo ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}}
+ runHook postBuild
'';
- makeFlags = [
- "PREFIX=${placeholder "out"}"
- "CFGPATH=/etc/nncp.hjson"
- "SENDMAIL=/run/wrappers/bin/sendmail"
- ];
+ installPhase = ''
+ runHook preInstall
+ export PREFIX=$out
+ rm -f INSTALL # work around case insensitivity
+ redo install
+ runHook postInstall
+ '';
+
+ enableParallelBuilding = true;
passthru.updateScript = genericUpdater {
inherit pname version;
@@ -54,7 +64,7 @@ stdenv.mkDerivation rec {
transmission exists.
'';
homepage = "http://www.nncpgo.org/";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = [ maintainers.woffs ];
};
diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/tools/misc/oppai-ng/default.nix
index ef464e7b755a..f36dacdd3a2a 100644
--- a/pkgs/tools/misc/oppai-ng/default.nix
+++ b/pkgs/tools/misc/oppai-ng/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "oppai-ng";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "Francesco149";
repo = pname;
rev = version;
- sha256 = "sha256-fUtyQaHcNBmDs1BPbFGieKY/CFyETqBxYzzIXSERFJY=";
+ sha256 = "sha256-L9eraLOWm1tMImS8bLB9T4Md4VdTSxqI9Bt4r8eqxqs=";
};
buildPhase = ''
diff --git a/pkgs/tools/misc/paperlike-go/default.nix b/pkgs/tools/misc/paperlike-go/default.nix
new file mode 100644
index 000000000000..301cc81ec807
--- /dev/null
+++ b/pkgs/tools/misc/paperlike-go/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule {
+ pname = "paperlike-go";
+ version = "unstable-2021-03-22";
+
+ src = fetchFromGitHub {
+ owner = "leoluk";
+ repo = "paperlike-go";
+ rev = "a7d89fd4d4cbcec7be016860e9063676ad4cca0f";
+ sha256 = "0ym340520a0j4gvgk4x091lcz1apsv9lnwx0nnha86qvzqcy528l";
+ };
+
+ subPackages = [ "cmd/paperlike-cli" ];
+
+ vendorSha256 = "00mn0zfivxp2h77s7gmyyjp8p5a1vysn73wwaalgajymvljxxx1r";
+
+ meta = with lib; {
+ description = "paperlike-go is a Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC.";
+ homepage = "https://github.com/leoluk/paperlike-go";
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.adisbladis ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index 845c0fec9211..064590ef979b 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,30 +1,66 @@
-{ mkDerivation, fetchurl, lib
+{ mkDerivation, fetchurl, lib, makeWrapper
, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook
, kconfig, kcrash, kinit, kpmcore
-, eject, libatasmart , util-linux, qtbase
+, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux
+, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs
+, jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs
}:
let
- pname = "partitionmanager";
+ # External programs are resolved by `partition-manager` and then
+ # invoked by `kpmcore_externalcommand` from `kpmcore` as root.
+ # So these packages should be in PATH of `partition-manager`.
+ # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h
+ runtimeDeps = lib.makeBinPath [
+ cryptsetup
+ lvm2
+ mdadm
+ smartmontools
+ systemdMinimal
+ util-linux
+
+ btrfs-progs
+ dosfstools
+ e2fsprogs
+ exfat
+ f2fs-tools
+ fatresize
+ hfsprogs
+ jfsutils
+ nilfs-utils
+ ntfs3g
+ reiser4progs
+ reiserfsprogs
+ udftools
+ xfsprogs
+ zfs
+
+ # FIXME: Missing command: tune.exfat hfsck hformat fsck.nilfs2 {fsck,mkfs,debugfs,tunefs}.ocfs2
+ ];
+
in mkDerivation rec {
- name = "${pname}-${version}";
- version = "3.3.1";
+ pname = "partitionmanager";
+ # NOTE: When changing this version, also change the version of `kpmcore`.
+ version = "4.2.0";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "0jhggb4xksb0k0mj752n6pz0xmccnbzlp984xydqbz3hkigra1si";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
+ hash = "sha256-6Qlt1c47Eek6TkWWBzTyBZYJ1jfhtwsC9X5q5h6IhPg=";
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ];
- # refer to kpmcore for the use of eject
- buildInputs = [ eject libatasmart util-linux ];
propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
+ postFixup = ''
+ wrapProgram $out/bin/partitionmanager \
+ --prefix PATH : "${runtimeDeps}"
+ '';
+
meta = with lib; {
description = "KDE Partition Manager";
- license = licenses.gpl2;
+ license = with licenses; [ cc-by-40 cc0 gpl3Plus lgpl3Plus mit ];
homepage = "https://www.kde.org/applications/system/kdepartitionmanager/";
- maintainers = with maintainers; [ peterhoeg ];
+ maintainers = with maintainers; [ peterhoeg oxalica ];
};
}
diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/tools/misc/past-time/default.nix
new file mode 100644
index 000000000000..3604e4ddcb4a
--- /dev/null
+++ b/pkgs/tools/misc/past-time/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonApplication
+, click
+, fetchFromGitHub
+, freezegun
+, pytestCheckHook
+, tqdm
+}:
+
+buildPythonApplication rec {
+ pname = "past-time";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "fabaff";
+ repo = pname;
+ rev = version;
+ sha256 = "0yhc0630rmcx4ia9y6klpx002mavfmqf1s3jb2gz54jlccwqbfgl";
+ };
+
+ propagatedBuildInputs = [
+ click
+ tqdm
+ ];
+
+ checkInputs = [
+ freezegun
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "past_time" ];
+
+ meta = with lib; {
+ description = "Tool to visualize the progress of the year based on the past days";
+ homepage = "https://github.com/fabaff/past-time";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix
index f43bbcdb8f2d..6d3851699752 100644
--- a/pkgs/tools/misc/pcb2gcode/default.nix
+++ b/pkgs/tools/misc/pcb2gcode/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "pcb2gcode";
- version = "2.2.3";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "pcb2gcode";
repo = "pcb2gcode";
rev = "v${version}";
- sha256 = "sha256-CIhhwUsnX+Wx4hLNE8uQf17QbDDm4vCbv/XZVuCrWdw=";
+ sha256 = "sha256-BELugmnnedqXTnSwiQN3XbqkWKTKF27ElQAwrEWNSao=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix
index f4572d0e5bcc..90c128f8ac35 100644
--- a/pkgs/tools/misc/pdf-parser/default.nix
+++ b/pkgs/tools/misc/pdf-parser/default.nix
@@ -29,6 +29,6 @@ python3Packages.buildPythonApplication {
homepage = "https://blog.didierstevens.com/programs/pdf-tools/";
license = licenses.publicDomain;
maintainers = [ maintainers.lightdiscord ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index 348670c3bb1b..971f924faaac 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "phoronix-test-suite";
- version = "10.2.1";
+ version = "10.2.2";
src = fetchurl {
url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
- sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg=";
+ sha256 = "sha256-g5hUmsn01Msopxzmi/G4LcZISXMD2wFqreaHMkFzF1Y=";
};
buildInputs = [ php ];
diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 0b5005b9c82a..2cfbf5ae91ac 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_78 }:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
make PREFIX="$out" install
for fn in plow{del,down,list,mod,probe,up}; do
- wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_38 ]}"
+ wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_78 ]}"
done
'';
diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index 77f865a6a168..59bbe2c2ab1f 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/graysky2/profile-cleaner";
license = lib.licenses.mit;
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
maintainers = [ lib.maintainers.devhell ];
};
}
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index 4f27cd239d17..9feee484170e 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "progress";
- version = "0.15";
+ version = "0.16";
src = fetchFromGitHub {
owner = "Xfennec";
repo = "progress";
rev = "v${version}";
- sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm";
+ sha256 = "sha256-kkEyflyBaQ5hUVo646NUuC1u54uzLJJsVFej9pMEwT0=";
};
nativeBuildInputs = [ pkg-config which ];
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 64cc91f170ba..354075df549c 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
- sha256 = "sha256-564ZHrok5RVFR9OYPpd6WjSZKieNFhnvUbBklayGOb0=";
+ sha256 = "sha256-kRKU6ynZffV17GqEArkXxz6M9xoa3kn2yNqjyLRY0rc=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index ef684aebe3cb..bbe96bf6c290 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -16,11 +16,11 @@ let
'';
in stdenv.mkDerivation rec {
pname = "remind";
- version = "03.03.01";
+ version = "03.03.05";
src = fetchurl {
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
- sha256 = "0y4l960529sl3sn4r4g36qpy3jk5h1x4algjy7an7sfiqb8n98fi";
+ sha256 = "sha256-Ye0X2Gvek/pyaNVxGKL773OWJvC4I6F5nEsRQgzWbsE=";
};
nativeBuildInputs = optional tkremind makeWrapper;
diff --git a/pkgs/tools/misc/rmtrash/default.nix b/pkgs/tools/misc/rmtrash/default.nix
index d50079f82c26..61b8ead738cf 100644
--- a/pkgs/tools/misc/rmtrash/default.nix
+++ b/pkgs/tools/misc/rmtrash/default.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper
, trash-cli, coreutils, which, getopt }:
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
pname = "rmtrash";
version = "1.14";
@@ -12,9 +12,6 @@ stdenv.mkDerivation rec {
sha256 = "0wfb2ykzlsxyqn9krfsis9jxhaxy3pxl71a4f15an1ngfndai694";
};
- dontConfigure = true;
- dontBuild = true;
-
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
@@ -35,5 +32,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ peelz ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix
index a18a8d6d38d0..963a0832ef9f 100644
--- a/pkgs/tools/misc/rpi-imager/default.nix
+++ b/pkgs/tools/misc/rpi-imager/default.nix
@@ -16,13 +16,13 @@
mkDerivation rec {
pname = "rpi-imager";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = pname;
rev = "v${version}";
- sha256 = "0596c7rpkykmjr3gsz9yczqsj7fzq04kc97s0rqkygjnwiqh2rwz";
+ sha256 = "sha256-wX9EO5hgEM2ftOov0AERloH6GxrwptWltBYWLFXkPUw=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix
index 57e49c887454..93ef69ea2ea5 100644
--- a/pkgs/tools/misc/sfeed/default.nix
+++ b/pkgs/tools/misc/sfeed/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.isc;
maintainers = [ maintainers.matthiasbeyer ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix
index 18c5aea3dfd8..c782b1292008 100644
--- a/pkgs/tools/misc/shelldap/default.nix
+++ b/pkgs/tools/misc/shelldap/default.nix
@@ -6,7 +6,7 @@ perlPackages.buildPerlPackage rec {
url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz";
sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i";
};
- buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
+ buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
prePatch = ''
touch Makefile.PL
'';
diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix
index 1ff73492401f..0c338fd91bce 100644
--- a/pkgs/tools/misc/silicon/default.nix
+++ b/pkgs/tools/misc/silicon/default.nix
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "silicon";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "Aloxaf";
repo = "silicon";
rev = "v${version}";
- sha256 = "0cvzkfyljgxhmn456f2rn0vq2bhm1ishr4jg4dnwjjfgmjg3w908";
+ sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s=";
};
- cargoSha256 = "1aymhbfzcncrbc5n8rf62bdgi95b4bjhw6p716vhca5p6c7wfxcb";
+ cargoSha256 = "sha256-1sekLS+jhMeFJcW7pH/X8t28//xA+L54u81uKOo1kHE=";
buildInputs = [ llvmPackages.libclang expat freetype ]
++ lib.optionals stdenv.isLinux [ libxcb ]
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index a3543c433ae9..c589590abcfe 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "0.50.0";
+ version = "0.51.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
- sha256 = "1bnnqrxsmp3z2qksd8h4lfbq4kxxy1cg4yynadz66lxyzabv2v21";
+ sha256 = "1bmnwvjhw2ba7yqn9if83d57b8qbrbqgy2br8q2drz4ylk0gjirg";
};
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
done
'';
- cargoSha256 = "0plk47i2xrn3x5yr3gw3pq74maqf4krb8d6i4sf8gil4mnpcgxir";
+ cargoSha256 = "1d4ca8yzx437x53i7z2kddv9db89zy6ywbgl6y1cwwd6wscbrxcq";
preCheck = ''
HOME=$TMPDIR
diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/tools/misc/tea/default.nix
new file mode 100644
index 000000000000..06e54559db9a
--- /dev/null
+++ b/pkgs/tools/misc/tea/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoModule, fetchgit }:
+
+buildGoModule rec {
+ pname = "tea";
+ version = "0.7.0";
+
+ src = fetchgit {
+ url = "https://gitea.com/gitea/tea";
+ rev = "v${version}";
+ sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY=";
+ };
+
+ vendorSha256 = null;
+
+ meta = with lib; {
+ description = "Gitea official CLI client";
+ homepage = "https://gitea.com/gitea/tea";
+ license = licenses.mit;
+ maintainers = [ maintainers.j4m3s ];
+ };
+}
diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix
index b1e75f36b54c..23ab5c16fba0 100644
--- a/pkgs/tools/misc/tfk8s/default.nix
+++ b/pkgs/tools/misc/tfk8s/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tfk8s";
- version = "0.1.0";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
- rev = version;
- sha256 = "sha256-JzTWbkICOIfsHgMvpXz4bIWaXKKDAD8INSorMvnXiBw=";
+ rev = "v${version}";
+ sha256 = "sha256-gszvWetreafIP9I8hi9zz24TOTSsGzDsm/vXJS6n4Q4=";
};
- vendorSha256 = "sha256-r0c3y+nRc/hCTAT31DasQjxZN86BT8jnJmsLM7Ugrq4=";
+ vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE=";
runVend = true;
buildFlagsArray = [
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 794e0d4e2578..bff6c9c96887 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }:
stdenv.mkDerivation rec {
pname = "thin-provisioning-tools";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ expat libaio boost binutils ];
+ buildInputs = [ expat libaio boost ];
enableParallelBuilding = true;
diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/tools/misc/tz/default.nix
new file mode 100644
index 000000000000..c0c6fe9ec33b
--- /dev/null
+++ b/pkgs/tools/misc/tz/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "tz";
+ version = "0.4";
+
+ src = fetchFromGitHub {
+ owner = "oz";
+ repo = "tz";
+ rev = "v${version}";
+ sha256 = "sha256-36nTau7xjABdeUOioHar28cuawFWW3DBaDH0YAvdufI=";
+ };
+
+ vendorSha256 = "sha256-Soa87I7oMa34LjYKxNAz9Limi0kQ6JUtb/zI4G7yZnw=";
+
+ meta = with lib; {
+ description = "A time zone helper";
+ homepage = "https://github.com/oz/tz";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ siraben ];
+ };
+}
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix
index a073417be7d2..d88e0bdea15e 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p "$out/bin"
diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index 2b40e289cadd..04e955a78b18 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -11,11 +11,11 @@ assert enableCurrenciesUpdater -> pythonPackages != null;
stdenv.mkDerivation rec {
pname = "units";
- version = "2.19";
+ version = "2.21";
src = fetchurl {
url = "mirror://gnu/units/${pname}-${version}.tar.gz";
- sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2";
+ sha256 = "sha256-bD6AqfmAWJ/ZYqWFKiZ0ZCJX2xxf1bJ8TZ5mTzSGy68=";
};
pythonEnv = pythonPackages.python.withPackages(ps: [
diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix
index 533ef192e8d7..2f504a0cef8c 100644
--- a/pkgs/tools/misc/upterm/default.nix
+++ b/pkgs/tools/misc/upterm/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "upterm";
- version = "0.5.2";
+ version = "0.6.5";
src = fetchFromGitHub {
owner = "owenthereal";
repo = "upterm";
rev = "v${version}";
- sha256 = "007hgkkn1cq1i0rkn45i3bz5q9irzm67cz0j5glr6f6d4s0nkjiq";
+ sha256 = "sha256-wzDK7iQN/z/M1mTKPCH3c+OjFsavplV/0oMiOe5thuI=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/misc/usbview/default.nix b/pkgs/tools/misc/usbview/default.nix
new file mode 100644
index 000000000000..2f417ea86de5
--- /dev/null
+++ b/pkgs/tools/misc/usbview/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, gtk3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "usbview";
+ version = "2.0";
+
+ src = fetchFromGitHub {
+ owner = "gregkh";
+ repo = "usbview";
+ rev = "v${version}";
+ sha256 = "1cw5jjpidjn34rxdjslpdlj99k4dqaq1kz6mplv5hgjdddijvn5p";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ gtk3
+ ];
+
+ meta = with lib; {
+ description = "USB viewer for Linux";
+ license = licenses.gpl2Only;
+ homepage = "http://www.kroah.com/linux-usb/";
+ maintainers = with maintainers; [ shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix
index fd195ab18432..8a04d07b65ae 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/tools/misc/uutils-coreutils/default.nix
@@ -1,8 +1,15 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-"
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, cargo
+, sphinx
, Security
+, prefix ? "uutils-"
+, buildMulticallBinary ? true
}:
-rustPlatform.buildRustPackage rec {
+stdenv.mkDerivation rec {
pname = "uutils-coreutils";
version = "0.0.4";
@@ -13,21 +20,32 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-z5lDKJpFxXDCQq+0Da/63GGoUXacy5TSn+1gJiMvicc=";
};
- # too many impure/platform-dependent tests
- doCheck = false;
+ postPatch = ''
+ # can be removed after https://github.com/uutils/coreutils/pull/1815 is included
+ substituteInPlace GNUmakefile \
+ --replace uutils coreutils
+ '';
- cargoSha256 = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M=";
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M=";
+ };
- makeFlags =
- [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
- ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ];
+ nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ];
- nativeBuildInputs = [ cmake cargo sphinx ];
buildInputs = lib.optional stdenv.isDarwin Security;
- # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults
- buildPhase = "";
- installPhase = "";
+ makeFlags = [
+ "CARGO=${cargo}/bin/cargo"
+ "PREFIX=${placeholder "out"}"
+ "PROFILE=release"
+ "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1"
+ ] ++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ]
+ ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ];
+
+ # too many impure/platform-dependent tests
+ doCheck = false;
meta = with lib; {
description = "Cross-platform Rust rewrite of the GNU coreutils";
@@ -36,7 +54,7 @@ rustPlatform.buildRustPackage rec {
CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites.
'';
homepage = "https://github.com/uutils/coreutils";
- maintainers = with maintainers; [ siraben ];
+ maintainers = with maintainers; [ siraben SuperSandro2000 ];
license = licenses.mit;
platforms = platforms.unix;
};
diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix
index 1fbb85f07516..bbab2d64bb00 100644
--- a/pkgs/tools/misc/vimer/default.nix
+++ b/pkgs/tools/misc/vimer/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
maintainers = [ maintainers.matthiasbeyer ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix
index fe405b0eaa40..6cc13e6f87e6 100644
--- a/pkgs/tools/misc/vorbisgain/default.nix
+++ b/pkgs/tools/misc/vorbisgain/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ unzip libogg libvorbis ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libogg libvorbis ];
patchPhase = ''
chmod -v +x configure
diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix
index 64a76e97baef..a78b68569647 100644
--- a/pkgs/tools/misc/vttest/default.nix
+++ b/pkgs/tools/misc/vttest/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "vttest";
- version = "20200610";
+ version = "20210210";
src = fetchurl {
urls = [
"https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz"
"ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz"
];
- sha256 = "0181lk999gfqk8pkd4yx0qrz9r3k9a0z0i50wcayp7z1n1ivqllb";
+ sha256 = "sha256-D5ii4wWYKRXxUgmEw+hpjjrNUI7iEHEVKMifWn6n8EY=";
};
meta = with lib; {
diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix
index 29f1ed6d3d0e..2069ba6b1593 100644
--- a/pkgs/tools/misc/yad/default.nix
+++ b/pkgs/tools/misc/yad/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yad";
- version = "7.3";
+ version = "8.0";
src = fetchFromGitHub {
owner = "v1cont";
repo = "yad";
rev = "v${version}";
- sha256 = "sha256-3y3QLqUWBSJ9BLI8gd0LQ9SxNhcj5dXpz8Y2Hi2iCwU=";
+ sha256 = "sha256-KntJtli1PtqH/9XOTq4FkVJYklp0L7bChwQQGCBTLDA=";
};
configureFlags = [
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 96a4b8e7fee8..858689778995 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 = "2021.03.03";
+ version = "2021.03.25";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f";
+ sha256 = "0ps8ydx4hbj6sl0m760zdm9pvhccjmwvx680i4akz3lk4z9wy0x3";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix
index 9feecb589126..df369147d342 100644
--- a/pkgs/tools/misc/ytfzf/default.nix
+++ b/pkgs/tools/misc/ytfzf/default.nix
@@ -2,25 +2,34 @@
, stdenv
, fetchFromGitHub
, makeWrapper
+, coreutils
, curl
, dmenu
, fzf
+, gnused
, jq
, mpv
+, ncurses
+, ueberzug
, youtube-dl
}:
stdenv.mkDerivation rec {
pname = "ytfzf";
- version = "1.0.1";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ytfzf";
rev = "v${version}";
- sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv";
+ sha256 = "sha256-286rN3g6leSnbZZ0VjWl43nhBAMPJDUMv7DhgVTsjKw=";
};
+ patches = [
+ # Updates have to be installed through Nix.
+ ./no-update.patch
+ ];
+
nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "PREFIX=${placeholder "out"}/bin" ];
@@ -29,7 +38,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [
- curl dmenu fzf jq mpv youtube-dl
+ coreutils curl dmenu fzf gnused jq mpv ncurses ueberzug youtube-dl
]}
'';
diff --git a/pkgs/tools/misc/ytfzf/no-update.patch b/pkgs/tools/misc/ytfzf/no-update.patch
new file mode 100644
index 000000000000..13e57abb496b
--- /dev/null
+++ b/pkgs/tools/misc/ytfzf/no-update.patch
@@ -0,0 +1,30 @@
+diff --git a/ytfzf b/ytfzf
+index f7871c7..179c836 100755
+--- a/ytfzf
++++ b/ytfzf
+@@ -829,23 +829,8 @@ send_notify () {
+ }
+
+ update_ytfzf () {
+- local branch="$1"
+- local updatefile="/tmp/ytfzf-update"
+- curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile"
+-
+- if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then
+- chmod 755 "$updatefile"
+- if [ "$(uname)" = "Darwin" ]; then
+- sudo cp "$updatefile" "/usr/local/bin/ytfzf"
+- else
+- sudo cp "$updatefile" "/usr/bin/ytfzf"
+- fi
+- else
+- printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset"
+- fi
+-
+- rm "$updatefile"
+- exit
++ printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset"
++ exit 1
+ }
+
+ scrape_subscriptions () {
diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix
index 6de95b34e627..728fde4b1e45 100644
--- a/pkgs/tools/networking/acme-client/default.nix
+++ b/pkgs/tools/networking/acme-client/default.nix
@@ -10,11 +10,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "acme-client";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchurl {
url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.xz";
- sha256 = "sha256-AYI7WfRTb5R0/hDX5Iqkq5nrLZ4gQecAGObSajSA+vw=";
+ sha256 = "sha256-fRSYwQmyV0WapjUJNG0UGO/tUDNTGUraj/BWq/a1QTo=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index c28df4614592..703af40864ae 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -1,12 +1,11 @@
-{ lib, stdenv, fetchurl }:
+{ lib, gccStdenv, fetchurl }:
-stdenv.mkDerivation rec {
- baseName = "altermime";
- name = "${baseName}-${version}";
+gccStdenv.mkDerivation rec {
+ pname = "altermime";
version = "0.3.11";
src = fetchurl {
- url = "https://pldaniels.com/${baseName}/${name}.tar.gz";
+ url = "https://pldaniels.com/${pname}/${pname}-${version}.tar.gz";
sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7";
};
@@ -19,14 +18,14 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- sed -i Makefile -e "s@/usr/local@$out@"
- mkdir -p "$out/bin"
+ mkdir -p $out/bin
+ substituteInPlace Makefile --replace "/usr/local" "$out"
'';
meta = with lib; {
description = "MIME alteration tool";
maintainers = [ maintainers.raskin ];
- platforms = platforms.linux;
+ platforms = platforms.all;
license.fullName = "alterMIME LICENSE";
downloadPage = "https://pldaniels.com/altermime/";
};
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 3995fc295d10..7d3c662b368f 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -1,20 +1,29 @@
-{ lib, buildGoModule, fetchFromGitHub, openssh, makeWrapper }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, openssh
+, makeWrapper
+}:
buildGoModule rec {
pname = "assh";
- version = "2.11.0";
+ version = "2.11.3";
src = fetchFromGitHub {
repo = "advanced-ssh-config";
owner = "moul";
rev = "v${version}";
- sha256 = "sha256-/StB5yee9sbkebuJt6JDI+bp52NG0bBhprzmdepL+ek=";
+ sha256 = "sha256-NH7Dmqsu7uRhKWGFHBnh5GGqsNFOijDxsc+ATt28jtY=";
};
vendorSha256 = "sha256-6OAsO7zWAgPfQWD9k+nYH7hnDDUlKIjTB61ivvoubn0=";
doCheck = false;
+ preBuild = ''
+ buildFlagsArray+=("-ldflags" "-s -w -X moul.io/assh/v2/pkg/version.Version=${version}")
+ '';
+
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix
index 37cb23f9876f..50b3fa07782d 100644
--- a/pkgs/tools/networking/boundary/default.nix
+++ b/pkgs/tools/networking/boundary/default.nix
@@ -1,32 +1,35 @@
{ stdenv, lib, fetchzip }:
-let
- inherit (stdenv.hostPlatform) system;
- suffix = {
- x86_64-linux = "linux_amd64";
- aarch64-linux = "linux_arm64";
- x86_64-darwin = "darwin_amd64";
- }."${system}" or (throw "Unsupported system: ${system}");
- fetchsrc = version: sha256: fetchzip {
- url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip";
- sha256 = sha256."${system}";
- };
-in
stdenv.mkDerivation rec {
pname = "boundary";
- version = "0.1.7";
+ version = "0.1.8";
- src = fetchsrc version {
- x86_64-linux = "sha256-cSD9V/Hj/eEc6k+LMNRnSEA94fA6bQUfCgA+XdqAR4k=";
- aarch64-linux = "sha256-MG97PhG/t1rdmTF3n2YHYsTo8VODCaY3cfnv8YHgAY8=";
- x86_64-darwin = "sha256-p60UiIy9DGx7AaEvmyo4FLa0Z67MQRNJkw1nHaM6eww=";
- };
+ src =
+ let
+ inherit (stdenv.hostPlatform) system;
+ suffix = {
+ x86_64-linux = "linux_amd64";
+ aarch64-linux = "linux_arm64";
+ x86_64-darwin = "darwin_amd64";
+ }.${system} or (throw "Unsupported system: ${system}");
+ fetchsrc = version: sha256: fetchzip {
+ url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip";
+ sha256 = sha256.${system};
+ };
+ in
+ fetchsrc version {
+ x86_64-linux = "sha256-CZueZqN1XoSmqOsocGwUoIZ5878uSHFYW2KDURWRHhM=";
+ aarch64-linux = "sha256-/pl9MzR4GFjiefc7Sde+jTGi/QaY3U/An8J5+KQR/68=";
+ x86_64-darwin = "sha256-kkqROFXvEpxRySByGtmGtFJPBr5Dw3BOPQ+bArqLxAA=";
+ };
dontConfigure = true;
dontBuild = true;
installPhase = ''
+ runHook preInstall
install -D boundary $out/bin/boundary
+ runHook postInstall
'';
doInstallCheck = true;
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index 724d25d49f93..7a4bd5adcba0 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, python, gyp, util-linux }:
+{ stdenv, lib, fetchgit, python2, util-linux }:
stdenv.mkDerivation {
pname = "bud";
@@ -11,10 +11,12 @@ stdenv.mkDerivation {
sha256 = "08yr6l4lc2m6rng06253fcaznf6sq0v053wfr8bbym42c32z0xdh";
};
- buildInputs = [
- python gyp
+ nativeBuildInputs = [
+ python2 python2.pkgs.gyp
] ++ lib.optional stdenv.isLinux util-linux;
+ strictDeps = true;
+
buildPhase = ''
python ./gyp_bud -f make
make -C out
diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix
index 112a95eccc6e..300e03761a65 100644
--- a/pkgs/tools/networking/carddav-util/default.nix
+++ b/pkgs/tools/networking/carddav-util/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, python, pythonPackages, makeWrapper }:
+{ lib, stdenv, fetchgit, python3Packages, makeWrapper }:
stdenv.mkDerivation {
@@ -12,7 +12,9 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
- propagatedBuildInputs = with pythonPackages; [ requests vobject lxml ];
+ propagatedBuildInputs = with python3Packages; [ requests vobject lxml ];
+
+ strictDeps = true;
doCheck = false; # no test
@@ -20,7 +22,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin
cp $src/carddav-util.py $out/bin
- pythondir="$out/lib/${python.libPrefix}/site-packages"
+ pythondir="$out/lib/${python3Packages.python.sitePackages}"
mkdir -p "$pythondir"
cp $src/carddav.py "$pythondir"
'';
diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix
index f0aecf7363a8..527ecfbf98d3 100644
--- a/pkgs/tools/networking/cassowary/default.nix
+++ b/pkgs/tools/networking/cassowary/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cassowary";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "rogerwelin";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-IaS2QU9DBupv06AMzJXBM2iZkNVw31Pt1bOMQNBEiq0=";
+ sha256 = "sha256-rQNrxAKf2huY9I6iqdf1iYxgXaQI0LG1Lkrnv1OuJsg=";
};
- vendorSha256 = "sha256-RuwrnuTNfiYpIuohw7OQv95hjOAeWCMuajsZVUUDxBQ=";
+ vendorSha256 = "sha256-hGpiL88x2roFEjJJM4CKyt3k66VK1pEnpOwvhDPDp6M=";
doCheck = false;
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
deleted file mode 100644
index b8fd06798925..000000000000
--- a/pkgs/tools/networking/ccnet/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{lib, stdenv, fetchurl, which, autoreconfHook, pkg-config, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
-
-stdenv.mkDerivation rec {
- version = "6.1.8";
- seafileVersion = "6.1.8";
- pname = "ccnet";
-
- src = fetchurl {
- url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
- sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm";
- };
-
- nativeBuildInputs = [ pkg-config which autoreconfHook vala python ];
- propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ];
-
- configureFlags = [ "--enable-server" ];
-
- meta = with lib; {
- homepage = "https://github.com/haiwen/ccnet";
- description = "A framework for writing networked applications in C";
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index b2710a2c33ad..8c57d946950e 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
- version = "8.6.10";
+ version = "8.6.11";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/JS173hIW3doDCP/5v8dUSEW44pyq6VdF17Za6JWtys=";
+ sha256 = "sha256-+ej6Q2XczWVcu7lMRjt+Sj2FZxlfFSepE6crCFgPuoc=";
};
- vendorSha256 = "sha256-5UaOFTm72RG/xsShliU32Vp6qNANDyAotbaRYyan87U=";
+ vendorSha256 = "sha256-50ESG3GL9BcTaGp1Q5rc1XklF3H7WKcyM1yq7SZa2QE=";
doCheck = false;
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix
index c220f24046fc..f40ef295d138 100644
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/pkgs/tools/networking/dd-agent/5.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, python
+{ lib, stdenv, fetchFromGitHub, python2
, unzip, makeWrapper }:
let
- python' = python.override {
+ python' = python2.override {
packageOverrides = self: super: {
docker = self.buildPythonPackage rec {
name = "docker-${version}";
@@ -19,10 +19,9 @@ let
requests
websocket_client
ipaddress
- backports_ssl_match_hostname
docker_pycreds
uptime
- ];
+ ] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];
# due to flake8
doCheck = false;
@@ -51,8 +50,8 @@ in stdenv.mkDerivation rec {
patches = [ ./40103-iostat-fix.patch ];
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- unzip
makeWrapper
] ++ (with python'.pkgs; [
requests
@@ -83,7 +82,7 @@ in stdenv.mkDerivation rec {
cat > $out/bin/dd-jmxfetch < pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
- version = "2.3.6";
+ version = "2.3.7";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
- sha256 = "sha256-bUYg5dodk+118ikBEhbbgdUJe2i/F14wny+rKJC7oDY=";
+ sha256 = "sha256-Mbp6zQ14NnxxtW5Kh8nxHNI1/FYCvFuEaQd5Eg4KMFs=";
};
buildInputs = [ openssl zlib ]
diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix
index f5c888dc4bb6..ea567f10d488 100644
--- a/pkgs/tools/networking/httperf/default.nix
+++ b/pkgs/tools/networking/httperf/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/httperf/httperf";
maintainers = with maintainers; [ nand0p ];
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix
index dfb641348714..2ff2fd8daec1 100644
--- a/pkgs/tools/networking/kapp/default.nix
+++ b/pkgs/tools/networking/kapp/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "kapp";
version = "0.36.0";
@@ -14,6 +14,15 @@ buildGoModule rec {
subPackages = [ "cmd/kapp" ];
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ for shell in bash fish zsh; do
+ $out/bin/kapp completion $shell > kapp.$shell
+ installShellCompletion kapp.$shell
+ done
+ '';
+
meta = with lib; {
description = "CLI tool that encourages Kubernetes users to manage bulk resources with an application abstraction for grouping";
homepage = "https://get-kapp.io";
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index a805fe7e9e6c..48fe72d42967 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "keepalived";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "acassen";
repo = "keepalived";
rev = "v${version}";
- sha256 = "sha256-Cupi5arScECKmHCBcC0Cmm/64JhidMyNUB75YmGMJag=";
+ sha256 = "sha256-qugEEbOQ4bemzelIOaNFvo3piMZpKUZGjR+4XF8aLHw=";
};
buildInputs = [
diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix
new file mode 100644
index 000000000000..40353ea278cb
--- /dev/null
+++ b/pkgs/tools/networking/lychee/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "lychee";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "lycheeverse";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "03dsp0384mwr51dkqfl25xba0m17sppabiz7slhxcig89b0ksykm";
+ };
+
+ cargoSha256 = "08y2wpm2qgm2jsy257b2p2anxy4q3bj2kfdr5cnb6wnaz9g4ypq2";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ openssl ];
+
+ # Disabled because they currently fail
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A fast, async, resource-friendly link checker written in Rust.";
+ homepage = "https://github.com/lycheeverse/lychee";
+ license = with licenses; [ asl20 mit ];
+ maintainers = with maintainers; [ tuxinaut ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 1b2b0f2deb38..70b663edded5 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 = "2021-03-12T03-36-59Z";
+ version = "2021-03-23T05-46-11Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
- sha256 = "sha256-aIJjr7KaT4E4Q1Ho4D0emduJWFxdCXCodq7J43r0DMQ=";
+ sha256 = "sha256-AtE9Zy8tRvcE+gYc0pqJDEFnXL4jSbJ4b6l3ZOe69Y4=";
};
- vendorSha256 = "sha256-aoRdtv/Q7vjn0M7iSYAuyu/3pEH30x6D39xTHqQPvuo=";
+ vendorSha256 = "sha256-cIr8d5jz4EfBFuOBZG4Kz20wSXy1Cni77V+JR6vLHwQ=";
doCheck = false;
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 8f46e657edb2..4553063929fd 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe
-, xapian, glib, gmime3, texinfo , emacs, guile
+, xapian, glib, gmime3, texinfo, emacs, guile
, gtk3, webkitgtk, libsoup, icu
+, makeWrapper
, withMug ? false
, batchSize ? null }:
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
++ lib.optional (!stdenv.isDarwin) guile
++ lib.optionals withMug [ gtk3 webkitgtk ];
- nativeBuildInputs = [ pkg-config autoreconfHook pmccabe ];
+ nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ];
enableParallelBuilding = true;
@@ -37,8 +38,12 @@ stdenv.mkDerivation rec {
--replace "@abs_top_builddir@" "$out"
'';
- # Install mug
- postInstall = lib.optionalString withMug ''
+ # Make sure included scripts can find their dependencies & optionally install mug
+ postInstall = ''
+ wrapProgram "$out/bin/mu" \
+ --prefix LD_LIBRARY_PATH : "$out/lib" \
+ --prefix GUILE_LOAD_PATH : "$out/share/guile/site/2.2"
+ '' + lib.optionalString withMug ''
for f in mug ; do
install -m755 toys/$f/$f $out/bin/$f
done
diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix
index 45839eabb0b5..f6c45fc074d4 100644
--- a/pkgs/tools/networking/network-manager/applet/default.nix
+++ b/pkgs/tools/networking/network-manager/applet/default.nix
@@ -11,7 +11,6 @@
, polkit
, modemmanager
, libnma
-, mobile-broadband-provider-info
, glib-networking
, gsettings-desktop-schemas
, libgudev
@@ -26,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "network-manager-applet";
- version = "1.18.0";
+ version = "1.20.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx";
+ sha256 = "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla";
};
mesonFlags = [
@@ -51,6 +50,7 @@ stdenv.mkDerivation rec {
libgudev
modemmanager
jansson
+ glib
glib-networking
libappindicator-gtk3
gnome3.adwaita-icon-theme
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://gitlab.gnome.org/GNOME/network-manager-applet/";
description = "NetworkManager control applet for GNOME";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ phreedom ];
platforms = platforms.linux;
};
diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix
new file mode 100644
index 000000000000..583189f57db2
--- /dev/null
+++ b/pkgs/tools/networking/oapi-codegen/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "oapi-codegen";
+ version = "1.5.6";
+
+ src = fetchFromGitHub {
+ owner = "deepmap";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-edIm1O+LQdmKhH8/5WuSsxVtOcf3VlkObGjIY+30mms=";
+ };
+
+ vendorSha256 = "sha256-lhWnPZavtBEa4A76rvr0xw3L5W6HYK1Uw+PW8z8gWuU=";
+
+ # Tests use network
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Go client and server OpenAPI 3 generator";
+ homepage = "https://github.com/deepmap/oapi-codegen";
+ license = licenses.asl20;
+ maintainers = [ maintainers.j4m3s ];
+ };
+}
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 3337a5bbb7d1..dd5fa9cbed8a 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,20 +3,17 @@
, pkg-config
, makeWrapper
, runtimeShell
-, iproute ? null
+, iproute
, lzo
, openssl
, pam
, useSystemd ? stdenv.isLinux
-, systemd ? null
-, util-linux ? null
+, systemd
+, util-linux
, pkcs11Support ? false
-, pkcs11helper ? null
+, pkcs11helper
}:
-assert useSystemd -> (systemd != null);
-assert pkcs11Support -> (pkcs11helper != null);
-
with lib;
let
# Check if the script needs to have other binaries wrapped when changing this.
diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix
index 6453b2fbb16b..1c72be0c5100 100644
--- a/pkgs/tools/networking/p2p/azureus/default.nix
+++ b/pkgs/tools/networking/p2p/azureus/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar";
sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd";
};
-# buildInputs = [unzip];
+
inherit jdk swt;
meta = {
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index 752f43b3348d..60bd2f8cc7e8 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Mail sorter for Maildirs";
homepage = "http://philter.sourceforge.net";
maintainers = with maintainers; [ raskin ];
- platforms = platforms.linux;
+ platforms = platforms.all;
license = licenses.gpl2;
};
diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix
index 6155d411e13b..c8c5ca118dd4 100644
--- a/pkgs/tools/networking/pixiecore/default.nix
+++ b/pkgs/tools/networking/pixiecore/default.nix
@@ -23,6 +23,6 @@ buildGoModule rec {
homepage = "https://github.com/danderson/netboot/tree/master/pixiecore";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ bbigras danderson ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix
index ad9bfcfb1d10..561daacfd530 100644
--- a/pkgs/tools/networking/pixiewps/default.nix
+++ b/pkgs/tools/networking/pixiewps/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/wiire/pixiewps";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.nico202 ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix
index af2dfe8040a0..83d52fdf10d2 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/pkgs/tools/networking/redir/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/troglobit/redir";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/tools/networking/rshijack/default.nix b/pkgs/tools/networking/rshijack/default.nix
index 59558028c01e..e4bb7315a450 100644
--- a/pkgs/tools/networking/rshijack/default.nix
+++ b/pkgs/tools/networking/rshijack/default.nix
@@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/kpcyrd/rshijack";
license = licenses.gpl3;
maintainers = with maintainers; [ xrelkd ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index e7dd075df138..be19656f1c2d 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -1,9 +1,8 @@
-{ lib, stdenv, skawarePackages
+{ lib, skawarePackages
# Whether to build the TLS/SSL tools and what library to use
-# acceptable values: "libressl", false
-# TODO: add bearssl
-, sslSupport ? "libressl" , libressl
+# acceptable values: "bearssl", "libressl", false
+, sslSupport ? "bearssl" , libressl, bearssl
}:
with skawarePackages;
@@ -11,6 +10,7 @@ let
sslSupportEnabled = sslSupport != false;
sslLibs = {
libressl = libressl;
+ bearssl = bearssl;
};
in
@@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
buildPackage {
pname = "s6-networking";
- version = "2.4.0.0";
- sha256 = "1yqykwfl5jnkxgr6skfj5kzd896pknij0hi5m7lj0r18jpfs5zgq";
+ version = "2.4.1.0";
+ sha256 = "023wnayv1gddklnsh3qv7i5jfy2fisbp24wa0nzjg0nfq3p807yc";
description = "A suite of small networking utilities for Unix systems";
@@ -58,7 +58,7 @@ buildPackage {
# remove all s6 executables from build directory
rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
rm minidentd
- rm libs6net.* libstls.* libs6tls.*
+ rm libs6net.* libstls.* libs6tls.* libsbearssl.*
mv doc $doc/share/doc/s6-networking/html
'';
diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix
index 452718ebc9c4..68b4859a5fbb 100644
--- a/pkgs/tools/networking/sniffglue/default.nix
+++ b/pkgs/tools/networking/sniffglue/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "sniffglue";
- version = "0.11.1";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
- sha256 = "0lkz25z0qy1giss4rnhkx9fvsdd8ckf4z1gqw46zl664x96bb705";
+ sha256 = "sha256-bvLkeC5Hm1enaWJtYmnnINgpSO3tlg1SsEzeMSF9OXk=";
};
- cargoSha256 = "01ya9535whi2kviw57f25n8h05ckpb4bq1h7qav6srai97rm937s";
+ cargoSha256 = "sha256-BUo3Y2tLvhOrk2w2GzYeWKpXH7TAOEdBI6vVtW2/cCs=";
nativeBuildInputs = [ pkg-config ];
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Secure multithreaded packet sniffer";
homepage = "https://github.com/kpcyrd/sniffglue";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ xrelkd ];
platforms = platforms.linux;
};
diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
index a983ef9c42c8..f5c8317d89b8 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -6,11 +6,11 @@ in
stdenv.mkDerivation rec {
pname = "spoofer";
- version = "1.4.5";
+ version = "1.4.6";
src = fetchurl {
url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz";
- sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z";
+ sha256 = "sha256-+4FNC+rMxIoVXlW7HnBXUg0P4FhNvMTAqJ9c7lXQ6vE=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix
index d9bf06e825ea..70bb5453518a 100644
--- a/pkgs/tools/networking/surfraw/default.nix
+++ b/pkgs/tools/networking/surfraw/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power";
homepage = "https://gitlab.com/surfraw/Surfraw";
maintainers = [];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
license = lib.licenses.publicDomain;
};
}
diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix
index 9ef0c9d46d14..ca40f9a7cb70 100644
--- a/pkgs/tools/networking/tgt/default.nix
+++ b/pkgs/tools/networking/tgt/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tgt";
- version = "1.0.79";
+ version = "1.0.80";
src = fetchFromGitHub {
owner = "fujita";
repo = pname;
rev = "v${version}";
- sha256 = "18bp7fcpv7879q3ppdxlqj7ayqmlh5zwrkz8gch6rq9lkmmrklrf";
+ sha256 = "sha256-5qBqCHbkL6yw/iT2AtSumw8V0bV74TEyYMRgcPHW2lg=";
};
nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ];
diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix
index 852cd23360c2..7515105948f9 100644
--- a/pkgs/tools/networking/v2ray/default.nix
+++ b/pkgs/tools/networking/v2ray/default.nix
@@ -3,22 +3,22 @@
}:
let
- version = "4.35.1";
+ version = "4.36.2";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
- sha256 = "07fih1hnnv1a4aj6sb63408vqf10bgk74lhqqv63lvm7gaz73srd";
+ sha256 = "1gvzr4kq4klld8m0jv6mizgrx3xj6s2i69kl9vmh5n355bakb7kk";
};
- vendorSha256 = "sha256-+kI9p0lu4PbLe6jhWqTfRYXHFOOrKmY36LzdcQT9BWw=";
+ vendorSha256 = "sha256-8O0xUNIdu3W//LtwiMZlSs1wkpa6Jt+vFkTavz6TBKU=";
assets = {
# MIT licensed
"geoip.dat" = let
- geoipRev = "202103080146";
- geoipSha256 = "1qwmz5fxqqxcjw5jm9dvgpmbin2q69j9wdx4xv3pm8fc47wzx8w5";
+ geoipRev = "202103170314";
+ geoipSha256 = "147kajdhby92yxsvcpa6bpk11ilzvc4nj7rc0h84wp2f0y692kq2";
in fetchurl {
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
@@ -26,8 +26,8 @@ let
# MIT licensed
"geosite.dat" = let
- geositeRev = "20210308021214";
- geositeSha256 = "1fp787wlzdjn2gxx4zmqrqqzqcq4xd10pqx8q919fag0kkzdm23s";
+ geositeRev = "20210317031429";
+ geositeSha256 = "0nzd0ll0x7hv75cbh1i3kgmffasi002a8n3mjw22zywj71v2jwmz";
in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;
diff --git a/pkgs/tools/networking/v2ray/update.sh b/pkgs/tools/networking/v2ray/update.sh
index 3b3a9de7385c..f645b8ea0939 100755
--- a/pkgs/tools/networking/v2ray/update.sh
+++ b/pkgs/tools/networking/v2ray/update.sh
@@ -65,7 +65,7 @@ vendorSha256=$(
)
[[ "$vendorSha256" ]]
sed --in-place \
- -e "s/vendorSha256 = \".*\"/vendorSha256 = \"$vendorSha256\"/" \
+ -e "s#vendorSha256 = \".*\"#vendorSha256 = \"$vendorSha256\"#" \
"$version_nix"
echo "vendorSha256 updated" >&2
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 5cfb61d7fbf0..efb5b5c5b428 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -1,23 +1,22 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchzip
, nixosTests
-, iptables ? null
-, iproute ? null
-, makeWrapper ? null
-, openresolv ? null
-, procps ? null
-, wireguard-go ? null
+, iptables
+, iproute
+, makeWrapper
+, openresolv
+, procps
+, wireguard-go
}:
-with lib;
-
stdenv.mkDerivation rec {
pname = "wireguard-tools";
- version = "1.0.20210223";
+ version = "1.0.20210315";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
- sha256 = "sha256-YlqviVEYrGYZAJtUg2zAU8AzsQotxguljltC3N2ruUc=";
+ sha256 = "sha256-aCqgjriqhBInK7C7KapoKVfgj+zreGQzacMKwbMF1Og=";
};
outputs = [ "out" "man" ];
@@ -37,11 +36,11 @@ stdenv.mkDerivation rec {
postFixup = ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
- '' + optionalString stdenv.isLinux ''
+ '' + lib.optionalString stdenv.isLinux ''
for f in $out/bin/*; do
- wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute iptables openresolv]}
+ wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]}
done
- '' + optionalString stdenv.isDarwin ''
+ '' + lib.optionalString stdenv.isDarwin ''
for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${wireguard-go}/bin
done
@@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
tests = nixosTests.wireguard;
};
- meta = {
+ meta = with lib; {
description = "Tools for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
homepage = "https://www.wireguard.com/";
diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/tools/networking/wormhole-william/default.nix
index 48f842f60ced..4379aa89ceb5 100644
--- a/pkgs/tools/networking/wormhole-william/default.nix
+++ b/pkgs/tools/networking/wormhole-william/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "wormhole-william";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "psanford";
repo = "wormhole-william";
rev = "v${version}";
- sha256 = "1v6kw10gqhyd1adj0wwrr5bmpjqbshdnywsrjpqgg9bl61m5j3wr";
+ sha256 = "sha256-75pSFMzaZW+rtikO0khuxXIgb3Wj8ieSE4sB6quKgo4=";
};
- vendorSha256 = "1niky252gcxai6vz0cx7pvflg530bc1lmcd2wm2hqg6446r1yxsq";
+ vendorSha256 = "sha256-8GZ4h+DFQaCizOCxsMzAllXyaQgzQQBsbCnVi5MWbFg=";
doCheck = false;
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix
index 1d1736cd816f..33f3e394d718 100644
--- a/pkgs/tools/networking/xh/default.nix
+++ b/pkgs/tools/networking/xh/default.nix
@@ -1,22 +1,31 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }:
+{ stdenv, lib, openssl, pkg-config, rustPlatform, fetchFromGitHub, Security
+, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "xh";
- version = "0.7.0";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "ducaale";
repo = "xh";
rev = "v${version}";
- sha256 = "0b7q0xbfbrhvpnxbm9bd1ncdza9k2kcmcir3qhqzb2pgsb5b5njx";
+ sha256 = "pRVlcaPfuO7IMH2p0AQfVrCIXCRyF37WIirOJQkcAJE=";
};
- cargoSha256 = "02fgqys9qf0jzs2n230pyj151v6xbm6wm2rd9qm5gsib6zaq7gfa";
+ cargoSha256 = "dXo1+QvCW3CWN2OhsqGh2Q1xet6cmi2xVy1Xk7s1YR8=";
- buildInputs = lib.optional stdenv.isDarwin Security;
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = if stdenv.isDarwin then [ Security libiconv ] else [ openssl ];
+
+ # Get openssl-sys to use pkg-config
+ OPENSSL_NO_VENDOR = 1;
checkFlagsArray = [ "--skip=basic_options" ];
+ # Nix build happens in sandbox without internet connectivity
+ # disable tests as some of them require internet due to nature of application
+ doCheck = false;
doInstallCheck = true;
postInstallCheck = ''
$out/bin/xh --help > /dev/null
diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix
index d5ecae75eb1a..8228132b5c84 100644
--- a/pkgs/tools/networking/yggdrasil/default.nix
+++ b/pkgs/tools/networking/yggdrasil/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "yggdrasil";
- version = "0.3.15";
+ version = "0.3.16";
src = fetchFromGitHub {
owner = "yggdrasil-network";
repo = "yggdrasil-go";
rev = "v${version}";
- sha256 = "1nf00ygp55l01c0gdkw15f08p3hmn6s2r99lgf2xpq8jn75qra4i";
+ sha256 = "sha256-uUF0zkgtzdMZB/GKOtawjn7AQBkRoiAEj9nUUmpQSVQ=";
};
- vendorSha256 = "1zk6h1isxyml9asyb7g4scbhnfwghqwnv40a5f5j7z0s0s4nybdp";
+ vendorSha256 = "sha256-619PSqd7pl3Akj/kzLQhDIp1adumBGhLrzQsZvMzC7w=";
doCheck = false;
diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix
index 75cf8403d937..4c5fae8829f4 100644
--- a/pkgs/tools/networking/ytcc/default.nix
+++ b/pkgs/tools/networking/ytcc/default.nix
@@ -2,18 +2,25 @@
python3Packages.buildPythonApplication rec {
pname = "ytcc";
- version = "2.0.1";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "woefe";
repo = "ytcc";
rev = "v${version}";
- sha256 = "11gwpqmq611j07pjscch28jsrfgyzy69ph2w1miz3arqmxz7dqjp";
+ sha256 = "04l5bfyq53r8803q24bfw49ji7jx8z9irhhh30cvq2va1ywwd4ww";
};
nativeBuildInputs = [ gettext ];
- propagatedBuildInputs = with python3Packages; [ click feedparser lxml sqlalchemy youtube-dl ];
+ propagatedBuildInputs = with python3Packages; [
+ click
+ feedparser
+ lxml
+ sqlalchemy
+ youtube-dl
+ wcwidth
+ ];
checkInputs = with python3Packages; [ nose pytestCheckHook ];
@@ -24,6 +31,11 @@ python3Packages.buildPythonApplication rec {
"download_videos"
"update_all"
"add_channel_duplicate"
+ "test_subscribe"
+ "test_import"
+ "test_import_duplicate"
+ "test_update"
+ "test_download"
];
meta = {
diff --git a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix
index 275cc88e597a..1a3d3ed7a355 100644
--- a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix
+++ b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ fping libowlevelzs net-snmp ];
+ buildInputs = [ libowlevelzs net-snmp ];
postPatch = ''
substituteInPlace src/confent.cxx \
- --replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping"
+ --replace /usr/sbin/fping "${fping}/bin/fping"
'';
meta = with lib; {
diff --git a/pkgs/tools/networking/zs-wait4host/default.nix b/pkgs/tools/networking/zs-wait4host/default.nix
index 4c8342256c78..b6b4c985dfea 100644
--- a/pkgs/tools/networking/zs-wait4host/default.nix
+++ b/pkgs/tools/networking/zs-wait4host/default.nix
@@ -1,4 +1,4 @@
-{ bash, coreutils, fetchurl, fping, lib, stdenvNoCC }:
+{ coreutils, fetchurl, fping, lib, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "zs-wait4host";
@@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec {
sha256 = "9F1264BDoGlRR7bWlRXhfyvxWio4ydShKmabUQEIz9I=";
};
- buildInputs = [ bash coreutils fping ];
-
postPatch = ''
for i in zs-wait4host zs-wait4host-inf; do
substituteInPlace "$i" \
diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix
index c2cda02ca255..3cb5340d1d7c 100644
--- a/pkgs/tools/package-management/cargo-about/default.nix
+++ b/pkgs/tools/package-management/cargo-about/default.nix
@@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cargo-about";
- version = "0.2.3";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-about";
rev = version;
- sha256 = "1jdp5ksxm4rsqhirgl5zwpiahrz2lx046pkvf6xvr6ms70l2xiwj";
+ sha256 = "sha256-MsXNneKj2xCci1guj1TKcIrX7XByJ5/lWUmjxAsgzPY=";
};
- cargoSha256 = "07bjxsg5kgx8dg3wf6mvi5460db206l68irqc21hz10plz5llmnr";
+ cargoSha256 = "sha256-NdzgIB6uXMtGiLwOACEIeAb4iv7mYLnwRte3M/TkSMA=";
meta = with lib; {
description = "Cargo plugin to generate list of all licenses for a crate";
diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix
index df492863a142..d5be54b71b05 100644
--- a/pkgs/tools/package-management/cargo-audit/default.nix
+++ b/pkgs/tools/package-management/cargo-audit/default.nix
@@ -1,20 +1,23 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-audit";
- version = "0.13.1";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "RustSec";
repo = "cargo-audit";
rev = "v${version}";
- sha256 = "1q8i2c3f8ir1pxkvla4dshz7n0cl97mjydc64xis5pph39f69yc1";
+ sha256 = "sha256-w3wKUAAp9z4iQbx16z5chpKHYxCDLZzJesnIct2Qy4g=";
};
- cargoSha256 = "1b62mcj4gjz2arjf3r30k9qcg81i5x0149a4bfj39xdrz55gg0wh";
+ cargoSha256 = "sha256-ychF3qbwEjumLyqc+xDI8bbKzvdoRYF/X/idlk+JxDE=";
buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = [ pkg-config ];
+ # enables `cargo audit fix`
+ cargoBuildFlags = [ "--features fix" ];
+
# The tests require network access which is not available in sandboxed Nix builds.
doCheck = false;
diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index 5a8ca2d9a8a7..1b8aa8fc3f9d 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
- version = "1.2.1";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5t47QrYWbm8A4E1GhqZwME7rmSfU1SYVniRGSrcRpvk=";
+ sha256 = "sha256-6dmXWqkf8Z+cc4wnOuVCe4+Byfk3VTYXehTN1MCiFLE=";
};
- cargoSha256 = "sha256-/GFpjovPGEgkfJ53+wR8CBDXiQQPDCiIaRG2Ka71dhQ=";
+ cargoSha256 = "sha256-uDoxMHSNoqH/AOixmkV6pwrDu/XSqXBCrAz4L7MMPU8=";
meta = with lib; {
description = "Mirror installed software on multiple machines";
diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index 8897a313e8db..db60d5e8429e 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "home-manager";
- version = "2021-01-16";
+ version = "2021-03-21";
src = fetchFromGitHub {
owner = "nix-community";
repo = "home-manager";
- rev = "8127799f79ee96129b295d78294f40a54078131f";
- sha256 = "0iji8nxa66s409pvjwi370ycsw4m74w6b3ywnjpfkl2filpapjns";
+ rev = "ddcd476603dfd3388b1dc8234fa9d550156a51f5";
+ sha256 = "sha256-E6ABXtzw6bHmrIirB1sJL6S2MEa3sfcvRLzRa92frCo=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index d39af405da53..e2cb9ec20b46 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -10,7 +10,7 @@ let
common =
{ lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz
- , bash, coreutils, gzip, gnutar
+ , bash, coreutils, util-linuxMinimal, gzip, gnutar
, pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex
, jq, libarchive, libcpuid
@@ -41,6 +41,7 @@ common =
nativeBuildInputs =
[ pkg-config ]
+ ++ lib.optionals (is24 && stdenv.isLinux) [ util-linuxMinimal ]
++ lib.optionals is24
[ autoreconfHook
autoconf-archive
@@ -139,8 +140,13 @@ common =
doInstallCheck = true; # not cross
# socket path becomes too long otherwise
- preInstallCheck = lib.optional stdenv.isDarwin ''
+ preInstallCheck = lib.optionalString stdenv.isDarwin ''
export TMPDIR=$NIX_BUILD_TOP
+ '' +
+ # tests/ca/substitute.sh is flakey for some reason, so we skip it
+ # for now. https://github.com/NixOS/nix/issues/4667
+ lib.optionalString is24 ''
+ echo "exit 99" > tests/ca/substitute.sh
'';
separateDebugInfo = stdenv.isLinux;
@@ -213,13 +219,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
- suffix = "pre20210308_1c0e3e4";
+ suffix = "pre20210317_8a5203d";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411";
- sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd";
+ rev = "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2";
+ sha256 = "IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk=";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
index 3256b5431a75..13327a84fff0 100644
--- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
+++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
meta = with lib; {
homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif";
description = "Convert ASCII-armored PGP keys to animated QR code";
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ asymmetric ];
};
}
diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix
index 3eb192e8fcc6..ba80734e5cf8 100644
--- a/pkgs/tools/security/bash-supergenpass/default.nix
+++ b/pkgs/tools/security/bash-supergenpass/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
supergenpass will ask for your master password interactively, and it will not be displayed on your terminal.
'';
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ fgaz ];
homepage = "https://github.com/lanzz/bash-supergenpass";
};
diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix
index f2df464a907b..1383de79feb5 100644
--- a/pkgs/tools/security/bettercap/default.nix
+++ b/pkgs/tools/security/bettercap/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "bettercap";
- version = "2.29";
+ version = "2.30.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-hXYsFRYSyYKYJM4gS0Dyiia9aPA07GWSsp9doA0vYGI=";
+ sha256 = "sha256-5CAWMW0u/8BUn/8JJBApyHGH+/Tz8hzAmSChoT2gFr8=";
};
- vendorSha256 = "sha256-yIvwYUK+4cnHFwvJS2seDa9vJ/2cQ10Q46hR8U0aSRE=";
+ vendorSha256 = "sha256-fApxHxdzEEc+M+U5f0271VgrkXTGkUD75BpDXpVYd5k=";
doCheck = false;
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index c8188fe4216a..71bdfae4e42e 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
mkdir bmrsa
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index 45d6349af403..7e00c0b07cf7 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf
+{ stdenv, lib, fetchFromGitHub, python2Packages, nasm, libelf
, kernel ? null, withDriver ? false }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "chipsec";
version = "1.5.1";
diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix
index ef462f5bf2dc..5bda55c418aa 100644
--- a/pkgs/tools/security/chntpw/default.nix
+++ b/pkgs/tools/security/chntpw/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln";
};
- buildInputs = [ unzip ]
- ++ lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
patches = [
./00-chntpw-build-arch-autodetect.patch
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
index eae5a5256dff..23022f92b6af 100644
--- a/pkgs/tools/security/cipherscan/default.nix
+++ b/pkgs/tools/security/cipherscan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }:
+{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python3, coreutils }:
stdenv.mkDerivation rec {
pname = "cipherscan";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ python ];
+ buildInputs = [ python3 ];
+
+ strictDeps = true;
buildPhase = ''
substituteInPlace cipherscan --replace '$0' 'cipherscan'
diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index 6c48dd380b77..597652c95c75 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "doppler";
- version = "3.23.0";
+ version = "3.23.1";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
- sha256 = "sha256-5IoWeFcIzhgWcYjT/BZfNQXsi9F/6WfOJLiv/5rP4Cs=";
+ sha256 = "sha256-6sTsASfHIFH1V3Q20R2y8AiOVZ4NR4GGRCKRVr25kkc=";
};
vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY=";
diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix
new file mode 100644
index 000000000000..a13e1707236b
--- /dev/null
+++ b/pkgs/tools/security/expliot/default.nix
@@ -0,0 +1,72 @@
+{ lib
+, aiocoap
+, awsiotpythonsdk
+, bluepy
+, buildPythonApplication
+, can
+, cmd2
+, cryptography
+, fetchFromGitLab
+, paho-mqtt
+, pyi2cflash
+, pymodbus
+, pynetdicom
+, pyparsing
+, pyserial
+, pyspiflash
+, pythonOlder
+, upnpy
+, xmltodict
+, zeroconf
+}:
+
+buildPythonApplication rec {
+ pname = "expliot";
+ version = "0.9.6";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitLab {
+ owner = "expliot_framework";
+ repo = pname;
+ rev = version;
+ sha256 = "1wn8fyrvis0gw80zzmpivinw6mz5n33inhv39iallsl3is8xpgpa";
+ };
+
+ propagatedBuildInputs = [
+ aiocoap
+ awsiotpythonsdk
+ bluepy
+ can
+ cmd2
+ cryptography
+ paho-mqtt
+ pyi2cflash
+ pymodbus
+ pynetdicom
+ pyparsing
+ pyserial
+ pyspiflash
+ upnpy
+ xmltodict
+ zeroconf
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "expliot" ];
+
+ meta = with lib; {
+ description = "IoT security testing and exploitation framework";
+ longDescription = ''
+ EXPLIoT is a Framework for security testing and exploiting IoT
+ products and IoT infrastructure. It provides a set of plugins
+ (test cases) which are used to perform the assessment and can
+ be extended easily with new ones. The name EXPLIoT (pronounced
+ expl-aa-yo-tee) is a pun on the word exploit and explains the
+ purpose of the framework i.e. IoT exploitation.
+ '';
+ homepage = "https://expliot.readthedocs.io/";
+ license = with licenses; [ agpl3Plus ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 53127173f790..edec05272b9f 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
-, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
+, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake intltool libtool vala glib encfs
- gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
+ gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
wrapGAppsHook gobject-introspection ];
patches = [ ./makefile-mkdir.patch ];
diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix
index 29703ee1fc87..b358507bbae2 100644
--- a/pkgs/tools/security/genpass/default.nix
+++ b/pkgs/tools/security/genpass/default.nix
@@ -7,22 +7,22 @@
}:
rustPlatform.buildRustPackage rec {
pname = "genpass";
- version = "0.4.9";
+ version = "0.4.12";
src = fetchgit {
url = "https://git.sr.ht/~cyplo/genpass";
rev = "v${version}";
- sha256 = "1dpv2iyd48xd8yw9bmymjjrkhsgmpwvsl5b9zx3lpaaq59ypi9g9";
+ sha256 = "154kprbqc59f06ciz60il4ax299zapwa0hz8vjn25rl4gr5gzn4l";
};
- cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x";
+ cargoSha256 = "1nc699n7f732lhzfhsfknay6z3igyiqy5jymm5x815mv9y1vwaj1";
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
meta = with lib; {
description = "A simple yet robust commandline random password generator";
homepage = "https://sr.ht/~cyplo/genpass/";
- license = licenses.agpl3;
+ license = licenses.agpl3Only;
maintainers = with maintainers; [ cyplo ];
};
}
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 0ffcad117f47..ef4c67365282 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
- version = "1.12.1";
+ version = "1.12.4";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
- sha256 = "0ickzq2swhabxqcg32n1i99bam6ip7c0mhhncgvmw332w6pzgvlb";
+ sha256 = "1cwmka6shyycp9gq5js1hnbamdhqzpmzraxdaniz1cdqhxcvdkcb";
};
- vendorSha256 = "0i0dhipp1gdn0xdl4bpi13ksxf7dc9biz9riapm988bldcr5s1kr";
+ vendorSha256 = "1qnxdrqpav6ky6gs9w63l0hbhakh23rrc9197br1nmbg0slb8vcj";
subPackages = [ "." ];
@@ -46,6 +46,8 @@ buildGoModule rec {
$out/bin/gopass completion $shell > gopass.$shell
installShellCompletion gopass.$shell
done
+ go run helpers/man/main.go > gopass.1
+ installManPage gopass.1
'' + lib.optionalString passAlias ''
ln -s $out/bin/gopass $out/bin/pass
'';
diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix
index dc4b487747c6..6d67f038e4a0 100644
--- a/pkgs/tools/security/grype/default.nix
+++ b/pkgs/tools/security/grype/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "grype";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-co00Ye/QVNSG4h67m56+37JLilBVzHxUwMs1vS3wYX4=";
+ sha256 = "sha256-/OgAh33DF0UkBcc5GriGgeoZ7kae9GhGnUnIX6lGlys=";
};
- vendorSha256 = "sha256-q7n8WLw/A2wr3z5h7zaFERY7lO5UIsmTD2mrcH/vpNs=";
+ vendorSha256 = "sha256-SGO8RKSOK0PHqSIJfTdcuAmqMtFuo9MBdiEylDUpOFo=";
propagatedBuildInputs = [ docker ];
diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix
index 855ffc6fdba1..db4d14ba3ed7 100644
--- a/pkgs/tools/security/ldeep/default.nix
+++ b/pkgs/tools/security/ldeep/default.nix
@@ -10,11 +10,11 @@
buildPythonApplication rec {
pname = "ldeep";
- version = "1.0.9";
+ version = "1.0.10";
src = fetchPypi {
inherit pname version;
- sha256 = "0n38idkn9hy31m5xkrc36dmw364d137c7phssvj76gr2gqsrqjy3";
+ sha256 = "sha256-/7mcmAj69NmuiK+xlQijAk39sMLDX8kHatmSI6XYbwE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix
index 67228be6741b..85a2c1f72253 100644
--- a/pkgs/tools/security/libtpms/default.nix
+++ b/pkgs/tools/security/libtpms/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libtpms";
- version = "0.8.0";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "stefanberger";
repo = "libtpms";
rev = "v${version}";
- sha256 = "sha256-/zvMXdAOb4J3YaqdVJvTUI1/JFC0OKwgiYwYgYB62Y4=";
+ sha256 = "sha256-ljzxaZYC2RzasKoRvnjead8CEkbdptGD4V5QapvAQUQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index cb6ee5aefe0f..7c2f230266e0 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.34"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.37"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 17d21d96423c..85d41fba9f95 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: 010e4d5a643a857e09bafbcf79b541e607de3c4c
- ref: refs/tags/6.0.34
+ revision: eae71004c4a1720d9af1513ca750cfe116d99a7b
+ ref: refs/tags/6.0.37
specs:
- metasploit-framework (6.0.34)
+ metasploit-framework (6.0.37)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -30,9 +30,9 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
- metasploit-payloads (= 2.0.37)
+ metasploit-payloads (= 2.0.39)
metasploit_data_models
- metasploit_payloads-mettle (= 1.0.6)
+ metasploit_payloads-mettle (= 1.0.7)
mqtt
msgpack
nessus_rest
@@ -123,22 +123,22 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
- aws-partitions (1.432.0)
+ aws-partitions (1.435.0)
aws-sdk-core (3.113.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.227.0)
+ aws-sdk-ec2 (1.230.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-iam (1.49.0)
+ aws-sdk-iam (1.51.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.43.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.91.0)
+ aws-sdk-s3 (1.93.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -183,7 +183,7 @@ GEM
http_parser.rb (0.6.0)
i18n (1.8.9)
concurrent-ruby (~> 1.0)
- io-console (0.5.8)
+ io-console (0.5.9)
irb (1.3.4)
reline (>= 0.1.5)
jmespath (1.4.0)
@@ -212,7 +212,7 @@ GEM
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
- metasploit-payloads (2.0.37)
+ metasploit-payloads (2.0.39)
metasploit_data_models (4.1.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -223,7 +223,7 @@ GEM
railties (~> 5.2.2)
recog (~> 2.0)
webrick
- metasploit_payloads-mettle (1.0.6)
+ metasploit_payloads-mettle (1.0.7)
method_source (1.0.0)
mini_portile2 (2.5.0)
minitest (5.14.4)
@@ -323,7 +323,7 @@ GEM
metasm
rex-core
rex-text
- rex-socket (0.1.26)
+ rex-socket (0.1.29)
rex-core
rex-sslscan (0.1.6)
rex-core
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index b5fb78fd1f31..4a3da7d7f3f1 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.0.34";
+ version = "6.0.37";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-sKt1hN7thNhA+bjeFF3gxJs/82EPXPiM81zcMpDRDyg=";
+ sha256 = "sha256-q6/1GW02C1z5nQwAKXU7xbVVviwXwS+XS7ZfNjJryiA=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index edd4d305fd8e..0be20b687690 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y0z25hgghy3i8azx0mn8pda2qvd47zkilwjps0x32zn091blzgg";
+ sha256 = "13hy3xhff1cqlzv5hi3lz7vb11wh10m6221hq471d8m94chmmkjs";
type = "gem";
};
- version = "1.432.0";
+ version = "1.435.0";
};
aws-sdk-core = {
groups = ["default"];
@@ -134,20 +134,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lhpwxad3yc5c3a8jmp116qx5jmym0ykpv39iwdq5km4h3as6h2d";
+ sha256 = "1c7qqly2f94db3643xwjj9mcb34vilx11awbv40v2f8z7xisvvz3";
type = "gem";
};
- version = "1.227.0";
+ version = "1.230.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c7vnkwh6z7nxgpmdw8hy70wxiimszyp644vmj8p1pr7ybz6sv9l";
+ sha256 = "0x2768blsy8lpib9pi2f2d67flabar3bq6chmbj07iqzpwvpz569";
type = "gem";
};
- version = "1.49.0";
+ version = "1.51.0";
};
aws-sdk-kms = {
groups = ["default"];
@@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vs3zg9d3lzi7rwys4qv62mcmga39s4rg4rmb0dalqknz6lqzhrq";
+ sha256 = "0iy2f9z43pc6fgwmga2cz8nf9gy2pwcw4jib141vp8z8dhylqj94";
type = "gem";
};
- version = "1.91.0";
+ version = "1.93.0";
};
aws-sigv4 = {
groups = ["default"];
@@ -424,10 +424,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0prpvq05wzp8n7vk44zcwmn53p1akn4r105n5py6bmbxsmmkvyhr";
+ sha256 = "0pmafwxh8z1apnk7bb1ibnbhfrgb1jgilxm4j8d0fcqlc2ggmbja";
type = "gem";
};
- version = "0.5.8";
+ version = "0.5.9";
};
irb = {
groups = ["default"];
@@ -514,12 +514,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "010e4d5a643a857e09bafbcf79b541e607de3c4c";
- sha256 = "0a0gs6835p2wyf6ghp0gc7rkz6y4w1fi9pmqz50di17dvs27baxh";
+ rev = "eae71004c4a1720d9af1513ca750cfe116d99a7b";
+ sha256 = "086adcr3cpxn9fbjzh8p5jz5bdf57dsjj00ckpwmq2rndlczbbxb";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.0.34";
+ version = "6.0.37";
};
metasploit-model = {
groups = ["default"];
@@ -536,10 +536,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mf1c50j2gszxspnn9f2d356z8aaiv9s9x8lpdi05cf6syvhsa2k";
+ sha256 = "1ibvh45sbmzdn6gsd3dgj1a67mhgy6p3hvjbh9b2qb7ijc14gv49";
type = "gem";
};
- version = "2.0.37";
+ version = "2.0.39";
};
metasploit_data_models = {
groups = ["default"];
@@ -556,10 +556,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mxhybic6myh993fs4jmp0hz998ryf362y0b33wqanff1n8aj75k";
+ sha256 = "1ivxz2wl9k0j7ba7xas0bfm44c1iczfvlgyxhsgqbpqkqwc374vg";
type = "gem";
};
- version = "1.0.6";
+ version = "1.0.7";
};
method_source = {
groups = ["default"];
@@ -1066,10 +1066,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mgk44f55w2g536nkxbg62qq5cfr05qxldglfr3yf94qkkanl2gg";
+ sha256 = "0ar9vm8pwjz7c11kr3pjnxbgk68f2i5k1r9j3r34pfq9n26s79gr";
type = "gem";
};
- version = "0.1.26";
+ version = "0.1.29";
};
rex-sslscan = {
groups = ["default"];
diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix
index 2df24e63d894..1c1b0e410683 100644
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@@ -1,25 +1,28 @@
-{ buildGoModule
+{ lib
+, buildGoModule
, fetchFromGitHub
-, lib
}:
buildGoModule rec {
pname = "nuclei";
- version = "2.2.0";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
- repo = "nuclei";
+ repo = pname;
rev = "v${version}";
- sha256 = "0xrvza86aczlnb11x58fiqch5g0q6gvpxwsi5dq3akfi95gk3a3x";
+ sha256 = "sha256-QF9w3ZrW+Mbl6EOC1n2848+q71AhxXTf0j//Us9L1r8=";
};
- vendorSha256 = "1v3ax8l1lgp2vs50gsa2fhdd6bvyfdlkd118akrqmwxahyyyqycv";
+ vendorSha256 = "sha256-qmuua7HXnwuy24CSqHKALqNDmXBvSIXYTVu3kaGVoeU=";
preBuild = ''
mv v2/* .
'';
+ # Test files are not part of the release tarball
+ doCheck = false;
+
meta = with lib; {
description = "Tool for configurable targeted scanning";
longDescription = ''
diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix
index b7c4319fa058..aa1580e24598 100644
--- a/pkgs/tools/security/pcsc-scm-scl011/default.nix
+++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0ik26sxgqgsqplksl87z61vwmx51k7plaqmrkdid7xidgfhfxr42";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
unzip $src
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 3d966c575cf2..2a75c409305e 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,5 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3
-, IOKit ? null }:
+{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3, IOKit }:
stdenv.mkDerivation rec {
pname = "pcsclite";
@@ -19,9 +18,9 @@ stdenv.mkDerivation rec {
"--enable-usbdropdir=/var/lib/pcsc/drivers"
"--enable-confdir=/etc"
] ++ lib.optional stdenv.isLinux
- "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
- ++ lib.optional (!stdenv.isLinux)
- "--disable-libsystemd";
+ "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
+ ++ lib.optional (!stdenv.isLinux)
+ "--disable-libsystemd";
postConfigure = ''
sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ {
@@ -35,8 +34,10 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config perl ];
- buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ]
- ++ lib.optionals stdenv.isDarwin [ IOKit ];
+
+ buildInputs = [ python3 ]
+ ++ lib.optionals stdenv.isLinux [ udev dbus ]
+ ++ lib.optionals stdenv.isDarwin [ IOKit ];
meta = with lib; {
description = "Middleware to access a smart card using SCard API (PC/SC)";
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix
index afef0d4c4723..451cdd5591bd 100644
--- a/pkgs/tools/security/pdfcrack/default.nix
+++ b/pkgs/tools/security/pdfcrack/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
homepage = "http://pdfcrack.sourceforge.net/";
description = "Small command line driven tool for recovering passwords and content from PDF files";
license = with licenses; [ gpl2 ];
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ qoelet ];
};
}
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index 9c328d472c4b..27917ffbbf17 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation {
nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ libiconv ncurses Cocoa ];
+ preBuild = ''
+ # Only build for what we care about (also allows arm64)
+ substituteInPlace pinentry-mac.xcodeproj/project.pbxproj \
+ --replace "i386 x86_64 ppc" "${stdenv.targetPlatform.darwinArch}"
+ '';
+
installPhase = ''
mkdir -p $out/Applications
mv Products/Release/pinentry-mac.app $out/Applications
diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix
index cf83a135f743..ca3e1feef3e8 100644
--- a/pkgs/tools/security/prs/default.nix
+++ b/pkgs/tools/security/prs/default.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "prs";
- version = "0.2.3";
+ version = "0.2.5";
src = fetchFromGitLab {
owner = "timvisee";
repo = "prs";
rev = "v${version}";
- sha256 = "sha256-aulrMXKKCFo8nU6mEplcpaGGMfLr03FCgIF6rg6LqGg=";
+ sha256 = "sha256-XJcNhIMu60H5LmoRzMqhPq33cCU9PBPfIIUtaSnmrH8=";
};
- cargoSha256 = "sha256-996iwBOp5F9q9/yptTHtsLj6wlY5HEpp8CWTbpBWPuA=";
+ cargoSha256 = "sha256-4l/KQMtGfZX5Rg35AJxvwzg3aAzuPK2iKrHDRgIw+bg=";
postPatch = ''
# The GPGME backend is recommended
diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix
index 94800ca8c04f..3745a9520f1c 100644
--- a/pkgs/tools/security/rarcrack/default.nix
+++ b/pkgs/tools/security/rarcrack/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "134fq84896w5vp8vg4qg0ybpb466njibigyd7bqqm1xydr07qrgn";
};
- buildInputs = [ libxml2 file p7zip unrar unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libxml2 file p7zip unrar ];
buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
installFlags = [ "PREFIX=\${out}" ];
diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix
index 4cbedb232187..0c1bf93ed1c6 100644
--- a/pkgs/tools/security/shc/default.nix
+++ b/pkgs/tools/security/shc/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://neurobin.org/projects/softwares/unix/shc/";
description = "Shell Script Compiler";
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
license = licenses.gpl3;
};
}
diff --git a/pkgs/tools/security/sipvicious/default.nix b/pkgs/tools/security/sipvicious/default.nix
new file mode 100644
index 000000000000..36b619da433e
--- /dev/null
+++ b/pkgs/tools/security/sipvicious/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+}:
+
+buildPythonApplication rec {
+ pname = "sipvicious";
+ version = "0.3.2";
+
+ src = fetchFromGitHub {
+ owner = "EnableSecurity";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0hna4xyjhdwi6z2aqqp25ydkb1qznlil95w2iqrr576wcrciznd5";
+ };
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "sipvicious" ];
+
+ meta = with lib; {
+ description = " Set of tools to audit SIP based VoIP systems";
+ homepage = "https://github.com/EnableSecurity/sipvicious";
+ license = with licenses; [ gpl3Plus ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/slowhttptest/default.nix b/pkgs/tools/security/slowhttptest/default.nix
new file mode 100644
index 000000000000..5dce5d5439ac
--- /dev/null
+++ b/pkgs/tools/security/slowhttptest/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+ pname = "slowhttptest";
+ version = "1.8.2";
+
+ src = fetchFromGitHub {
+ owner = "shekyan";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1xv2j3hl4zj0s2cxcsvlwgridh9ap4g84g7c4918d03id15wydcx";
+ };
+
+ buildInputs = [ openssl ];
+
+ meta = with lib; {
+ description = "Application Layer DoS attack simulator";
+ homepage = "https://github.com/shekyan/slowhttptest";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix
index 7cc343b78234..1577b4764012 100644
--- a/pkgs/tools/security/sn0int/default.nix
+++ b/pkgs/tools/security/sn0int/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "sn0int";
- version = "0.20.0";
+ version = "0.20.1";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
- sha256 = "1zjrbrkk7phv8s5qr0gj6fnssa31j3k3m8c55pdfmajh7ry7wwd1";
+ sha256 = "sha256-vnSpItch9RDUyYxERKRwYPmRLwRG9gAI7iIY+7iRs1w=";
};
- cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3";
+ cargoSha256 = "sha256-1QqNI7rdH5wb1Zge8gkJtzg2Hgd/Vk9DAU9ULk/5wiw=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/security/sonar-scanner-cli/default.nix b/pkgs/tools/security/sonar-scanner-cli/default.nix
index f5ae475a45b0..95db01370b44 100644
--- a/pkgs/tools/security/sonar-scanner-cli/default.nix
+++ b/pkgs/tools/security/sonar-scanner-cli/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/lib
diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
index ae6f000fe3f7..ec1ade20a19a 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@@ -2,22 +2,23 @@
buildGoModule rec {
pname = "sops";
- version = "3.6.1";
+ version = "3.7.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "mozilla";
repo = pname;
- sha256 = "0xl53rs8jzq5yz4wi0vzsr6ajsaf2x2n1h3x7krk02a9839y6f18";
+ sha256 = "1a0v1jgbz8n3dymzr2shg2ms9sxjwaci209ldzq8v4g737v10zgm";
};
- vendorSha256 = "1cpm06dyc6lb3a9apfggyi16alb2yijvyan1gbrl8r9fwlqvdpjk";
+ vendorSha256 = "1qaml2h3c8fhmi8ahp2fmd0hagqp5xqaf8jxjh4mfmbv2is3yz1l";
doCheck = false;
meta = with lib; {
homepage = "https://github.com/mozilla/sops";
description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
+ changelog = "https://github.com/mozilla/sops/raw/v${version}/CHANGELOG.rst";
maintainers = [ maintainers.marsam ];
license = licenses.mpl20;
};
diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix
deleted file mode 100644
index cb2a0473cf15..000000000000
--- a/pkgs/tools/security/steghide/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}:
-
-stdenv.mkDerivation rec {
- buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];
- version = "0.5.1";
- pname = "steghide";
-
- src = fetchurl {
- url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;
- sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b";
- };
-
- patches = [
- ./patches/steghide-0.5.1-gcc34.patch
- ./patches/steghide-0.5.1-gcc4.patch
- ./patches/steghide-0.5.1-gcc43.patch
- ];
-
- # AM_CXXFLAGS needed for automake
- preConfigure = ''
- export AM_CXXFLAGS="$CXXFLAGS -std=c++0x"
- '';
-
- meta = with lib; {
- homepage = "http://steghide.sourceforge.net/";
- description = "Steganography program that is able to hide data in various kinds of image- and audio-files";
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch
deleted file mode 100644
index 373316c78406..000000000000
--- a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- steghide-0.5.1.old/src/Makefile.am
-+++ steghide-0.5.1.new/src/Makefile.am 2004-07-16 19:01:39.673947633 +0200
-@@ -33,5 +33,5 @@
- WavPCMSampleValue.cc error.cc main.cc msg.cc SMDConstructionHeuristic.cc
- LIBS = @LIBINTL@ @LIBS@
- localedir = $(datadir)/locale
--LIBTOOL = $(SHELL) libtool
-+LIBTOOL = $(SHELL) libtool --tag=CXX
- MAINTAINERCLEANFILES = Makefile.in
---- steghide-0.5.1.old/src/AuSampleValues.cc
-+++ steghide-0.5.1.new/src/AuSampleValues.cc 2004-07-16 18:59:18.934578427 +0200
-@@ -17,21 +17,21 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
--
-+#include "common.h"
- #include "AuSampleValues.h"
-
- // AuMuLawSampleValue
--const BYTE AuMuLawSampleValue::MinValue = 0 ;
--const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
-+template<> const BYTE AuMuLawSampleValue::MinValue = 0 ;
-+template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
-
- // AuPCM8SampleValue
--const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
--const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
-+template<> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
-+template<> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
-
- // AuPCM16SampleValue
--const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
--const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
-+template<> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
-+template<> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
-
- // AuPCM32SampleValue
--const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
--const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
-+template<> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
-+template<> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch
deleted file mode 100644
index a8df1735e9d4..000000000000
--- a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h
---- steghide-0.5.1-orig/src/AuData.h 2003-09-28 09:30:29.000000000 -0600
-+++ steghide-0.5.1/src/AuData.h 2007-05-11 22:04:56.000000000 -0600
-@@ -26,22 +26,30 @@
-
- // AuMuLawAudioData
- typedef AudioDataImpl AuMuLawAudioData ;
-+template<>
- inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
-+template<>
- inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
-
- // AuPCM8AudioData
- typedef AudioDataImpl AuPCM8AudioData ;
-+template<>
- inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
-+template<>
- inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
-
- // AuPCM16AudioData
- typedef AudioDataImpl AuPCM16AudioData ;
-+template<>
- inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
-+template<>
- inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
-
- // AuPCM32AudioData
- typedef AudioDataImpl AuPCM32AudioData ;
-+template<>
- inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
-+template<>
- inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
-
- #endif // ndef SH_AUDATA_H
-diff -Naur steghide-0.5.1-orig/src/MHashPP.cc steghide-0.5.1/src/MHashPP.cc
---- steghide-0.5.1-orig/src/MHashPP.cc 2003-10-05 04:17:50.000000000 -0600
-+++ steghide-0.5.1/src/MHashPP.cc 2007-05-11 22:07:01.000000000 -0600
-@@ -120,7 +120,7 @@
-
- std::string MHashPP::getAlgorithmName (hashid id)
- {
-- char *name = mhash_get_hash_name (id) ;
-+ char *name = (char *) mhash_get_hash_name (id) ;
- std::string retval ;
- if (name == NULL) {
- retval = std::string ("") ;
diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch
deleted file mode 100644
index ca66b9c544f5..000000000000
--- a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch
+++ /dev/null
@@ -1,349 +0,0 @@
---- steghide-0.5.1.old/configure.in 2003-10-15 09:48:52.000000000 +0200
-+++ steghide-0.5.1.new/configure.in 2008-05-09 19:04:46.000000000 +0200
-@@ -7,27 +7,26 @@
- dnl checks for programs.
- AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_AWK
- AC_PROG_LN_S
-+AC_CXX_COMPILE_STDCXX_0X
-
- dnl GNU gettext
- AC_CHECK_FUNCS(strchr)
- AM_GNU_GETTEXT
- AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes)
-
- dnl check if debugging support is requested
--AC_MSG_CHECKING([wether to enable debugging])
-+AC_MSG_CHECKING([whether to enable debugging])
- AC_ARG_ENABLE(debug,[ --enable-debug enable debugging],
- if test "$enableval" = yes ;
- then
- AC_MSG_RESULT([yes])
- AC_DEFINE(DEBUG,1,[enable code used only for debugging])
-- CXXFLAGS="-O2 -Wall -g"
- else
- AC_MSG_RESULT([no])
-- CXXFLAGS="-O2 -Wall"
- fi
- ,
- AC_MSG_RESULT([no])
- CXXFLAGS="-O2 -Wall"
- )
-@@ -213,7 +212,18 @@
- echo "libmhash can be downloaded from http://mhash.sourceforge.net/.";
- echo "**********";
- AC_MSG_ERROR([[libmhash not found]])
- fi
-
-+dnl Should we add std=c++0x?
-+
-+if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes;
-+then
-+ CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra"
-+else
-+ CXXFLAGS="${CXXFLAGS} -Wall -Wextra"
-+fi
-+
-+AC_SUBST(CXXFLAGS)
-+
- dnl create Makefiles
- AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile])
---- steghide-0.5.1.old/m4/ac_cxx_compile_stdcxx_0x.m4 1970-01-01 01:00:00.000000000 +0100
-+++ steghide-0.5.1.new/m4/ac_cxx_compile_stdcxx_0x.m4 2008-05-09 19:04:46.000000000 +0200
-@@ -0,0 +1,107 @@
-+# ===========================================================================
-+# http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+# AC_CXX_COMPILE_STDCXX_0X
-+#
-+# DESCRIPTION
-+#
-+# Check for baseline language coverage in the compiler for the C++0x
-+# standard.
-+#
-+# LAST MODIFICATION
-+#
-+# 2008-04-17
-+#
-+# COPYLEFT
-+#
-+# Copyright (c) 2008 Benjamin Kosnik
-+#
-+# Copying and distribution of this file, with or without modification, are
-+# permitted in any medium without royalty provided the copyright notice
-+# and this notice are preserved.
-+
-+AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
-+ AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
-+ ac_cv_cxx_compile_cxx0x_native,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ AC_TRY_COMPILE([
-+ template
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check check_type;
-+ check_type c;
-+ check_type&& cr = c;],,
-+ ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
-+ AC_LANG_RESTORE
-+ ])
-+
-+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
-+ ac_cv_cxx_compile_cxx0x_cxx,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -std=c++0x"
-+ AC_TRY_COMPILE([
-+ template
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check check_type;
-+ check_type c;
-+ check_type&& cr = c;],,
-+ ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ AC_LANG_RESTORE
-+ ])
-+
-+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
-+ ac_cv_cxx_compile_cxx0x_gxx,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -std=gnu++0x"
-+ AC_TRY_COMPILE([
-+ template
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check check_type;
-+ check_type c;
-+ check_type&& cr = c;],,
-+ ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ AC_LANG_RESTORE
-+ ])
-+
-+ if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
-+ test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
-+ test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
-+ AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
-+ fi
-+])
---- steghide-0.5.1.old/src/Arguments.cc 2003-10-11 23:25:04.000000000 +0200
-+++ steghide-0.5.1.new/src/Arguments.cc 2008-05-09 19:04:44.000000000 +0200
-@@ -26,10 +26,12 @@
- #include "Terminal.h"
- #include "common.h"
- #include "error.h"
- #include "msg.h"
-
-+float Arguments::Default_Goal = 100.0 ;
-+
- // the global Arguments object
- Arguments Args ;
-
- Arguments::Arguments (int argc, char* argv[])
- {
---- steghide-0.5.1.old/src/Arguments.h 2003-10-11 23:23:57.000000000 +0200
-+++ steghide-0.5.1.new/src/Arguments.h 2008-05-09 19:04:44.000000000 +0200
-@@ -98,11 +98,11 @@
- static const bool Default_EmbedEmbFn = true ;
- static const bool Default_Force = false ;
- static const VERBOSITY Default_Verbosity = NORMAL ;
- static const unsigned long Default_Radius = 0 ; // there is no default radius for all file formats
- static const unsigned int Max_Algorithm = 3 ;
-- static const float Default_Goal = 100.0 ;
-+ static float Default_Goal ;
- static const DEBUGCOMMAND Default_DebugCommand = NONE ;
- static const bool Default_Check = false ;
- static const unsigned int Default_DebugLevel = 0 ;
- static const unsigned int Default_GmlGraphRecDepth = 0 ;
- static const unsigned int Default_GmlStartVertex = 0 ;
---- steghide-0.5.1.old/src/EncryptionMode.h 2003-09-28 17:30:30.000000000 +0200
-+++ steghide-0.5.1.new/src/EncryptionMode.h 2008-05-09 19:04:46.000000000 +0200
-@@ -69,11 +69,11 @@
- static const unsigned int NumValues = 8 ;
- IRep Value ;
-
- typedef struct struct_Translation {
- IRep irep ;
-- char* srep ;
-+ const char* srep ;
- } Translation ;
- static const Translation Translations[] ;
- } ;
-
- #endif // ndef SH_ENCMODE_H
---- steghide-0.5.1.old/src/Graph.cc 2003-10-11 23:54:26.000000000 +0200
-+++ steghide-0.5.1.new/src/Graph.cc 2008-05-09 19:04:46.000000000 +0200
-@@ -20,10 +20,12 @@
-
- #include
- #include
- #include